From d2f9fcdda01be2c4face9168a92bf7c8cb1d19e5 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Sat, 4 Nov 2017 20:39:39 +0100 Subject: [PATCH] zh_CN translation + footer fix --- docs-web/src/main/webapp/src/app/docs/app.js | 5 +- .../webapp/src/app/docs/controller/Footer.js | 26 ++ .../src/app/docs/controller/Navigation.js | 2 +- .../controller/document/DocumentDefault.js | 5 - docs-web/src/main/webapp/src/img/sismics.png | Bin 1287 -> 0 bytes docs-web/src/main/webapp/src/index.html | 30 +- .../main/webapp/src/lib/angular.timeago.js | 2 +- docs-web/src/main/webapp/src/locale/en.json | 15 +- docs-web/src/main/webapp/src/locale/fr.json | 25 +- .../src/main/webapp/src/locale/zh_CN.json | 377 ++++++++++++++++++ .../src/partial/docs/document.default.html | 19 +- .../webapp/src/partial/docs/document.html | 7 +- .../main/webapp/src/partial/docs/login.html | 8 + .../src/partial/docs/settings.account.html | 2 +- docs-web/src/main/webapp/src/style/main.less | 6 + 15 files changed, 483 insertions(+), 46 deletions(-) create mode 100644 docs-web/src/main/webapp/src/app/docs/controller/Footer.js delete mode 100644 docs-web/src/main/webapp/src/img/sismics.png create mode 100644 docs-web/src/main/webapp/src/locale/zh_CN.json diff --git a/docs-web/src/main/webapp/src/app/docs/app.js b/docs-web/src/main/webapp/src/app/docs/app.js index 608a0ab7..e578bc7c 100644 --- a/docs-web/src/main/webapp/src/app/docs/app.js +++ b/docs-web/src/main/webapp/src/app/docs/app.js @@ -345,7 +345,8 @@ angular.module('docs', prefix: 'locale/', suffix: '.json' }) - .registerAvailableLanguageKeys(['en', 'fr'], { + .registerAvailableLanguageKeys(['en', 'fr', 'zh_CN', 'zh_HK', 'zh_TW'], { + 'zh_*': 'zh_CN', 'en_*': 'en', 'fr_*': 'fr', '*': 'en' @@ -354,7 +355,7 @@ angular.module('docs', .fallbackLanguage('en'); // Configuring Timago - timeAgoSettings.overrideLang = $translateProvider.proposedLanguage; + timeAgoSettings.overrideLang = $translateProvider.preferredLanguage(); timeAgoSettings.fullDateAfterSeconds = 60 * 60 * 24 * 30; // 30 days // Configuring $http to act like jQuery.ajax diff --git a/docs-web/src/main/webapp/src/app/docs/controller/Footer.js b/docs-web/src/main/webapp/src/app/docs/controller/Footer.js new file mode 100644 index 00000000..f5a60448 --- /dev/null +++ b/docs-web/src/main/webapp/src/app/docs/controller/Footer.js @@ -0,0 +1,26 @@ +'use strict'; + +/** + * Footer controller. + */ +angular.module('docs').controller('Footer', function($scope, Restangular, $translate, timeAgoSettings) { + // Load app data + Restangular.one('app').get().then(function(data) { + $scope.app = data; + }); + + $scope.currentLang = $translate.use(); + + // Change the current language and save it to local storage + $scope.changeLanguage = function(lang) { + $translate.use(lang); + timeAgoSettings.overrideLang = lang; + localStorage.overrideLang = lang; + $scope.currentLang = lang; + }; + + // Set the current language if an override is saved in local storage + if (!_.isUndefined(localStorage.overrideLang)) { + $scope.changeLanguage(localStorage.overrideLang); + } +}); \ No newline at end of file diff --git a/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js b/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js index adbef67b..20c75b19 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js @@ -3,7 +3,7 @@ /** * Navigation controller. */ -angular.module('docs').controller('Navigation', function($scope, $http, $state, $rootScope, User, Restangular) { +angular.module('docs').controller('Navigation', function($scope, $state, $rootScope, User, Restangular) { User.userInfo().then(function(data) { $rootScope.userInfo = data; }); diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js index e093f02c..ea370ac1 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js @@ -4,11 +4,6 @@ * Document default controller. */ angular.module('docs').controller('DocumentDefault', function($scope, $rootScope, $state, Restangular, $upload, $translate) { - // Load app data - Restangular.one('app').get().then(function(data) { - $scope.app = data; - }); - // Load user audit log Restangular.one('auditlog').get().then(function(data) { $scope.logs = data.logs; diff --git a/docs-web/src/main/webapp/src/img/sismics.png b/docs-web/src/main/webapp/src/img/sismics.png deleted file mode 100644 index b4b22e20ad6ec935ac6a42a426e0814ae399d4ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1287 zcmaJ>ZA=?=9KKSa9RsNg#%U`1dnC9lw0AvPN-q@pas?_}$4ZqZn+bQlKlB3k!rfsD zn+c;+z|Bt+T-0Q4O9qJvjt?#|xak}*E}B@39~Kio3`G;eR5B7V8s{CO%n#N}?*1=% zp6B=W5iuI(!Q@BZwLBiKLdKyU3IzI2i-u%nGv3Mv&&#tjweap$1quz>9wL*QJk9z;k}I z*F)p99ENGWV@!cPW3fbPY%t~H(AE~voF#Pu0cs4$3PYkwX8q{4E~)R0YYYY35N*(p zK1eD_cZ0B`K;UuWjuhUAgGQIr)!_Dez4d^=T{wmln2T_@ykrAG;yBoOP(7N$^^ z!%8EXAJsE`P=X-u%8KevoAicZSw_ZOPTVM|0Ho>vhYG?jTGit4VZQ$Zhv5# z`rW)i+bq8f+j3Lg`A1d-uvX0;J$F(*zSz`PXZzxU54=`BoBJ&WUbyiSa(q5ioZOC)%@d)V}|R{A8fn)S15cM8E0w*T}Pv?|u7T(%xs9`SbKUl`EZ}IuaUXeapQ0 z?&{LU%&G4Z^&1uWtuOQI*D89WR`bAob;+HrW0UVUCgvvAs`ivtwOH`Ly}O6O-(j?D u?bSc>tFs3!XRhvPe;WUJ+>}8A<0d5i + + + @@ -55,10 +58,8 @@ - - @@ -149,9 +150,28 @@
-
-