From a193d78d90e84a62be7d23bbd0d09397dd3fb84d Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Wed, 15 Nov 2017 03:57:46 -0800
Subject: [PATCH] fixes language dropdown for form create modal

---
 .../forms/admin/controllers/list-forms.client.controller.js | 5 +++--
 .../modules/forms/admin/views/list-forms.client.view.html   | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/modules/forms/admin/controllers/list-forms.client.controller.js b/public/modules/forms/admin/controllers/list-forms.client.controller.js
index b1ad8ac8..10c94241 100644
--- a/public/modules/forms/admin/controllers/list-forms.client.controller.js
+++ b/public/modules/forms/admin/controllers/list-forms.client.controller.js
@@ -1,13 +1,14 @@
 'use strict';
 
 // Forms controller
-angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope', '$stateParams', '$state', 'GetForms', 'CurrentForm', '$http', '$uibModal', 'myForms',
-	function($rootScope, $scope, $stateParams, $state, GetForms, CurrentForm, $http, $uibModal, myForms) {
+angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope', '$stateParams', '$state', 'GetForms', 'CurrentForm', '$http', '$uibModal', 'myForms','$window',
+	function($rootScope, $scope, $stateParams, $state, GetForms, CurrentForm, $http, $uibModal, myForms, $window) {
 
         $scope = $rootScope;
         $scope.forms = {};
         $scope.showCreateModal = false;
         $scope.myforms = myForms
+        $scope.formLanguage = $window.$locale;
 
 		$rootScope.languageRegExp = {
 			regExp: /[@!#$%^&*()\-+={}\[\]|\\/'";:`.,~№?<>]+/i,
diff --git a/public/modules/forms/admin/views/list-forms.client.view.html b/public/modules/forms/admin/views/list-forms.client.view.html
index 17088629..e20111eb 100644
--- a/public/modules/forms/admin/views/list-forms.client.view.html
+++ b/public/modules/forms/admin/views/list-forms.client.view.html
@@ -52,9 +52,9 @@
 			    <div class="col-xs-5 field-title text-left"> {{ 'LANGUAGE' | translate }} </div>
 			    <div class="col-xs-12 field-input">
 				    <div class="button custom-select">
-						<select style="color:black;" name="language" required ng-model="formLanguage" ng-init="formLanguage = user.language">
-							<option ng-repeat="language in languages" value="{{language}}">
-								{{language}}
+						<select style="color:black;" name="language" required ng-model="formLanguage">
+							<option ng-repeat="language in $root.languages" value="{{language}}"> 
+								{{ $root.langCodeToWord[language] }}                     
 							</option>
 				        </select>
 				    </div>