From 076f56bf5930ccfa423b83580827af191815284d Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Thu, 2 Nov 2017 10:41:36 -0700
Subject: [PATCH] fix language detection bug for FormFields service

---
 .../forms/admin/services/form-fields.client.service.js   | 9 +++++----
 public/modules/users/services/auth.client.service.js     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/modules/forms/admin/services/form-fields.client.service.js b/public/modules/forms/admin/services/form-fields.client.service.js
index d6dae5eb..084abefa 100644
--- a/public/modules/forms/admin/services/form-fields.client.service.js
+++ b/public/modules/forms/admin/services/form-fields.client.service.js
@@ -1,10 +1,11 @@
 'use strict';
 
 //TODO: DAVID: URGENT: Make this a $resource that fetches valid field types from server
-angular.module('forms').service('FormFields', [ '$rootScope', '$translate', '$window',
-	function($rootScope, $translate, $window) {
-		$translate.use($window.user.language);
-		console.log($translate.instant('SHORT_TEXT'));
+angular.module('forms').service('FormFields', [ '$rootScope', '$translate', 'Auth',
+	function($rootScope, $translate, Auth) {
+
+		var language = Auth.ensureHasCurrentUser().language;
+		$translate.use(language);
 
 		this.types = [
 		    {
diff --git a/public/modules/users/services/auth.client.service.js b/public/modules/users/services/auth.client.service.js
index fdbfd377..806db08f 100644
--- a/public/modules/users/services/auth.client.service.js
+++ b/public/modules/users/services/auth.client.service.js
@@ -22,7 +22,7 @@ angular.module('users').factory('Auth', ['$window',
         } else if ($window.user){
           service._currentUser = $window.user;
           return service._currentUser;
-        } else{
+        } else {
           User.getCurrent().then(function(user) {
             // success
             service._currentUser = user;