<?php
/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
'et' => 'Eesti',
'fi-fi' => 'Suomi',
'fr' => 'Français',
+ 'gd' => 'Gàidhlig',
'hu' => 'Magyar',
'is' => 'Íslenska',
'it' => 'Italiano',
* @var Database
*/
private $dba;
+ /**
+ * @var IManageConfigValues
+ */
+ private $config;
public function __construct(IManageConfigValues $config, Database $dba, IHandleSessions $session, array $server, array $get)
{
$this->dba = $dba;
+ $this->config = $config;
$this->loadTranslationTable(L10n::detectLanguage($server, $get, $config->get('system', 'language', self::DEFAULT)));
$this->setSessionVariable($session);
private function setLangFromSession(IHandleSessions $session)
{
if ($session->get('language') !== $this->lang) {
- $this->loadTranslationTable($session->get('language'));
+ $this->loadTranslationTable($session->get('language') ?? $this->lang);
}
}
* Uses an App object shim since all the strings files refer to $a->strings
*
* @param string $lang language code to load
- *
+ * @return void
* @throws \Exception
*/
- private function loadTranslationTable($lang)
+ private function loadTranslationTable(string $lang)
{
$lang = Strings::sanitizeFilePathItem($lang);
$a->strings = [];
// load enabled addons strings
- $addons = $this->dba->select('addon', ['name'], ['installed' => true]);
- while ($p = $this->dba->fetch($addons)) {
- $name = Strings::sanitizeFilePathItem($p['name']);
+ $addons = array_keys($this->config->get('addons') ?? []);
+ foreach ($addons as $addon) {
+ $name = Strings::sanitizeFilePathItem($addon);
if (file_exists(__DIR__ . "/../../addon/$name/lang/$lang/strings.php")) {
include __DIR__ . "/../../addon/$name/lang/$lang/strings.php";
}
*
* @return string The two-letter language code
*/
- public static function detectLanguage(array $server, array $get, string $sysLang = self::DEFAULT)
+ public static function detectLanguage(array $server, array $get, string $sysLang = self::DEFAULT): string
{
$lang_variable = $server['HTTP_ACCEPT_LANGUAGE'] ?? null;
- $acceptedLanguages = preg_split('/,\s*/', $lang_variable);
-
- if (empty($acceptedLanguages)) {
+ if (empty($lang_variable)) {
$acceptedLanguages = [];
+ } else {
+ $acceptedLanguages = preg_split('/,\s*/', $lang_variable);
}
// Add get as absolute quality accepted language (except this language isn't valid)
*
* @return string
*/
- public function t($s, ...$vars)
+ public function t(string $s, ...$vars): string
{
if (empty($s)) {
return '';
* @param string $singular
* @param string $plural
* @param int $count
+ * @param array $vars Variables to interpolate in the translation string
*
* @return string
* @throws \Exception
*/
- public function tt(string $singular, string $plural, int $count)
+ public function tt(string $singular, string $plural, int $count, ...$vars): string
{
$s = null;
// for some languages there is only a single array item
$s = $t[0];
}
- // if $t is empty, skip it, because empty strings array are indended
+ // if $t is empty, skip it, because empty strings array are intended
// to make string file smaller when there's no translation
} else {
$s = $t;
$s = $singular;
}
- $s = @sprintf($s, $count);
+ // We mute errors here because the translation strings may not be referencing the count at all,
+ // but we still have to try the interpolation just in case it is indeed referenced.
+ $s = @sprintf($s, $count, ...$vars);
return $s;
}
*
* @return bool
*/
- private function stringPluralSelectDefault($n)
+ private function stringPluralSelectDefault(int $n): bool
{
return $n != 1;
}
*
* @return array
*/
- public static function getAvailableLanguages()
+ public function getAvailableLanguages(bool $additional = false): array
{
$langs = [];
$strings_file_paths = glob('view/lang/*/strings.php');
$path_array = explode('/', $strings_file_path);
$langs[$path_array[2]] = self::LANG_NAMES[$path_array[2]] ?? $path_array[2];
}
+
+ if ($additional) {
+ // 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 some more languages are added to that list that are used in the Fediverse.
+ $additional_langs = [
+ '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);
+ }
}
return $langs;
}
+ /**
+ * The language detection routine uses some slightly different language codes.
+ * This function changes the language array accordingly.
+ *
+ * @param array $languages
+ * @return array
+ */
+ public function convertForLanguageDetection(array $languages): array
+ {
+ foreach ($languages as $key => $language) {
+ $newkey = $this->convertCodeForLanguageDetection($key);
+ if ($newkey != $key) {
+ if (!isset($languages[$newkey])) {
+ $languages[$newkey] = $language;
+ }
+ unset($languages[$key]);
+ }
+ }
+
+ ksort($languages);
+
+ return $languages;
+ }
+
+ /**
+ * The language detection routine uses some slightly different language codes.
+ * This function changes the language codes accordingly.
+ *
+ * @param string $language
+ * @return string
+ */
+ public function convertCodeForLanguageDetection(string $language): string
+ {
+ switch ($language) {
+ case 'da-dk':
+ return 'da';
+ case 'en-us':
+ case 'en-gb':
+ return 'en';
+ case 'fi-fi':
+ return 'fi';
+ case 'nb-no':
+ return 'nb';
+ case 'pt-br':
+ return 'pt-BR';
+ case 'zh-cn':
+ return 'zh-Hans';
+ default:
+ return $language;
+ }
+ }
+
/**
* Translate days and months names.
*
* @param string $s String with day or month name.
- *
* @return string Translated string.
*/
- public function getDay($s)
+ public function getDay(string $s): string
{
$ret = str_replace(['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'],
[$this->t('Monday'), $this->t('Tuesday'), $this->t('Wednesday'), $this->t('Thursday'), $this->t('Friday'), $this->t('Saturday'), $this->t('Sunday')],
* Translate short days and months names.
*
* @param string $s String with short day or month name.
- *
* @return string Translated string.
*/
- public function getDayShort($s)
+ public function getDayShort(string $s): string
{
$ret = str_replace(['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
[$this->t('Mon'), $this->t('Tue'), $this->t('Wed'), $this->t('Thu'), $this->t('Fri'), $this->t('Sat'), $this->t('Sun')],
return $ret;
}
- /**
- * Load poke verbs
- *
- * @return array index is present tense verb
- * value is array containing past tense verb, translation of present, translation of past
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @hook poke_verbs pokes array
- */
- public function getPokeVerbs()
- {
- // index is present tense verb
- // value is array containing past tense verb, translation of present, translation of past
- $arr = [
- 'poke' => ['poked', $this->t('poke'), $this->t('poked')],
- 'ping' => ['pinged', $this->t('ping'), $this->t('pinged')],
- 'prod' => ['prodded', $this->t('prod'), $this->t('prodded')],
- 'slap' => ['slapped', $this->t('slap'), $this->t('slapped')],
- 'finger' => ['fingered', $this->t('finger'), $this->t('fingered')],
- 'rebuff' => ['rebuffed', $this->t('rebuff'), $this->t('rebuffed')],
- ];
-
- Hook::callAll('poke_verbs', $arr);
-
- return $arr;
- }
-
/**
* Creates a new L10n instance based on the given langauge
*
* @return static A new L10n instance
* @throws \Exception
*/
- public function withLang(string $lang)
+ public function withLang(string $lang): L10n
{
// Don't create a new instance for same language
if ($lang === $this->lang) {
projects / friendica.git / blobdiff