diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-06-19 10:06:20 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-06-19 10:06:20 +0300 |
| commit | b61034048f6676e1daed63de45c06989358f39a5 (patch) | |
| tree | 9c5dbe101e906285f9c2d29a8e4aa1cec22aea83 | |
| parent | b98411a441585521e08e7aae0012bf7ce5d91600 (diff) | |
| parent | ebb7d38a6a8144958e852792045e9b6d9619713e (diff) | |
| download | wekan-b61034048f6676e1daed63de45c06989358f39a5.tar.gz wekan-b61034048f6676e1daed63de45c06989358f39a5.tar.bz2 wekan-b61034048f6676e1daed63de45c06989358f39a5.zip | |
Merge branch 'GhassenRjab-add-breton-label' into devel
Add Breton language name. Thanks to GhassenRjab ! Closes #1002
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | client/components/main/layouts.js | 2 | ||||
| -rw-r--r-- | client/components/users/userHeader.js | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f928a80f..dcac35fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ This release adds the following new features: [missing undo button](https://github.com/wekan/wekan/issues/1023); * [When deleting list, delete list's cards too](https://github.com/wekan/wekan/pull/1054); * [Re-enable Export Wekan Board](https://github.com/wekan/wekan/pull/1059); -* [Sort languages by their translated names](https://github.com/wekan/wekan/pull/1070). +* [Sort languages by their translated names](https://github.com/wekan/wekan/pull/1070); +* [Add Breton language name](https://github.com/wekan/wekan/pull/1071). and fixes the following bugs: diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 3b9092c3..1936d7aa 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -23,7 +23,7 @@ Template.userFormsLayout.helpers({ return _.map(TAPi18n.getLanguages(), (lang, code) => { return { tag: code, - name: lang.name, + name: lang.name === 'br' ? 'Brezhoneg' : lang.name, }; }).sort(function(a, b) { if (a.name === b.name) { diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 10fb7e62..0580092e 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -75,7 +75,7 @@ Template.changeLanguagePopup.helpers({ return _.map(TAPi18n.getLanguages(), (lang, code) => { return { tag: code, - name: lang.name, + name: lang.name === 'br' ? 'Brezhoneg' : lang.name, }; }).sort(function(a, b) { if (a.name === b.name) { |