Added entry to .env to configure the default / fallback language

MasterZydra · Feb 18, 2024 · f81955b · f81955b
1 parent c8ea6db
commit f81955b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.env.example b/.env.example
@@ -1,6 +1,8 @@
 APP_URL="http://localhost"
 APP_ENV="prod"
 
+APP_LANG="en"
+
 DB_CONNECTION="mariadb"
 DB_HOST="127.0.0.1"
 DB_PORT=3306

diff --git a/doc/README.md b/doc/README.md
@@ -25,6 +25,8 @@ You can use the file `.env.example` as template.
 APP_URL="http://localhost" # URL the application is listening on
 APP_ENV="dev" # 'dev' or 'prod'
 
+APP_LANG="en" # Default/fallback language
+
 DB_CONNECTION="mariadb"
 DB_HOST="127.0.0.1"
 DB_PORT=3306

diff --git a/framework/i18n/Translator.php b/framework/i18n/Translator.php
@@ -2,6 +2,7 @@
 
 namespace Framework\i18n;
 
+use Framework\Config\Config;
 use Framework\Facades\File;
 use Framework\Facades\Path;
 
@@ -44,8 +45,7 @@ public static function translate(string $label): string
     {
         $lang = Language::getLanguage();
         if (!array_key_exists($lang, self::$labels)) {
-            // TODO Fallback language en -> later as setting?
-            $lang = 'en';
+            $lang = Config::env('APP_LANG');
         }
 
         if (!array_key_exists($lang, self::$labels) || !(array_key_exists($label, self::$labels[$lang]))) {

diff --git a/resources/Views/entities/user/edit.php b/resources/Views/entities/user/edit.php
@@ -49,7 +49,6 @@
         <?= __('ForcePasswordChange') ?>
     </label><br><br>
 
-    <?= 'lang' . $user->getLanguageId() ?>
     <?= component('languageSelect', ['selected' => $user->getLanguageId()]) ?>
 
     <strong><?= __('Permissions') ?></strong><br>