From: Dan Brown <redacted>
Date: Sat, 22 Sep 2018 11:23:17 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/kmoj86/BookStack into kmoj86-master
X-Git-Tag: v0.24.0~1^2~16^2~4
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/c667c6e235bd009ed13b7d47e2c9c7295773582e

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

c667c6e235bd009ed13b7d47e2c9c7295773582e
diff --cc config/app.php
index b0883b9be,c98efadd5..79c73df4a
--- a/config/app.php
+++ b/config/app.php
@@@ -77,21 -77,8 +77,20 @@@ return 
      */
  
      'locale' => env('APP_LANG', 'en'),
- 
-     'locales' => ['en', 'de', 'es', 'es_AR', 'fr', 'nl', 'pt_BR', 'sk', 'sv', 'ja', 'pl', 'it', 'ru', 'zh_CN', 'zh_TW'],
+     'locales' => ['en', 'ar', 'de', 'es', 'es_AR', 'fr', 'nl', 'pt_BR', 'sk', 'sv', 'ja', 'pl', 'it', 'ru', 'zh_CN', 'zh_TW'],
  
 +    /*
 +    |--------------------------------------------------------------------------
 +    | Auto-detect the locale for public users
 +    |--------------------------------------------------------------------------
 +    |
 +    | For public users their locale can be guessed by headers sent by their
 +    | browser. This is usually set by users in their browser settings.
 +    | If not found the default app locale will be used.
 +    |
 +    */
 +    'auto_detect_locale' => env('APP_AUTO_LANG_PUBLIC', true),
 +
      /*
      |--------------------------------------------------------------------------
      | Application Fallback Locale