Merge branch 'edge' into meteor-1.8

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:

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

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) {

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) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.68.0",
+  "version": "v2.69.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

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,