Aligned norwegian lang with others and used correct locale

diff --git a/app/Config/app.php b/app/Config/app.php
index 120af0a8d5d86977e8250ac44cd5cd03e42119e0..762845e9f2bb681d47504c66a72cf8d37d49cc85 100755 (executable)
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -63,7 +63,7 @@ return [
     'locale' => env('APP_LANG', 'en'),
 
     // Locales available
-    'locales' => ['en', 'ar', 'bg', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', 'hu', 'it', 'ja', 'ko', 'nl', 'no_NB', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
+    'locales' => ['en', 'ar', 'bg', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', 'hu', 'it', 'ja', 'ko', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
 
     //  Application Fallback Locale
     'fallback_locale' => 'en',

diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php
index 8b44e4a2aea25814710fca21bec021cb3ab3a133..6a8ec237dd0b47b5a3be5cb7272dc456fecd33f7 100644 (file)
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@ -9,13 +9,11 @@ class Localization
 
     /**
      * Array of right-to-left locales
-     * @var array
      */
     protected $rtlLocales = ['ar', 'he'];
 
     /**
      * Map of BookStack locale names to best-estimate system locale names.
-     * @var array
      */
     protected $localeMap = [
         'ar' => 'ar',
@@ -32,7 +30,7 @@ class Localization
         'ja' => 'ja',
         'ko' => 'ko_KR',
         'nl' => 'nl_NL',
-        'no' => 'no_NB',
+        'nb' => 'nb_NO',
         'pl' => 'pl_PL',
         'pt' => 'pl_PT',
         'pt_BR' => 'pt_BR',

diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index a81a801bbd0cab8755be3a9775c682b945d3b3ff..414650d21bac0c5187afc841de93f0f0ea40aaed 100755 (executable)
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -239,7 +239,7 @@ return [
         'ja' => '日本語',
         'ko' => '한국어',
         'nl' => 'Nederlands',
-        'no_NB' => 'Norsk (Bokmål)',
+        'nb' => 'Norsk (Bokmål)',
         'pl' => 'Polski',
         'pt_BR' => 'Português do Brasil',
         'ru' => 'Русский',

diff --git a/resources/lang/no_NB/activities.php b/resources/lang/nb/activities.php
similarity index 100%
rename from resources/lang/no_NB/activities.php
rename to resources/lang/nb/activities.php

diff --git a/resources/lang/no_NB/auth.php b/resources/lang/nb/auth.php
similarity index 100%
rename from resources/lang/no_NB/auth.php
rename to resources/lang/nb/auth.php

diff --git a/resources/lang/no_NB/common.php b/resources/lang/nb/common.php
similarity index 100%
rename from resources/lang/no_NB/common.php
rename to resources/lang/nb/common.php

diff --git a/resources/lang/no_NB/components.php b/resources/lang/nb/components.php
similarity index 100%
rename from resources/lang/no_NB/components.php
rename to resources/lang/nb/components.php

diff --git a/resources/lang/no_NB/entities.php b/resources/lang/nb/entities.php
similarity index 100%
rename from resources/lang/no_NB/entities.php
rename to resources/lang/nb/entities.php

diff --git a/resources/lang/no_NB/errors.php b/resources/lang/nb/errors.php
similarity index 100%
rename from resources/lang/no_NB/errors.php
rename to resources/lang/nb/errors.php

diff --git a/resources/lang/no_NB/pagination.php b/resources/lang/nb/pagination.php
similarity index 100%
rename from resources/lang/no_NB/pagination.php
rename to resources/lang/nb/pagination.php

diff --git a/resources/lang/no_NB/passwords.php b/resources/lang/nb/passwords.php
similarity index 100%
rename from resources/lang/no_NB/passwords.php
rename to resources/lang/nb/passwords.php

diff --git a/resources/lang/no_NB/settings.php b/resources/lang/nb/settings.php
similarity index 100%
rename from resources/lang/no_NB/settings.php
rename to resources/lang/nb/settings.php

diff --git a/resources/lang/no_NB/validation.php b/resources/lang/nb/validation.php
similarity index 100%
rename from resources/lang/no_NB/validation.php
rename to resources/lang/nb/validation.php