diff --git a/.env.example b/.env.example index a890d88..bc37c79 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,3 @@ -DEFAULT_LANGUAGE=en - APP_NAME='Hypothetical' APP_ENV=local APP_KEY= diff --git a/app/Utilities/Language.php b/app/Utilities/Language.php index 2e7277e..a31abfd 100644 --- a/app/Utilities/Language.php +++ b/app/Utilities/Language.php @@ -18,7 +18,7 @@ class Language */ public static function getSessionLanguage() { - return session(self::$language_cookie, env('DEFAULT_LANGUAGE', 'en')); + return session(self::$language_cookie, env('APP_LOCALE', 'en')); } /** @@ -43,7 +43,7 @@ class Language public static function select($string_array) { $session_language = self::getSessionLanguage(); - $default_language = env('DEFAULT_LANGUAGE'); + $default_language = env('APP_LOCALE'); $string = ''; if (array_key_exists($session_language, $string_array)) { diff --git a/readme.md b/readme.md index 075d25c..8253adf 100644 --- a/readme.md +++ b/readme.md @@ -121,7 +121,7 @@ Other information about database interaction, routing, controllers, etc can be v ### Language -The default language is set by the `DEFAULT_LANGUAGE` variable in the `.env` file; this will be the language used until the cookie has been updated. +The default language is set by the `APP_LOCALE` variable in the `.env` file; this will be the language used until the cookie has been updated. The language cookie can be updated a number of ways: diff --git a/resources/views/templates/public.blade.php b/resources/views/templates/public.blade.php index 55e03de..70193d9 100644 --- a/resources/views/templates/public.blade.php +++ b/resources/views/templates/public.blade.php @@ -8,7 +8,7 @@ var env = { appName: "{!! env('APP_NAME') !!}", appLang: "{{ Language::getSessionLanguage() }}", - appDefaultLang: "{{ env('DEFAULT_LANGUAGE') }}", + appDefaultLang: "{{ env('APP_LOCALE') }}", apiToken: "{{ Auth::check() ? '?api_token=' . Auth::user()->api_token : '' }}", currentUrl: "{{ Request::url() }}", csrfToken: "{{ csrf_token() }}",