friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Improved handling of undetected languages

This commit is contained in:
Michael 2024-01-07 12:45:08 +00:00
parent da02df20c3
commit 08738e6551
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Model/Item.php
View File

@ -2071,10 +2071,7 @@ class Item
return !empty($transmitted) ? json_encode($transmitted) : null;
}
$languages = self::getLanguageArray($content, 3, $item['uri-id'], $item['author-id']);
if (empty($languages)) {
return !empty($transmitted) ? json_encode($transmitted) : null;
}
$languages = self::getLanguageArray($content, 3, $item['uri-id'], $item['author-id'], $transmitted);
if (!empty($transmitted)) {
$languages = array_merge($transmitted, $languages);
@ -2091,9 +2088,10 @@ class Item
* @param integer $count
* @param integer $uri_id
* @param integer $author_id
* @param array $default
* @return array
*/
public static function getLanguageArray(string $body, int $count, int $uri_id = 0, int $author_id = 0): array
public static function getLanguageArray(string $body, int $count, int $uri_id = 0, int $author_id = 0, array $default = ['un' => 1]): array
{
$searchtext = BBCode::toSearchText($body, $uri_id);
@ -2107,7 +2105,7 @@ class Item
}
if (empty($searchtext)) {
return ['un' => 1];
return $default;
}
$ld = new Language(DI::l10n()->getDetectableLanguages());
@ -2131,7 +2129,7 @@ class Item
}
if (empty($result)) {
return ['un' => 1];
return $default;
}
$result = self::compactLanguages($result);

2
src/Protocol/Relay.php
View File

@ -188,7 +188,7 @@ class Relay
}
}
if (empty($detected)) {
if (empty($detected) && empty($languages)) {
$detected = ['un'];
}