Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to nb-NO from no-NO for Norwegian #15143

Merged
merged 3 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.docker
Original file line number Diff line number Diff line change
Expand Up @@ -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

# --------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion .env.dusk.example
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{

}
};
4 changes: 3 additions & 1 deletion resources/lang/en-US/localizations.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +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',
'fa-IR'=> 'Persian',
'pl-PL'=> 'Polish',
'pt-PT'=> 'Portuguese',
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/SnipeTranslatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"
);
}
Expand Down
Loading