[
https://issues.apache.org/jira/browse/SCB-978?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16662325#comment-16662325
]
ASF GitHub Bot commented on SCB-978:
------------------------------------
little-cui closed pull request #463: SCB-978 Fix translation issues for Chinese
Locale on First Load
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/463
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/frontend/app/index.html b/frontend/app/index.html
index ef9e966b..f7641df9 100644
--- a/frontend/app/index.html
+++ b/frontend/app/index.html
@@ -94,7 +94,7 @@
<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 ead209be..337dd2fe 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 4f268fcf..2f0489a5 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 27d8181c..d960fdbf 100644
--- a/frontend/app/scripts/modules/dashboard/views/dashboard.html
+++ b/frontend/app/scripts/modules/dashboard/views/dashboard.html
@@ -27,7 +27,7 @@
<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 @@
</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 1a0395f9..eae18ad3 100644
--- a/frontend/app/scripts/views/index.html
+++ b/frontend/app/scripts/views/index.html
@@ -35,9 +35,9 @@
</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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Fix translation issues for Chinese Locale on First Load
> -------------------------------------------------------
>
> Key: SCB-978
> URL: https://issues.apache.org/jira/browse/SCB-978
> Project: Apache ServiceComb
> Issue Type: Improvement
> Components: Service-Center
> Reporter: Mohammad Asif Siddiqui
> Assignee: Mohammad Asif Siddiqui
> Priority: Major
> Fix For: service-center-1.1.0
>
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
