From ba6d8ae8c72a2ef1d0a90a3864ca6c223215b0b3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 23 Jul 2024 17:15:44 +0100
Subject: [PATCH 1/3] Switch to nb-NO from no-NO

Signed-off-by: snipe <snipe@snipe.net>
---
 .env.docker                            | 2 +-
 .env.dusk.example                      | 2 +-
 TESTING.md                             | 2 +-
 app/Helpers/Helper.php                 | 2 +-
 resources/lang/en-US/localizations.php | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.env.docker b/.env.docker
index 35c10bfde1fc..9e5038301454 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 2f16f44c7ac6..e306a06cf8f6 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 92f3184eecd0..002cf27d3a99 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 c6de362dcb47..5b32906273b3 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 f1232dd1385c..59f3dc1acb47 100644
--- a/resources/lang/en-US/localizations.php
+++ b/resources/lang/en-US/localizations.php
@@ -41,6 +41,8 @@
         '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',

From fecd877e8b547f7a22daa57320e64c3621647bde Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 23 Jul 2024 17:35:06 +0100
Subject: [PATCH 2/3] Migration

Signed-off-by: snipe <snipe@snipe.net>
---
 ...07_23_172032_change_no__n_o_to_nb__n_o.php | 28 +++++++++++++++++++
 resources/lang/en-US/localizations.php        |  4 +--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 database/migrations/2024_07_23_172032_change_no__n_o_to_nb__n_o.php

diff --git a/database/migrations/2024_07_23_172032_change_no__n_o_to_nb__n_o.php b/database/migrations/2024_07_23_172032_change_no__n_o_to_nb__n_o.php
new file mode 100644
index 000000000000..6ed7e2b3a1f5
--- /dev/null
+++ b/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
+    {
+
+    }
+};
diff --git a/resources/lang/en-US/localizations.php b/resources/lang/en-US/localizations.php
index 59f3dc1acb47..f335ddc1b343 100644
--- a/resources/lang/en-US/localizations.php
+++ b/resources/lang/en-US/localizations.php
@@ -40,9 +40,9 @@
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        //'no-NO'=> 'Norwegian',
         'nb-NO'=> 'Norwegian Bokmål',
-        'nn-NO'=> 'Norwegian Nynorsk',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',

From effd2bce24d5f8dbdfcc4eed10cbd1513bc658b0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 23 Jul 2024 18:22:13 +0100
Subject: [PATCH 3/3] Fixed test to use nb-NO

Signed-off-by: snipe <snipe@snipe.net>
---
 tests/Unit/SnipeTranslatorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Unit/SnipeTranslatorTest.php b/tests/Unit/SnipeTranslatorTest.php
index e492bdbf633e..d374bf913475 100644
--- a/tests/Unit/SnipeTranslatorTest.php
+++ b/tests/Unit/SnipeTranslatorTest.php
@@ -34,7 +34,7 @@ public function testBackupString()
     {
         $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"
         );
     }