Skip to content

Commit

Permalink
Fixed language locale setting issue
Browse files Browse the repository at this point in the history
Attempted to access an array that had been filtered and therefore could
have holes within, including as position 0 which would then be
accessed.
Also added cs language to internal map

Related to BookStackApp#4068
  • Loading branch information
ssddanbrown committed Feb 27, 2023
1 parent c7e33d1 commit 7c27d26
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
5 changes: 3 additions & 2 deletions app/Util/LanguageManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class LanguageManager
'bg' => ['iso' => 'bg_BG', 'windows' => 'Bulgarian'],
'bs' => ['iso' => 'bs_BA', 'windows' => 'Bosnian (Latin)'],
'ca' => ['iso' => 'ca', 'windows' => 'Catalan'],
'cs' => ['iso' => 'cs_CZ', 'windows' => 'Czech'],
'da' => ['iso' => 'da_DK', 'windows' => 'Danish'],
'de' => ['iso' => 'de_DE', 'windows' => 'German'],
'de_informal' => ['iso' => 'de_DE', 'windows' => 'German'],
Expand Down Expand Up @@ -120,14 +121,14 @@ public function setPhpDateTimeLocale(string $language): void
$isoLang = $this->localeMap[$language]['iso'] ?? '';
$isoLangPrefix = explode('_', $isoLang)[0];

$locales = array_filter([
$locales = array_values(array_filter([
$isoLang ? $isoLang . '.utf8' : false,
$isoLang ?: false,
$isoLang ? str_replace('_', '-', $isoLang) : false,
$isoLang ? $isoLangPrefix . '.UTF-8' : false,
$this->localeMap[$language]['windows'] ?? false,
$language,
]);
]));

if (!empty($locales)) {
setlocale(LC_TIME, $locales[0], ...array_slice($locales, 1));
Expand Down
11 changes: 10 additions & 1 deletion tests/LanguageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class LanguageTest extends TestCase
{
protected $langs;
protected array $langs;

/**
* LanguageTest constructor.
Expand Down Expand Up @@ -81,4 +81,13 @@ public function test_rtl_config_set_if_lang_is_rtl()
$this->get('/');
$this->assertTrue(config('app.rtl'), 'App RTL config should have been set to true by middleware');
}

public function test_unknown_lang_does_not_break_app()
{
config()->set('app.locale', 'zz');

$loginReq = $this->get('/login', ['Accept-Language' => 'zz']);
$loginReq->assertOk();
$loginReq->assertSee('Log In');
}
}

0 comments on commit 7c27d26

Please sign in to comment.