Browse Source

Merge branch 'GhassenRjab-sort-languges-tr' into devel

Sort languages by their translated names. Thanks to GhassenRjab !
Lauri Ojansivu 8 years ago
parent
commit
183142a8b4
3 changed files with 24 additions and 7 deletions
  1. 2 1
      CHANGELOG.md
  2. 11 3
      client/components/main/layouts.js
  3. 11 3
      client/components/users/userHeader.js

+ 2 - 1
CHANGELOG.md

@@ -5,7 +5,8 @@ This release adds the following new features:
 * [Change the way to delete a list (card-like)](https://github.com/wekan/wekan/pull/1050), fixes
 * [Change the way to delete a list (card-like)](https://github.com/wekan/wekan/pull/1050), fixes
   [missing undo button](https://github.com/wekan/wekan/issues/1023);
   [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);
 * [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).
+* [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).
 
 
 and fixes the following bugs:
 and fixes the following bugs:
 
 

+ 11 - 3
client/components/main/layouts.js

@@ -20,9 +20,17 @@ Template.userFormsLayout.onRendered(() => {
 
 
 Template.userFormsLayout.helpers({
 Template.userFormsLayout.helpers({
   languages() {
   languages() {
-    return _.map(TAPi18n.getLanguages(), (lang, tag) => {
-      const name = lang.name;
-      return { tag, name };
+    return _.map(TAPi18n.getLanguages(), (lang, code) => {
+      return {
+        tag: code,
+        name: lang.name,
+      };
+    }).sort(function(a, b) {
+      if (a.name === b.name) {
+        return 0;
+      } else {
+        return a.name > b.name ? 1 : -1;
+      }
     });
     });
   },
   },
 
 

+ 11 - 3
client/components/users/userHeader.js

@@ -72,9 +72,17 @@ Template.changePasswordPopup.onRendered(function() {
 
 
 Template.changeLanguagePopup.helpers({
 Template.changeLanguagePopup.helpers({
   languages() {
   languages() {
-    return _.map(TAPi18n.getLanguages(), (lang, tag) => {
-      const name = lang.name;
-      return { tag, name };
+    return _.map(TAPi18n.getLanguages(), (lang, code) => {
+      return {
+        tag: code,
+        name: lang.name,
+      };
+    }).sort(function(a, b) {
+      if (a.name === b.name) {
+        return 0;
+      } else {
+        return a.name > b.name ? 1 : -1;
+      }
     });
     });
   },
   },