From 34616ac195b1cb7ecb1e4f5a8b3998edf445374d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 4 Mar 2020 22:14:25 +0000
Subject: [PATCH] Updated lanauge lists to match latest translations

---
 app/Config/app.php                   |  2 +-
 app/Http/Middleware/Localization.php |  2 ++
 resources/lang/en/settings.php       | 21 +++++++++++----------
 tests/LanguageTest.php               |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/Config/app.php b/app/Config/app.php
index 3b7216b3d..f2a627222 100755
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -52,7 +52,7 @@ return [
     'locale' => env('APP_LANG', 'en'),
 
     // Locales available
-    'locales' => ['en', 'ar', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fr', 'hu', 'nl', 'pt_BR', 'sk', 'cs', 'sv', 'ko', 'ja', 'pl', 'it', 'ru', 'uk', 'zh_CN', 'zh_TW', 'tr'],
+    'locales' => ['en', 'ar', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'hu', 'it', 'ja', 'ko', 'nl', 'pt', 'pt_BR', 'sk', 'sv', 'pl',  'ru', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
 
     //  Application Fallback Locale
     'fallback_locale' => 'en',
diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php
index f36d72725..24edc141a 100644
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@ -31,11 +31,13 @@ class Localization
         'ko' => 'ko_KR',
         'nl' => 'nl_NL',
         'pl' => 'pl_PL',
+        'pt' => 'pl_PT',
         'pt_BR' => 'pt_BR',
         'ru' => 'ru',
         'sk' => 'sk_SK',
         'sv' => 'sv_SE',
         'uk' => 'uk_UA',
+        'vi' => 'vi_VN',
         'zh_CN' => 'zh_CN',
         'zh_TW' => 'zh_TW',
         'tr' => 'tr_TR',
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index ab274256f..46ad7b578 100755
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -185,27 +185,28 @@ return [
     'language_select' => [
         'en' => 'English',
         'ar' => 'العربية',
+        'cs' => 'Česky',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
         'es' => 'Español',
         'es_AR' => 'Español Argentina',
         'fr' => 'Français',
-        'nl' => 'Nederlands',
-        'pt_BR' => 'Português do Brasil',
-        'sk' => 'Slovensky',
-        'cs' => 'Česky',
-        'sv' => 'Svenska',
-        'ko' => '한국어',
-        'ja' => '日本語',
-        'pl' => 'Polski',
+        'hu' => 'Magyar',
         'it' => 'Italian',
+        'ja' => '日本語',
+        'ko' => '한국어',
+        'nl' => 'Nederlands',
+        'pl' => 'Polski',
+        'pt_BR' => 'Português do Brasil',
         'ru' => 'Русский',
+        'sk' => 'Slovensky',
+        'sv' => 'Svenska',
+        'tr' => 'Türkçe',
         'uk' => 'Українська',
+        'vi' => 'Tiếng Việt',
         'zh_CN' => '简体中文',
         'zh_TW' => '繁體中文',
-        'hu' => 'Magyar',
-        'tr' => 'Türkçe',
     ]
     //!////////////////////////////////
 ];
diff --git a/tests/LanguageTest.php b/tests/LanguageTest.php
index cd68756ae..d7654b867 100644
--- a/tests/LanguageTest.php
+++ b/tests/LanguageTest.php
@@ -19,7 +19,7 @@ class LanguageTest extends TestCase
         $configLocales = config('app.locales');
         sort($configLocales);
         sort($this->langs);
-        $this->assertTrue(implode(':', $this->langs) === implode(':', $configLocales), 'app.locales configuration variable matches found lang files');
+        $this->assertEquals(implode(':', $configLocales), implode(':', $this->langs), 'app.locales configuration variable does not match those found in lang files');
     }
 
     public function test_correct_language_if_not_logged_in()