X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FL10n.php;h=80ef832715928bb49201890d9367c349b5ef8772;hb=dc9658f532a067adaf96d753a34f3ee99ff8587b;hp=050c1907371983be027d54defafd183b37b9864d;hpb=ff8e83913948b8a3e1fc8c8a1ee253c78a1a1ec6;p=friendica.git diff --git a/src/Core/L10n.php b/src/Core/L10n.php index 050c190737..80ef832715 100644 --- a/src/Core/L10n.php +++ b/src/Core/L10n.php @@ -1,6 +1,6 @@ 'Eesti', 'fi-fi' => 'Suomi', 'fr' => 'Français', + 'gd' => 'Gàidhlig', 'hu' => 'Magyar', 'is' => 'Íslenska', 'it' => 'Italiano', @@ -84,10 +85,15 @@ class L10n * @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); @@ -128,7 +134,7 @@ class L10n private function setLangFromSession(IHandleSessions $session) { if ($session->get('language') !== $this->lang) { - $this->loadTranslationTable($session->get('language')); + $this->loadTranslationTable($session->get('language') ?? $this->lang); } } @@ -140,10 +146,10 @@ class L10n * 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); @@ -156,9 +162,9 @@ class L10n $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"; } @@ -183,14 +189,14 @@ class L10n * * @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) @@ -269,7 +275,7 @@ class L10n * * @return string */ - public function t($s, ...$vars) + public function t(string $s, ...$vars): string { if (empty($s)) { return ''; @@ -303,11 +309,12 @@ class L10n * @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; @@ -327,7 +334,7 @@ class L10n // 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; @@ -340,7 +347,9 @@ class L10n $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; } @@ -352,7 +361,7 @@ class L10n * * @return bool */ - private function stringPluralSelectDefault($n) + private function stringPluralSelectDefault(int $n): bool { return $n != 1; } @@ -369,7 +378,7 @@ class L10n * * @return array */ - public static function getAvailableLanguages() + public function getAvailableLanguages(): array { $langs = []; $strings_file_paths = glob('view/lang/*/strings.php'); @@ -387,14 +396,99 @@ class L10n return $langs; } + /** + * Get language codes that are detectable by our language detection routines. + * Languages are excluded that aren't used often and that tend to false detections. + * The listed codes are a collection of both the official ISO 639-1 codes and + * the codes that are used by our built-in language detection routine. + * When the detection is done, the result only consists of the official ISO 639-1 codes. + * + * @return array + */ + public function getDetectableLanguages(): array + { + $additional_langs = [ + 'af', 'az', 'az-Cyrl', 'az-Latn', 'be', 'bn', 'bs', 'bs-Cyrl', 'bs-Latn', + 'cy', 'da', 'el', 'el-monoton', 'el-polyton', 'en', 'eu', 'fa', 'fi', + 'ga', 'gl', 'gu', 'he', 'hi', 'hr', 'hy', 'id', 'in', 'iu', 'iw', 'jv', 'jw', + 'ka', 'km', 'ko', 'lt', 'lv', 'mo', 'ms', 'ms-Arab', 'ms-Latn', 'nb', 'nn', 'no', + 'pt', 'pt-PT', 'pt-BR', 'ro', 'sa', 'sk', 'sl', 'sq', 'sr', 'sr-Cyrl', 'sr-Latn', 'sw', + 'ta', 'th', 'tl', 'tr', 'ug', 'uk', 'uz', 'vi', 'zh', 'zh-Hant', 'zh-Hans', + ]; + + if (in_array('cld2', get_loaded_extensions())) { + $additional_langs = array_merge($additional_langs, + ['dv', 'kn', 'lo', 'ml', 'or', 'pa', 'sd', 'si', 'te', 'yi']); + } + + $langs = array_merge($additional_langs, array_keys($this->getAvailableLanguages())); + sort($langs); + return $langs; + } + + /** + * Return a list of supported languages with their two byte language codes. + * + * @param bool $international If set to true, additionally the international language name is returned as well. + * @return array + */ + public function getLanguageCodes(bool $international = false): array + { + $iso639 = new \Matriphe\ISO639\ISO639; + + $languages = []; + + foreach ($this->getDetectableLanguages() as $code) { + $code = $this->toISO6391($code); + $native = $iso639->nativeByCode1($code); + $language = $iso639->languageByCode1($code); + if ($native != $language && $international) { + $languages[$code] = $this->t('%s (%s)', $native, $language); + } else { + $languages[$code] = $native; + } + } + + return $languages; + } + + /** + * Convert the language code to ISO639-1 + * It also converts old codes to their new counterparts. + * + * @param string $code + * @return string + */ + public function toISO6391(string $code): string + { + if ((strlen($code) > 2) && (substr($code, 2, 1) == '-')) { + $code = substr($code, 0, 2); + } + if (in_array($code, ['nb', 'nn'])) { + $code = 'no'; + } + if ($code == 'in') { + $code = 'id'; + } + if ($code == 'iw') { + $code = 'he'; + } + if ($code == 'jw') { + $code = 'jv'; + } + if ($code == 'mo') { + $code = 'ro'; + } + return $code; + } + /** * 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')], @@ -411,10 +505,9 @@ class L10n * 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')], @@ -427,32 +520,6 @@ class L10n 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 * @@ -461,7 +528,7 @@ class L10n * @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) {