diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-05-11 00:09:08 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-05-11 00:09:08 +0300 |
| commit | 1d33701af045cd1ca1adf03466d18636e1fe7317 (patch) | |
| tree | f87dc2426cfc3d85f3b12f8b6bc21fe2a641bd61 /client/components | |
| parent | df69ade422bb862820d0836bd6b841beabb5c694 (diff) | |
| parent | 52fe845d2427afdda1a426b9f616d400a4dafae1 (diff) | |
| download | wekan-1d33701af045cd1ca1adf03466d18636e1fe7317.tar.gz wekan-1d33701af045cd1ca1adf03466d18636e1fe7317.tar.bz2 wekan-1d33701af045cd1ca1adf03466d18636e1fe7317.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client/components')
| -rw-r--r-- | client/components/main/layouts.js | 2 | ||||
| -rw-r--r-- | client/components/users/userHeader.js | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index d5113a25..fe51a7d6 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -68,6 +68,8 @@ Template.userFormsLayout.helpers({ name = 'Brezhoneg'; } else if (lang.name === 'ig') { name = 'Igbo'; + } else if (lang.name === 'oc') { + name = 'Occitan'; } return { tag, name }; }).sort(function(a, b) { diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 869c9d15..d5353152 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -119,6 +119,8 @@ Template.changeLanguagePopup.helpers({ name = 'Brezhoneg'; } else if (lang.name === 'ig') { name = 'Igbo'; + } else if (lang.name === 'oc') { + name = 'Occitan'; } return { tag, name }; }).sort(function (a, b) { |