From: Dan Brown <redacted>
Date: Sat, 14 Apr 2018 15:00:03 +0000 (+0100)
Subject: Merge pull request #780 from jasoncheng7115/master
X-Git-Tag: v0.21.0~1^2~12
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/f9feeef5c94141718e7617cd67edd98ea8b2170c?hp=-c

Merge pull request #780 from jasoncheng7115/master

Add Language zh_TW
---

f9feeef5c94141718e7617cd67edd98ea8b2170c
diff --combined config/app.php
index ca30ee2a0,b3bc4b8fd..69e2380e8
--- a/config/app.php
+++ b/config/app.php
@@@ -4,28 -4,12 +4,28 @@@ return 
  
      'env' => env('APP_ENV', 'production'),
  
 +    /**
 +     * Set the default view type for various lists. Can be overridden by user preferences.
 +     * This will be used for public viewers and users that have not set a preference.
 +     */
      'views' => [
          'books' => env('APP_VIEWS_BOOKS', 'list')
      ],
  
 +    /**
 +     * Allow <script> tags to entered within page content.
 +     * <script> tags are escaped by default.
 +     * Even when overridden the WYSIWYG editor may still escape script content.
 +     */
      'allow_content_scripts' => env('ALLOW_CONTENT_SCRIPTS', false),
  
 +    /**
 +     * Override the default behaviour for allowing crawlers to crawl the instance.
 +     * May be ignored if view has be overridden or modified.
 +     * Defaults to null since, if not set, 'app-public' status used instead.
 +     */
 +    'allow_robots' => env('ALLOW_ROBOTS', null),
 +
      /*
      |--------------------------------------------------------------------------
      | Application Debug Mode
@@@ -77,7 -61,7 +77,7 @@@
      */
  
      'locale' => env('APP_LANG', 'en'),
-     'locales' => ['en', 'de', 'es', 'es_AR', 'fr', 'nl', 'pt_BR', 'sk', 'sv', 'ja', 'pl', 'it', 'ru', 'zh_CN'],
+     'locales' => ['en', 'de', 'es', 'es_AR', 'fr', 'nl', 'pt_BR', 'sk', 'sv', 'ja', 'pl', 'it', 'ru', 'zh_CN', 'zh_TW'],
  
      /*
      |--------------------------------------------------------------------------