Allows the user to set the default language for new and unauthenticated visitors.

2025-02-25 18:45:27 -06:00 · 2020-01-31 07:39:24 +01:00 · 2020-01-31 07:39:24 +01:00 · d056f0d221
commit d056f0d221
parent 3771cc3b75
3 changed files with 50 additions and 44 deletions
--- a/.env.example
+++ b/.env.example
@ -15,6 +15,12 @@ SITE_OWNER=mail@example.com
 # If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
 APP_KEY=SomeRandomStringOf32CharsExactly

+#
+# Firefly III will launch using this language (for new users and unauthenticated visitors)
+# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/master/resources/lang
+#
+# If text is still in English, remember that not everything may have been translated.
+DEFAULT_LANGUAGE=en_US

 # Change this value to your preferred time zone.
 # Example: Europe/Amsterdam
--- a/config/app.php
+++ b/config/app.php
@ -31,7 +31,7 @@ return [
    'debug'           => env('APP_DEBUG', false),
    'url'             => envNonEmpty('APP_URL', 'http://localhost'),
    'timezone'        => envNonEmpty('TZ', 'UTC'),
-    'locale'          => 'en_US',
+    'locale'          => envNonEmpty('DEFAULT_LANGUAGE', 'en_US'),
    'fallback_locale' => 'en_US',
    'key'             => env('APP_KEY'),
    'cipher'          => 'AES-256-CBC',
@ -147,7 +147,7 @@ return [
        'PiggyBankForm' => \FireflyIII\Support\Facades\PiggyBankForm::class,
        'RuleForm'      => \FireflyIII\Support\Facades\RuleForm::class,
        'Google2FA'     => PragmaRX\Google2FALaravel\Facade::class,
-        'Twig' => TwigBridge\Facade\Twig::class,
+        'Twig'          => TwigBridge\Facade\Twig::class,

    ],

--- a/config/firefly.php
+++ b/config/firefly.php
@ -135,31 +135,31 @@ return [
    'feature_flags'                => [
        'export' => true,
    ],
-    'encryption'             => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'),
-    'version'                => '5.0.3',
-    'api_version'            => '1.0.0',
-    'db_version'             => 12,
-    'maxUploadSize'          => 15242880,
-    'send_error_message'     => env('SEND_ERROR_MESSAGE', true),
-    'site_owner'             => env('SITE_OWNER', ''),
-    'send_registration_mail' => env('SEND_REGISTRATION_MAIL', true),
-    'demo_username'          => env('DEMO_USERNAME', ''),
-    'demo_password'          => env('DEMO_PASSWORD', ''),
-    'is_sandstorm'           => env('IS_SANDSTORM', 'unknown'),
-    'bunq_use_sandbox'       => env('BUNQ_USE_SANDBOX', false),
-    'fixer_api_key'          => env('FIXER_API_KEY', ''),
-    'mapbox_api_key'         => env('MAPBOX_API_KEY', ''),
-    'trusted_proxies'        => env('TRUSTED_PROXIES', ''),
-    'search_result_limit'    => env('SEARCH_RESULT_LIMIT', 50),
-    'send_report_journals'   => envNonEmpty('SEND_REPORT_JOURNALS', true),
-    'tracker_site_id'        => env('TRACKER_SITE_ID', ''),
-    'tracker_url'            => env('TRACKER_URL', ''),
-    'disable_frame_header'   => env('DISABLE_FRAME_HEADER', false),
-    'disable_csp_header'     => env('DISABLE_CSP_HEADER', false),
-    'login_provider'         => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),
-    'cer_provider'           => envNonEmpty('CER_PROVIDER', 'fixer'),
-    'update_endpoint'        => 'https://version.firefly-iii.org/index.json',
-    'default_location'       => [
+    'encryption'                   => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'),
+    'version'                      => '5.0.3',
+    'api_version'                  => '1.0.0',
+    'db_version'                   => 12,
+    'maxUploadSize'                => 15242880,
+    'send_error_message'           => env('SEND_ERROR_MESSAGE', true),
+    'site_owner'                   => env('SITE_OWNER', ''),
+    'send_registration_mail'       => env('SEND_REGISTRATION_MAIL', true),
+    'demo_username'                => env('DEMO_USERNAME', ''),
+    'demo_password'                => env('DEMO_PASSWORD', ''),
+    'is_sandstorm'                 => env('IS_SANDSTORM', 'unknown'),
+    'bunq_use_sandbox'             => env('BUNQ_USE_SANDBOX', false),
+    'fixer_api_key'                => env('FIXER_API_KEY', ''),
+    'mapbox_api_key'               => env('MAPBOX_API_KEY', ''),
+    'trusted_proxies'              => env('TRUSTED_PROXIES', ''),
+    'search_result_limit'          => env('SEARCH_RESULT_LIMIT', 50),
+    'send_report_journals'         => envNonEmpty('SEND_REPORT_JOURNALS', true),
+    'tracker_site_id'              => env('TRACKER_SITE_ID', ''),
+    'tracker_url'                  => env('TRACKER_URL', ''),
+    'disable_frame_header'         => env('DISABLE_FRAME_HEADER', false),
+    'disable_csp_header'           => env('DISABLE_CSP_HEADER', false),
+    'login_provider'               => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),
+    'cer_provider'                 => envNonEmpty('CER_PROVIDER', 'fixer'),
+    'update_endpoint'              => 'https://version.firefly-iii.org/index.json',
+    'default_location'             => [
        'longitude'  => env('MAP_DEFAULT_LONG', '5.916667'),
        'latitude'   => env('MAP_DEFAULT_LAT', '51.983333'),
        'zoom_level' => env('MAP_DEFAULT_ZOOM', '6'),
@ -313,22 +313,22 @@ return [
     */
    'languages'                    => [
        // currently enabled languages
-        'en_US'  => ['name_locale' => 'English', 'name_english' => 'English'],
-        'cs_CZ'  => ['name_locale' => 'Czech', 'name_english' => 'Czech'],
-        'es_ES'  => ['name_locale' => 'Español', 'name_english' => 'Spanish'],
-        'de_DE'  => ['name_locale' => 'Deutsch', 'name_english' => 'German'],
-        'fr_FR'  => ['name_locale' => 'Français', 'name_english' => 'French'],
-        'it_IT'  => ['name_locale' => 'Italiano', 'name_english' => 'Italian'],
-        'nb_NO'  => ['name_locale' => 'Norsk', 'name_english' => 'Norwegian'],
-        'nl_NL'  => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch'],
-        'pl_PL'  => ['name_locale' => 'Polski', 'name_english' => 'Polish '],
-        'pt_BR'  => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portuguese (Brazil)'],
-        'ro_RO'  => ['name_locale' => 'Română', 'name_english' => 'Romanian'],
-        'ru_RU'  => ['name_locale' => 'Русский', 'name_english' => 'Russian'],
-        'zh_TW'  => ['name_locale' => 'Chinese Traditional', 'name_english' => 'Chinese Traditional'],
-        'zh_CN'  => ['name_locale' => 'Chinese Simplified', 'name_english' => 'Chinese Simplified'],
-        'hu_HU'  => ['name_locale' => 'Hungarian', 'name_english' => 'Hungarian'],
-        'sv_SE'  => ['name_locale' => 'Svenska', 'name_english' => 'Swedish'],
+        'en_US' => ['name_locale' => 'English', 'name_english' => 'English'],
+        'cs_CZ' => ['name_locale' => 'Czech', 'name_english' => 'Czech'],
+        'es_ES' => ['name_locale' => 'Español', 'name_english' => 'Spanish'],
+        'de_DE' => ['name_locale' => 'Deutsch', 'name_english' => 'German'],
+        'fr_FR' => ['name_locale' => 'Français', 'name_english' => 'French'],
+        'it_IT' => ['name_locale' => 'Italiano', 'name_english' => 'Italian'],
+        'nb_NO' => ['name_locale' => 'Norsk', 'name_english' => 'Norwegian'],
+        'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch'],
+        'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish '],
+        'pt_BR' => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portuguese (Brazil)'],
+        'ro_RO' => ['name_locale' => 'Română', 'name_english' => 'Romanian'],
+        'ru_RU' => ['name_locale' => 'Русский', 'name_english' => 'Russian'],
+        'zh_TW' => ['name_locale' => 'Chinese Traditional', 'name_english' => 'Chinese Traditional'],
+        'zh_CN' => ['name_locale' => 'Chinese Simplified', 'name_english' => 'Chinese Simplified'],
+        'hu_HU' => ['name_locale' => 'Hungarian', 'name_english' => 'Hungarian'],
+        'sv_SE' => ['name_locale' => 'Svenska', 'name_english' => 'Swedish'],

        // currently disabled languages:
        //        'bg_BG' => ['name_locale' => 'Български', 'name_english' => 'Bulgarian'],
@ -546,7 +546,7 @@ return [
        'range' => 200,
    ],
    'default_currency' => 'EUR',
-    'default_language' => 'en_US',
+    'default_language' => envNonEmpty('DEFAULT_LANGUAGE', 'en_US'),
    'search_modifiers' => ['amount_is', 'amount', 'amount_max', 'amount_min', 'amount_less', 'amount_more', 'source', 'destination', 'category',
                           'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after', 'from', 'to', 'tag', 'created_on',
                           'updated_on'],