Fixes for localization support

Author: ssarkisy

src/js/controllers/MainCtrl.js

@@ -27,8 +27,6 @@ function MainCtrl($s, $state, $cookies, FormSrvc, SessionSrvc, UtilSrvc, $timeou
     main.hideBusyDimmer = function() { main.busy = false };
     main.isLoggedIn = function() { return !!main.loginState };
 
-    window.s = main;
-
     $s.extensionsCSS = {
         'pdf'  : 'pdf',
         'txt'  : 'text',
@@ -76,19 +74,19 @@ function MainCtrl($s, $state, $cookies, FormSrvc, SessionSrvc, UtilSrvc, $timeou
     function getLanguageList() {
         return SessionSrvc.getLanguageList(main.authToken)
             .then(function(data) {
-                var languages = data.languages || [];
+                var languages = data.languages || ['en'];
+
                 languages = languages.map(function(lang) {
-                    var domains = lang.split('-');
+                    var domain = lang.split('-')[0];
                     return {
-                        name: UtilSrvc.getLanguageName(domains[1]),
-                        lang: domains[0] + '-' + domains[1].toUpperCase()
+                        name: UtilSrvc.getLanguageName(domain),
+                        lang: domain
                     }
                 });
 
                 main.languageList = languages;
-            })
-            .finally(function() {
-                main.language = angular.fromJson(localStorage.rflanguage) || { lang: 'en-US', name: 'English (US)' };
+                main.language = angular.fromJson(localStorage.rflanguage) || { lang: 'en', name: 'English' };
+                localStorage.rflanguage = angular.toJson(main.language);
             });
     }
 

src/js/controllers/ObjectCtrl.js

@@ -5,8 +5,6 @@ function ObjectCtrl($s, $q, $params, FormSrvc, $state, $timeout, UtilSrvc) {
                        VARIABLES INITIALIZATION
 ===============================================================*/
 
-  window.s = $s;
-
     // initialization block
     $s.ctrl = {};
 

src/js/services/RESTSrvc.js

@@ -7,7 +7,7 @@ function RESTSrvc($http, $q) {
                 var deferred = $q.defer();
 
                 var langSetting = angular.fromJson(localStorage.rflanguage);
-                var language = 'en-US';
+                var language = 'en';
 
                 if (!angular.isUndefinedOrNullOrEmpty(langSetting)
                  && !angular.isUndefinedOrNullOrEmpty(langSetting.domain)) {

src/js/services/UtilSrvc.js

@@ -145,7 +145,7 @@ function UtilSrvc($cookies, $filter) {
                 zh: "Chinese",
                 da: "Danish",
                 nl: "Dutch",
-                en: "English (UK)",
+                en: "English",
                 et: "Estonian",
                 eo: "Esperanto",
                 fi: "Finnish",
@@ -180,7 +180,6 @@ function UtilSrvc($cookies, $filter) {
                 th: "Thai",
                 tr: "Turkish",
                 uk: "Ukrainian",
-                us: "English (US)",
                 vi: "Vietnamese"
             }