From 4334928fbd44b8bb8a8a4e7c423bf0b792afe881 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 16 Mar 2020 06:54:18 +0100
Subject: [PATCH] Add sort to language.

---
 app/Http/Controllers/PreferencesController.php | 4 +++-
 resources/views/v1/preferences/index.twig      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index d99d1f9002..50b5aea822 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -86,13 +86,14 @@ class PreferencesController extends Controller
         $viewRange          = $viewRangePref->data;
         $frontPageAccounts  = app('preferences')->get('frontPageAccounts', $accountIds);
         $language           = app('preferences')->get('language', config('firefly.default_language', 'en_US'))->data;
+        $languages          = config('firefly.languages');
         $listPageSize       = app('preferences')->get('listPageSize', 50)->data;
         $customFiscalYear   = app('preferences')->get('customFiscalYear', 0)->data;
         $fiscalYearStartStr = app('preferences')->get('fiscalYearStart', '01-01')->data;
         $fiscalYearStart    = date('Y') . '-' . $fiscalYearStartStr;
         $tjOptionalFields   = app('preferences')->get('transaction_journal_optional_fields', [])->data;
 
-        ksort($language);
+        ksort($languages);
 
         // an important fallback is that the frontPageAccount array gets refilled automatically
         // when it turns up empty.
@@ -106,6 +107,7 @@ class PreferencesController extends Controller
                 'language',
                 'groupedAccounts',
                 'frontPageAccounts',
+                'languages',
                 'tjOptionalFields',
                 'viewRange',
                 'customFiscalYear',
diff --git a/resources/views/v1/preferences/index.twig b/resources/views/v1/preferences/index.twig
index efac47f5b2..3feda66700 100644
--- a/resources/views/v1/preferences/index.twig
+++ b/resources/views/v1/preferences/index.twig
@@ -30,7 +30,7 @@
                                         <div class="form-group">
                                             <div class="col-sm-12">
                                                 <select class="form-control" id="lang_holder" name="language">
-                                                    {% for key, lang in Config.get('firefly.languages') %}
+                                                    {% for key, lang in languages %}
                                                     <option {% if language == key %}
                                                         selected
                                                     {% endif %} value="{{ key }}">{{ lang.name_locale }} ({{ lang.name_english }})</option>