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 | |
| 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
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | Stackerfile.yml | 2 | ||||
| -rw-r--r-- | client/components/main/layouts.js | 2 | ||||
| -rw-r--r-- | client/components/users/userHeader.js | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
6 files changed, 17 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e486a89..3f399341 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v2.69 2019-05-11 Wekan release + +This release fixes the following translation names: + +- [Fix translation name in Wekan menu: oc to Occitan](https://github.com/wekan/wekan/commit/db40ca25ac5df17fcc8b7c93f12b7e2bffc349d2). + Thanks to xet7. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v2.68 2019-05-10 Wekan release This release adds the following new features: diff --git a/Stackerfile.yml b/Stackerfile.yml index 9ef9b981..31b0cdbc 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.68.0" +appVersion: "v2.69.0" files: userUploads: - README.md 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) { diff --git a/package.json b/package.json index e117e075..6336465c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.68.0", + "version": "v2.69.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index d90312a0..56162c6e 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 270, + appVersion = 271, # Increment this for every release. - appMarketingVersion = (defaultText = "2.68.0~2019-05-10"), + appMarketingVersion = (defaultText = "2.69.0~2019-05-11"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, |