From 2c3f000af39ee93bed618b0f93d9d210b12f5d56 Mon Sep 17 00:00:00 2001 From: Andrey Perliev Date: Tue, 14 Feb 2017 21:26:45 +0200 Subject: [PATCH] gluon-status-page: translations now take into account preferred languages --- .../gluon-status-page/src/js/lib/helper.js | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/package/gluon-status-page/src/js/lib/helper.js b/package/gluon-status-page/src/js/lib/helper.js index ab373945..125a9b2d 100644 --- a/package/gluon-status-page/src/js/lib/helper.js +++ b/package/gluon-status-page/src/js/lib/helper.js @@ -82,9 +82,8 @@ define([ "bacon" ], function (Bacon) { } function _(s) { - var lang = navigator.language || navigator.userLanguage - var dict = { - "de-DE": { + var i, lang, langs, dict = { + "de": { "Node": "Knoten", "Distance": "Entfernung", "Inactive": "Inaktiv", @@ -109,7 +108,7 @@ define([ "bacon" ], function (Bacon) { "Statistic": "Statistik", "Neighbors": "Nachbarknoten" }, - "ru-RU": { + "ru": { "Node": "Узел", "Distance": "Дальность", "Inactive": "Не активен", @@ -140,10 +139,18 @@ define([ "bacon" ], function (Bacon) { "Branch": "Ветка" } } - if (lang in dict && s in dict[lang]) - return dict[lang][s] + if (navigator.userLanguage) + langs = [ navigator.userLanguage ] else - return s + langs = navigator.languages + for (i=0; i