From: Dan Brown <redacted>
Date: Sun, 7 Mar 2021 17:25:07 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/Ereza/BookStack into Ereza-master
X-Git-Tag: v21.04~1^2~11^2~24^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/1f2fd58e284d8aeeba2b4a68b54394cbde4d0d75

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

1f2fd58e284d8aeeba2b4a68b54394cbde4d0d75
diff --cc app/Config/app.php
index b15a75fce,b4100a302..741c7fd19
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@@ -56,7 -63,7 +56,7 @@@ return 
      'locale' => env('APP_LANG', 'en'),
  
      // Locales available
-     'locales' => ['en', 'ar', 'bg', 'bs', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', 'hu', 'id', 'it', 'ja', 'ko', 'lv', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
 -    'locales' => ['en', 'ar', 'bg', 'ca', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', 'hu', 'it', 'ja', 'ko', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
++    'locales' => ['en', 'ar', 'bg', 'bs', 'ca', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', 'hu', 'id', 'it', 'ja', 'ko', 'lv', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
  
      //  Application Fallback Locale
      'fallback_locale' => 'en',
diff --cc app/Http/Middleware/Localization.php
index ce43a7089,de31b3a38..cd084746c
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@@ -18,7 -18,7 +18,8 @@@ class Localizatio
      protected $localeMap = [
          'ar' => 'ar',
          'bg' => 'bg_BG',
 +        'bs' => 'bs_BA',
+         'ca' => 'ca',
          'da' => 'da_DK',
          'de' => 'de_DE',
          'de_informal' => 'de_DE',
diff --cc resources/lang/en/settings.php
index 86877213d,0810c17cc..ab7f15322
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@@ -231,7 -231,7 +231,8 @@@ return 
          'en' => 'English',
          'ar' => 'العربية',
          'bg' => 'Bǎlgarski',
 +        'bs' => 'Bosanski',
+         'ca' => 'Català',
          'cs' => 'Česky',
          'da' => 'Dansk',
          'de' => 'Deutsch (Sie)',