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?hp=-c

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

c667c6e235bd009ed13b7d47e2c9c7295773582e
diff --combined 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
@@@ -258,7 -245,7 +257,7 @@@
          'Activity' => BookStack\Services\Facades\Activity::class,
          'Setting'  => BookStack\Services\Facades\Setting::class,
          'Views'    => BookStack\Services\Facades\Views::class,
 -        'Images'   => \BookStack\Services\Facades\Images::class,
 +        'Images'   => BookStack\Services\Facades\Images::class,
  
      ],
  
diff --combined resources/lang/en/settings.php
index 839199b1f,6b1eb3929..46ef8d29f
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@@ -32,8 -32,9 +32,8 @@@ return 
      'app_primary_color' => 'Application primary color',
      'app_primary_color_desc' => 'This should be a hex value. <br>Leave empty to reset to the default color.',
      'app_homepage' => 'Application Homepage',
 -    'app_homepage_desc' => 'Select a page to show on the homepage instead of the default view. Page permissions are ignored for selected pages.',
 -    'app_homepage_default' => 'Default homepage view chosen',
 -    'app_homepage_books' => 'Or select the books page as your homepage. This will override any page selected as your homepage.',
 +    'app_homepage_desc' => 'Select a view to show on the homepage instead of the default view. Page permissions are ignored for selected pages.',
 +    'app_homepage_select' => 'Select a page',
      'app_disable_comments' => 'Disable comments',
      'app_disable_comments_desc' => 'Disable comments across all pages in the application. Existing comments are not shown.',
  
@@@ -90,7 -91,6 +90,7 @@@
      'role_manage_settings' => 'Manage app settings',
      'role_asset' => 'Asset Permissions',
      'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
 +    'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
      'role_all' => 'All',
      'role_own' => 'Own',
      'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
@@@ -135,6 -135,7 +135,7 @@@
      ///////////////////////////////////
      'language_select' => [
          'en' => 'English',
+         'ar' => 'العربية',
          'de' => 'Deutsch',
          'es' => 'Español',
          'es_AR' => 'Español Argentina',
@@@ -148,7 -149,7 +149,7 @@@
          'it' => 'Italian',
          'ru' => 'Русский',
          'zh_CN' => '简体中文',
 -	    'zh_TW' => '繁體中文'
 +        'zh_TW' => '繁體中文'
      ]
      ///////////////////////////////////
  ];