From 081c058229c27bdc8b6ca90646f830a4eb16ddc6 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Tue, 18 Apr 2017 13:20:39 +0300
Subject: [PATCH] languge field order fix

---
 .../Espo/Resources/metadata/entityDefs/Preferences.json       | 3 +--
 client/src/views/preferences/fields/language.js               | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/Espo/Resources/metadata/entityDefs/Preferences.json b/application/Espo/Resources/metadata/entityDefs/Preferences.json
index da371f25c9..aa5a236542 100644
--- a/application/Espo/Resources/metadata/entityDefs/Preferences.json
+++ b/application/Espo/Resources/metadata/entityDefs/Preferences.json
@@ -89,8 +89,7 @@
         "language": {
             "type": "enum",
             "default": "",
-            "view": "views/preferences/fields/language",
-            "isSorted": true
+            "view": "views/preferences/fields/language"
         },
         "exportDelimiter": {
             "type": "varchar",
diff --git a/client/src/views/preferences/fields/language.js b/client/src/views/preferences/fields/language.js
index ba6a822989..e5fc896927 100644
--- a/client/src/views/preferences/fields/language.js
+++ b/client/src/views/preferences/fields/language.js
@@ -31,7 +31,9 @@ Espo.define('views/preferences/fields/language', 'views/fields/enum', function (
     return Dep.extend({
 
         setupOptions: function () {
-            this.params.options = Espo.Utils.clone(this.getConfig().get('languageList'));
+            this.params.options = Espo.Utils.clone(this.getConfig().get('languageList')).sort(function (v1, v2) {
+                return this.getLanguage().translateOption(v1, 'language').localeCompare(this.getLanguage().translateOption(v2, 'language'));
+            }.bind(this));
 
             this.params.options.unshift('');