diff --git a/.env.docker b/.env.docker index 35c10bfde1..9e50383014 100644 --- a/.env.docker +++ b/.env.docker @@ -14,7 +14,7 @@ APP_KEY=base64:3ilviXqB9u6DX1NRcyWGJ+sjySF+H18CPDGb3+IVwMQ= APP_URL=http://localhost:8000 # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones - TZ identifier APP_TIMEZONE='UTC' -APP_LOCALE=en +APP_LOCALE=en-US MAX_RESULTS=500 # -------------------------------------------- diff --git a/.env.dusk.example b/.env.dusk.example index 2f16f44c7a..e306a06cf8 100644 --- a/.env.dusk.example +++ b/.env.dusk.example @@ -6,7 +6,7 @@ APP_DEBUG=false APP_KEY=base64:hTUIUh9CP6dQx+6EjSlfWTgbaMaaRvlpEwk45vp+xmk= APP_URL=http://127.0.0.1:8000 APP_TIMEZONE='US/Eastern' -APP_LOCALE=en +APP_LOCALE=en-US APP_LOCKED=false MAX_RESULTS=200 diff --git a/TESTING.md b/TESTING.md index 92f3184eec..002cf27d3a 100644 --- a/TESTING.md +++ b/TESTING.md @@ -20,7 +20,7 @@ APP_DEBUG=true APP_KEY=base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU= APP_URL=http://localhost:8000 APP_TIMEZONE='UTC' -APP_LOCALE=en +APP_LOCALE=en-US # -------------------------------------------- # REQUIRED: DATABASE SETTINGS diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index c6de362dcb..5b32906273 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -62,7 +62,7 @@ class Helper 'mn' => 'mn-MN', // Mongolian 'ms' => 'ms-MY', // Malay 'nl' => 'nl-NL', // Dutch - 'no' => 'no-NO', // Norwegian + 'no' => 'nb-NO', // Norwegian Bokmål 'pl' => 'pl-PL', // Polish 'pt' => 'pt-PT', // Portuguese 'ro' => 'ro-RO', // Romanian diff --git a/resources/lang/en-US/localizations.php b/resources/lang/en-US/localizations.php index f1232dd138..59f3dc1acb 100644 --- a/resources/lang/en-US/localizations.php +++ b/resources/lang/en-US/localizations.php @@ -41,6 +41,8 @@ return [ 'mi-NZ'=> 'Maori', 'mn-MN'=> 'Mongolian', 'no-NO'=> 'Norwegian', + 'nb-NO'=> 'Norwegian Bokmål', + 'nn-NO'=> 'Norwegian Nynorsk', 'fa-IR'=> 'Persian', 'pl-PL'=> 'Polish', 'pt-PT'=> 'Portuguese',