Sekretaerbaer-Netz/friendica-sekretaerbaer-netz
1
0
Fork 0
forked from Friendica/friendica
Code Pull requests Activity

Issue 14881: Fixed language detection for danish

Browse source
This commit is contained in:
Michael 2025-04-15 02:03:35 +00:00
parent 83f561ea49
commit e7bd6e7663
1 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/Core/L10n.php
View file

@ -51,6 +51,11 @@ class L10n
'zh-cn' => '简体中文', 'zh-cn' => '简体中文',
]; ];
CONST LANG_PARENTS = [
'en-gb' => 'en', 'da-dk' => 'da', 'fi-fi' => 'fi',
'nb-no' => 'nb', 'pt-br' => 'pt', 'zh-cn' => 'zh'
];
/** @var string Undetermined language */ /** @var string Undetermined language */
const UNDETERMINED_LANGUAGE = 'un'; const UNDETERMINED_LANGUAGE = 'un';
@ -150,6 +155,11 @@ class L10n
$a = new \stdClass(); $a = new \stdClass();
$a->strings = []; $a->strings = [];
$child = array_search($lang, $this::LANG_PARENTS);
if ($child) {
$lang = $child;
}
// load enabled addons strings // load enabled addons strings
$addons = array_keys($this->config->get('addons') ?? []); $addons = array_keys($this->config->get('addons') ?? []);
foreach ($addons as $addon) { foreach ($addons as $addon) {
@ -203,6 +213,8 @@ class L10n
// start with quality zero (every guessed language is more acceptable ..) // start with quality zero (every guessed language is more acceptable ..)
$current_q = 0; $current_q = 0;
$supported = self::getSupportedLanguages();
foreach ($acceptedLanguages as $acceptedLanguage) { foreach ($acceptedLanguages as $acceptedLanguage) {
$res = preg_match( $res = preg_match(
'/^([a-z]{1,8}(?:-[a-z]{1,8})*)(?:;\s*q=(0(?:\.[0-9]{1,3})?|1(?:\.0{1,3})?))?$/i', '/^([a-z]{1,8}(?:-[a-z]{1,8})*)(?:;\s*q=(0(?:\.[0-9]{1,3})?|1(?:\.0{1,3})?))?$/i',
@ -230,8 +242,7 @@ class L10n
while (count($lang_code)) { while (count($lang_code)) {
// try to mix them so we can get double-code parts too // try to mix them so we can get double-code parts too
$match_lang = strtolower(join('-', $lang_code)); $match_lang = strtolower(join('-', $lang_code));
if (file_exists(__DIR__ . "/../../view/lang/$match_lang") && if (in_array($match_lang, $supported)) {
is_dir(__DIR__ . "/../../view/lang/$match_lang")) {
if ($lang_quality > $current_q) { if ($lang_quality > $current_q) {
$current_lang = $match_lang; $current_lang = $match_lang;
$current_q = $lang_quality; $current_q = $lang_quality;
@ -247,6 +258,20 @@ class L10n
return $current_lang; return $current_lang;
} }
private static function getSupportedLanguages(): array
{
$languages = [];
foreach (glob('view/lang/*/strings.php') as $language) {
$code = str_replace(['view/lang/', '/strings.php'], [], $language);
if (!empty(self::LANG_PARENTS[$code])) {
$languages[] = self::LANG_PARENTS[$code];
}
$languages[] = $code;
}
return $languages;
}
/** /**
* Return the localized version of the provided string with optional string interpolation * Return the localized version of the provided string with optional string interpolation
* *