Merge pull request #15143 from snipe/fixes/no-NO-language

Switch to nb-NO from no-NO for Norwegian

.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
 
 # --------------------------------------------

.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
 

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

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

database/migrations/2024_07_23_172032_change_no__n_o_to_nb__n_o.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Models\Setting;
+use App\Models\User;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Setting::where('locale', 'no-NO')->update(['locale' => 'nb-NO']);
+        User::where('locale', 'no-NO')->update(['locale' => 'nb-NO']);
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+
+    }
+};

resources/lang/en-US/localizations.php

@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        //'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',

tests/Unit/SnipeTranslatorTest.php

@@ -34,7 +34,7 @@ class SnipeTranslatorTest extends TestCase
     {
         $this->assertEquals(
             'Ingen sikkerhetskopier ble gjort ennå',
-            trans('backup::notifications.no_backups_info',[],'no-NO'),
+            trans('backup::notifications.no_backups_info',[],'nb-NO'),
             "Norwegian 'no backups info' message should be here"
         );
     }