From: Dan Brown <redacted>
Date: Wed, 4 Mar 2020 22:22:08 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/Binternet/BookStack into Binternet-master
X-Git-Tag: v0.28.3~1^2~22
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/b94b945fb03e21a1997cfe6e50148967586cb26d

Merge branch 'master' of git://github.com/Binternet/BookStack into Binternet-master
---

b94b945fb03e21a1997cfe6e50148967586cb26d
diff --cc app/Config/app.php
index f2a627222,27978bd1d..52c808050
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@@ -52,7 -52,7 +52,7 @@@ return 
      'locale' => env('APP_LANG', 'en'),
  
      // Locales available
-     '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',],
 -    'locales' => ['en', 'ar', 'de', 'de_informal', 'es', 'es_AR', 'fr', 'he', 'nl', 'pt_BR', 'sk', 'cs', 'sv', 'kr', 'ja', 'pl', 'it', 'ru', 'uk', 'zh_CN', 'zh_TW', 'tr'],
++    'locales' => ['en', 'ar', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', '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 --cc app/Http/Middleware/Localization.php
index 24edc141a,04d121b09..b6cdd9e7b
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@@ -26,12 -25,12 +26,13 @@@ class Localizatio
          'es' => 'es_ES',
          'es_AR' => 'es_AR',
          'fr' => 'fr_FR',
+         'he' => 'he_IL',
          'it' => 'it_IT',
          'ja' => 'ja',
 -        'kr' => 'ko_KR',
 +        'ko' => 'ko_KR',
          'nl' => 'nl_NL',
          'pl' => 'pl_PL',
 +        'pt' => 'pl_PT',
          'pt_BR' => 'pt_BR',
          'ru' => 'ru',
          'sk' => 'sk_SK',