diff options
| author | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2015-05-07 17:33:10 +0200 |
|---|---|---|
| committer | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2015-05-13 15:25:09 +0200 |
| commit | f8f2f5a95b8a485dd283222afbf13fdc822240bb (patch) | |
| tree | b48d0dd1164b7437bfd57bbf4199cf0ed8d61e51 | |
| parent | 0ecb8d59c4b0b3dc00654f1932e492235f0bb25c (diff) | |
| download | sonarqube-f8f2f5a95b8a485dd283222afbf13fdc822240bb.tar.gz sonarqube-f8f2f5a95b8a485dd283222afbf13fdc822240bb.zip | |
SONAR-6427 SONAR-6428 Fix l10n of dashboard titles
4 files changed, 13 insertions, 3 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java index dfa22076e81..07f57d8aaff 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java @@ -197,7 +197,7 @@ public class ComponentNavigationAction implements NavigationAction { for (DashboardDto dashboard : dashboards) { json.beginObject() .prop("key", dashboard.getId()) - .prop("name", i18n.message(locale, String.format("dashboard.%s.name", dashboard.getName()), dashboard.getName())) + .prop("name", dashboard.getName()) .endObject(); } json.endArray(); diff --git a/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs b/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs index 730f20a001c..86938a5236b 100644 --- a/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs +++ b/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs @@ -97,7 +97,7 @@ <li class="dropdown-header">{{t 'layout.dashboards'}}</li> {{#withoutFirst component.dashboards}} <li> - <a href="{{componentDashboardPermalink ../component.key key}}">{{name}}</a> + <a href="{{componentDashboardPermalink ../component.key key}}">{{dashboardL10n name}}</a> </li> {{/withoutFirst}} {{#if canManageContextDashboards}} diff --git a/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs b/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs index 806fceb056b..fcaf9cc2672 100644 --- a/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs +++ b/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs @@ -18,7 +18,7 @@ <ul class="dropdown-menu"> {{#each globalDashboards}} <li> - <a href="{{link '/dashboard/index?did=' key}}">{{name}}</a> + <a href="{{link '/dashboard/index?did=' key}}">{{dashboardL10n name}}</a> </li> {{/each}} {{#if canManageGlobalDashboards}} diff --git a/server/sonar-web/src/main/js/common/handlebars-extensions.js b/server/sonar-web/src/main/js/common/handlebars-extensions.js index f6cb754d666..610d5425dc2 100644 --- a/server/sonar-web/src/main/js/common/handlebars-extensions.js +++ b/server/sonar-web/src/main/js/common/handlebars-extensions.js @@ -552,4 +552,14 @@ return window.formatMeasureVariation(measure, type); }); + Handlebars.registerHelper('dashboardL10n', function (dashboardName) { + var l10nKey = 'dashboard.' + dashboardName + '.name'; + var l10nLabel = window.t(l10nKey); + if (l10nLabel !== l10nKey) { + return l10nLabel; + } else { + return dashboardName; + } + }); + })(); |