You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/10/24 14:09:31 UTC
[incubator-servicecomb-service-center] branch master updated:
SCB-978 Fix translation issues for Chinese Locale on First Load (#463)
This is an automated email from the ASF dual-hosted git repository.
littlecui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new 3ddb255 SCB-978 Fix translation issues for Chinese Locale on First Load (#463)
3ddb255 is described below
commit 3ddb255953e70a35ec511aecb064f18c50236f81
Author: Mohammad Asif Siddiqui <mo...@huawei.com>
AuthorDate: Wed Oct 24 19:39:26 2018 +0530
SCB-978 Fix translation issues for Chinese Locale on First Load (#463)
* Select the language by default using browser language
* Make dashboard contents more readable
* Change the Pagination Text to locale on Load
---
frontend/app/index.html | 2 +-
frontend/app/scripts/app.js | 6 +++---
frontend/app/scripts/directives/tableDirective.js | 2 ++
frontend/app/scripts/languages/{locale-cz.js => locale-zh.js} | 0
frontend/app/scripts/modules/dashboard/views/dashboard.html | 4 ++--
frontend/app/scripts/views/index.html | 4 ++--
6 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/frontend/app/index.html b/frontend/app/index.html
index ef9e966..f7641df 100644
--- a/frontend/app/index.html
+++ b/frontend/app/index.html
@@ -94,7 +94,7 @@ limitations under the License.
<script src="scripts/controllers/serviceCenterCtrl.js"></script>
<!-- Load languages files here -->
<script src="scripts/languages/locale-en.js"></script>
-<script src="scripts/languages/locale-cz.js"></script>
+<script src="scripts/languages/locale-zh.js"></script>
<!-- endbuild -->
</body>
diff --git a/frontend/app/scripts/app.js b/frontend/app/scripts/app.js
index ead209b..337dd2f 100644
--- a/frontend/app/scripts/app.js
+++ b/frontend/app/scripts/app.js
@@ -23,15 +23,15 @@ angular.module('serviceCenter', ['ngAnimate', 'ngMaterial', 'ngAria', 'ngMessage
$translateProvider.useSanitizeValueStrategy(null);
$translateProvider.translations('en', english);
- $translateProvider.translations('cz', chinese);
+ $translateProvider.translations('zh', chinese);
var lang = "";
if (localStorage.getItem("lang") && localStorage.getItem("lang") != '') {
lang = localStorage.getItem("lang");
} else if (navigator.language) {
- lang = navigator.language.indexOf("zh") > -1 ? "cz" : "en";
+ lang = navigator.language.indexOf("zh") > -1 ? "zh" : "en";
} else {
- lang = navigator.userLanguage.indexOf("zh") > -1 ? "cz" : "en";
+ lang = navigator.userLanguage.indexOf("zh") > -1 ? "zh" : "en";
}
$translateProvider.preferredLanguage(lang);
diff --git a/frontend/app/scripts/directives/tableDirective.js b/frontend/app/scripts/directives/tableDirective.js
index 4f268fc..2f0489a 100644
--- a/frontend/app/scripts/directives/tableDirective.js
+++ b/frontend/app/scripts/directives/tableDirective.js
@@ -58,6 +58,8 @@ angular.module('serviceCenter')
}
}
+ scope.changePaginationLabel()
+
scope.paginationOptions = {
rowSelection: false,
multiSelect: false,
diff --git a/frontend/app/scripts/languages/locale-cz.js b/frontend/app/scripts/languages/locale-zh.js
similarity index 100%
rename from frontend/app/scripts/languages/locale-cz.js
rename to frontend/app/scripts/languages/locale-zh.js
diff --git a/frontend/app/scripts/modules/dashboard/views/dashboard.html b/frontend/app/scripts/modules/dashboard/views/dashboard.html
index 27d8181..d960fdb 100644
--- a/frontend/app/scripts/modules/dashboard/views/dashboard.html
+++ b/frontend/app/scripts/modules/dashboard/views/dashboard.html
@@ -27,7 +27,7 @@ limitations under the License..
<div class="circle">
<i class="{{info.iconName}} stat-icon-size"></i>
</div>
- <p class="text-center">{{info.title | translate}} - {{info.count}}</p>
+ <p class="text-center">{{info.title | translate}} : {{info.count}}</p>
</div>
</div>
</div>
@@ -121,7 +121,7 @@ limitations under the License..
</div>
</div>
<br>
- <p class="ins-stat-title">{{data.title | translate}} - {{data.count}}</p>
+ <p class="ins-stat-title">{{data.title | translate}} : {{data.count}}</p>
</div>
</div>
</div>
diff --git a/frontend/app/scripts/views/index.html b/frontend/app/scripts/views/index.html
index 1a0395f..eae18ad 100644
--- a/frontend/app/scripts/views/index.html
+++ b/frontend/app/scripts/views/index.html
@@ -35,9 +35,9 @@ limitations under the License.
</md-input-container>
<md-input-container class="md-block" flex-gt-sm>
- <md-select ng-model="language" aria-label="language" ng-change="selectLang(language)">
+ <md-select ng-model="language" aria-label="language" ng-change="selectLang(language)" ng-init="selectLang(language)">
<md-option id="lang-option" value="en">English</md-option>
- <md-option value="cz">{{ "chinese" | translate }}</md-option>
+ <md-option value="zh">{{ "chinese" | translate }}</md-option>
</md-select>
</md-input-container>
</div>