diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-02-26 16:11:03 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-02-26 16:11:03 +0200 |
commit | 1efa66b58c2703772e39d0fca01dcb7f2f14a44c (patch) | |
tree | 29a608a9c4e929385323c1477ba9d74d3b37bb2e /client | |
parent | 5bdb392258bd3d3863699e5bf05b64b70f222621 (diff) | |
parent | dc8c9053c2d454f14983903880fbf481eab2be20 (diff) | |
download | wekan-1efa66b58c2703772e39d0fca01dcb7f2f14a44c.tar.gz wekan-1efa66b58c2703772e39d0fca01dcb7f2f14a44c.tar.bz2 wekan-1efa66b58c2703772e39d0fca01dcb7f2f14a44c.zip |
Merge branch 'GhassenRjab-feature/fix-lint' into devel
Diffstat (limited to 'client')
-rw-r--r-- | client/components/main/layouts.js | 12 | ||||
-rw-r--r-- | client/components/users/userHeader.js | 14 |
2 files changed, 18 insertions, 8 deletions
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index df22fc14..f12718a7 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -17,10 +17,14 @@ Template.userFormsLayout.onRendered(() => { Template.userFormsLayout.helpers({ languages() { return _.map(TAPi18n.getLanguages(), (lang, code) => { - return { - tag: code, - name: lang.name === 'br' ? 'Brezhoneg' : lang.name === 'ig' ? 'Igbo' : lang.name, - }; + const tag = code; + let name = lang.name; + if (lang.name === 'br') { + name = 'Brezhoneg'; + } else if (lang.name === 'ig') { + name = 'Igbo'; + } + return { tag, name }; }).sort(function(a, b) { if (a.name === b.name) { return 0; diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 96c8c95e..be7d4dcb 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -114,10 +114,16 @@ Template.changePasswordPopup.onRendered(function () { Template.changeLanguagePopup.helpers({ languages() { return _.map(TAPi18n.getLanguages(), (lang, code) => { - return { - tag: code, - name: lang.name === 'br' ? 'Brezhoneg' : lang.name === 'ig' ? 'Igbo' : lang.name, - }; + // Same code in /client/components/main/layouts.js + // TODO : Make code reusable + const tag = code; + let name = lang.name; + if (lang.name === 'br') { + name = 'Brezhoneg'; + } else if (lang.name === 'ig') { + name = 'Igbo'; + } + return { tag, name }; }).sort(function (a, b) { if (a.name === b.name) { return 0; |