use Friendica\Core\Session\Capability\IHandleSessions;
use Friendica\Database\Database;
use Friendica\Util\Strings;
-use Psr\Log\LoggerInterface;
/**
* Provide Language, Translation, and Localization functions to the application
'bg' => 'Български',
'ca' => 'Català',
'cs' => 'Česky',
+ 'da-dk' => 'Dansk (Danmark)',
'de' => 'Deutsch',
'en-gb' => 'English (United Kingdom)',
'en-us' => 'English (United States)',
'et' => 'Eesti',
'fi-fi' => 'Suomi',
'fr' => 'Français',
+ 'gd' => 'Gàidhlig',
'hu' => 'Magyar',
'is' => 'Íslenska',
'it' => 'Italiano',
*/
private $dba;
- /**
- * @var LoggerInterface
- */
- private $logger;
-
- public function __construct(IManageConfigValues $config, Database $dba, LoggerInterface $logger, IHandleSessions $session, array $server, array $get)
+ public function __construct(IManageConfigValues $config, Database $dba, IHandleSessions $session, array $server, array $get)
{
$this->dba = $dba;
- $this->logger = $logger;
$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);
*
* @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;
$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 static function getAvailableLanguages(): array
{
$langs = [];
$strings_file_paths = glob('view/lang/*/strings.php');
* 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) {