Merge pull request #700 from teamforus/release-v0.3.0-hotfix-i18n

fix for translation bugs dashbaord and platform
teamforus · Oct 28, 2019 · 07b9759 · 07b9759
2 parents 27e47ca + 42a5ddb
commit 07b9759
Show file tree

Hide file tree

Showing 10 changed files with 1,200 additions and 1,122 deletions.
diff --git a/src/sources/forus-platform/js/angular-1/controllers/BaseController.js b/src/sources/forus-platform/js/angular-1/controllers/BaseController.js
@@ -2,6 +2,7 @@ let BaseController = function(
     $rootScope,
     $scope,
     $state,
+    $translate,
     AuthService,
     RecordService,
     OrganizationService,
@@ -114,12 +115,15 @@ let BaseController = function(
         $rootScope.appConfigs.features = res.data;
         $rootScope.appConfigs.frontends = res.data.fronts;
     });
+
+    $translate.use('nl');
 };
 
 module.exports = [
     '$rootScope',
     '$scope',
     '$state',
+    '$translate',
     'AuthService',
     'RecordService',
     'OrganizationService',

diff --git a/src/sources/forus-platform/js/angular-1/controllers/landing/BaseController.js b/src/sources/forus-platform/js/angular-1/controllers/landing/BaseController.js
@@ -2,6 +2,7 @@ let BaseController = function(
     $rootScope,
     $scope,
     $state,
+    $translate,
     appConfigs,
     ConfigService,
     CredentialsService, 
@@ -111,14 +112,15 @@ let BaseController = function(
             $rootScope.viewLayout = 'landing';
         }
     });
-
+    $translate.use('nl');
     $rootScope.appConfigs = appConfigs;
 };
 
 module.exports = [
     '$rootScope',
     '$scope',
     '$state',
+    '$translate',
     'appConfigs',
     'ConfigService',
     'CredentialsService', 

diff --git a/src/sources/forus-platform/js/angular-1/i18n/i18n-en-values.js b/src/sources/forus-platform/js/angular-1/i18n/i18n-en-values.js
@@ -1,12 +1,6 @@
-// No nested objects allowed
+// No nested objects allowed 
 module.exports = {
-    general: {
-        name: "General"
-    },
-    nijmegen: {
-        name: "Nijmegen"
-    },
-    zuidhorn: {
-        name: "Zuidhorn"
-    }
+    general: {},
+    nijmegen: {},
+    zuidhorn: {}
 };