Merge remote-tracking branch 'upstream/develop' into user-defined-channels

This commit is contained in:
Michael
2023-10-01 08:23:05 +00:00
4 changed files with 52 additions and 8 deletions
+24 -6
View File
@@ -397,13 +397,31 @@ class L10n
// See https://github.com/friendica/friendica/issues/10511
// Persian is manually added to language detection until a persian translation is provided for the interface, at
// which point it will be automatically available through `getAvailableLanguages()` and this should be removed.
// Additionally Portuguese, Ukrainian, traditional Chinese and Welsh are added to that list.
// Additionally some more languages are added to that list that are used in the Fediverse.
$additional_langs = [
'cy' => 'Cymraeg',
'uk' => 'Українська',
'pt-PT' => 'Português',
'zh-hant' => '繁體',
'fa' => 'فارسی'
'af' => 'Afrikaans',
'cy' => 'Cymraeg',
'el-monoton' => 'Ελληνικά',
'eu' => 'euskara',
'fa' => 'فارسی',
'gl' => 'Galego',
'hi' => 'हिन्दी',
'hr' => 'Hrvatski',
'id' => 'bahasa Indonesia',
'ko' => '한국인',
'lt' => 'lietuvių',
'lv' => 'latviešu',
'sk' => 'slovenský',
'sl' => 'Slovenščina',
'sw' => 'Kiswahili',
'th' => 'แบบไทย',
'tl' => 'Wikang Tagalog',
'tr' => 'Türkçe',
'pt-PT' => 'Português',
'uk' => 'Українська',
'uz' => 'Ўзбек',
'vi' => 'Tiếng Việt',
'zh-hant' => '繁體',
];
$langs = array_merge($additional_langs, $langs);
ksort($langs);
+12 -2
View File
@@ -2017,7 +2017,7 @@ class Item
$naked_body = BBCode::toPlaintext($naked_body);
// Remove possibly remaining links
$naked_body = preg_replace(Strings::autoLinkRegEx(), '', $naked_body);
$naked_body = trim(preg_replace(Strings::autoLinkRegEx(), '', $naked_body));
if (empty($naked_body)) {
return [];
@@ -2029,7 +2029,17 @@ class Item
$availableLanguages = DI::l10n()->convertForLanguageDetection($availableLanguages);
$ld = new Language(array_keys($availableLanguages));
return $ld->detect($naked_body)->limit(0, $count)->close() ?: [];
$languages = $ld->detect($naked_body)->limit(0, $count)->close() ?: [];
$data = [
'text' => $naked_body,
'detected' => $languages,
];
Hook::callAll('detect_languages', $data);
$languages = $data['detected'];
return $languages;
}
/**