X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FL10n.php;h=ae0ed18c3d0a732364bfc5d53ca072f935f253cf;hb=58c8959da0ece9a23966b315310a3962542bc7f4;hp=05f710cd76c2f6cf603199ac71f50b73b3b1e2ef;hpb=c6f0bea51d8bb60b4db47f2fb69f4fbc20120d10;p=friendica.git diff --git a/src/Core/L10n.php b/src/Core/L10n.php index 05f710cd76..ae0ed18c3d 100644 --- a/src/Core/L10n.php +++ b/src/Core/L10n.php @@ -6,10 +6,7 @@ namespace Friendica\Core; use Friendica\BaseObject; use Friendica\Database\DBA; -use Friendica\Core\System; - -require_once 'boot.php'; -require_once 'include/dba.php'; +use Friendica\Util\Strings; /** * Provide Language, Translation, and Localization functions to the application @@ -23,26 +20,26 @@ class L10n extends BaseObject * - Two-letter ISO 639-1 code + dash + Two-letter ISO 3166-1 alpha-2 country code. * @var string */ - private $lang = ''; + private static $lang = ''; /** * A language code saved for later after pushLang() has been called. * * @var string */ - private $langSave = ''; + private static $langSave = ''; /** * An array of translation strings whose key is the neutral english message. * * @var array */ - private $strings = []; + private static $strings = []; /** * An array of translation strings saved for later after pushLang() has been called. * * @var array */ - private $stringsSave = []; + private static $stringsSave = []; /** * Detects the language and sets the translation table @@ -78,6 +75,10 @@ class L10n extends BaseObject } } } + + if (isset($_GET['lang'])) { + $_SESSION['language'] = $_GET['lang']; + } } public static function setLangFromSession() @@ -90,6 +91,7 @@ class L10n extends BaseObject /** * @brief Returns the preferred language from the HTTP_ACCEPT_LANGUAGE header * @return string The two-letter language code + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function detectLanguage() { @@ -114,6 +116,10 @@ class L10n extends BaseObject } } + if (isset($_GET['lang'])) { + $lang_list = [$_GET['lang']]; + } + // check if we have translations for the preferred languages and pick the 1st that has foreach ($lang_list as $lang) { if ($lang === 'en' || (file_exists("view/lang/$lang") && is_dir("view/lang/$lang"))) { @@ -137,9 +143,10 @@ class L10n extends BaseObject * * If called repeatedly, it won't save the translation strings again, just load the new ones. * - * @see popLang() + * @see popLang() * @brief Stores the current language strings and load a different language. * @param string $lang Language code + * @throws \Exception */ public static function pushLang($lang) { @@ -183,9 +190,12 @@ class L10n extends BaseObject * Uses an App object shim since all the strings files refer to $a->strings * * @param string $lang language code to load + * @throws \Exception */ private static function loadTranslationTable($lang) { + $lang = Strings::sanitizeFilePathItem($lang); + if ($lang === self::$lang) { return; } @@ -196,7 +206,7 @@ class L10n extends BaseObject // load enabled addons strings $addons = DBA::select('addon', ['name'], ['installed' => true]); while ($p = DBA::fetch($addons)) { - $name = $p['name']; + $name = Strings::sanitizeFilePathItem($p['name']); if (file_exists("addon/$name/lang/$lang/strings.php")) { include "addon/$name/lang/$lang/strings.php"; } @@ -265,13 +275,14 @@ class L10n extends BaseObject * * @param string $singular * @param string $plural - * @param int $count + * @param int $count * @return string + * @throws \Exception */ public static function tt($singular, $plural, $count) { if (!is_numeric($count)) { - logger('Non numeric count called by ' . System::callstack(20)); + Logger::log('Non numeric count called by ' . System::callstack(20)); } if (!self::$lang) { @@ -310,6 +321,9 @@ class L10n extends BaseObject /** * Provide a fallback which will not collide with a function defined in any language file + * + * @param int $n + * @return bool */ private static function stringPluralSelectDefault($n) { @@ -344,4 +358,68 @@ class L10n extends BaseObject } return $langs; } + + /** + * @brief Translate days and months names. + * + * @param string $s String with day or month name. + * @return string Translated string. + */ + public static function getDay($s) + { + $ret = str_replace(['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'], + [self::t('Monday'), self::t('Tuesday'), self::t('Wednesday'), self::t('Thursday'), self::t('Friday'), self::t('Saturday'), self::t('Sunday')], + $s); + + $ret = str_replace(['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'], + [self::t('January'), self::t('February'), self::t('March'), self::t('April'), self::t('May'), self::t('June'), self::t('July'), self::t('August'), self::t('September'), self::t('October'), self::t('November'), self::t('December')], + $ret); + + return $ret; + } + + /** + * @brief Translate short days and months names. + * + * @param string $s String with short day or month name. + * @return string Translated string. + */ + public static function getDayShort($s) + { + $ret = str_replace(['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'], + [self::t('Mon'), self::t('Tue'), self::t('Wed'), self::t('Thu'), self::t('Fri'), self::t('Sat'), self::t('Sun')], + $s); + + $ret = str_replace(['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], + [self::t('Jan'), self::t('Feb'), self::t('Mar'), self::t('Apr'), self::t('May'), ('Jun'), self::t('Jul'), self::t('Aug'), self::t('Sep'), self::t('Oct'), self::t('Nov'), self::t('Dec')], + $ret); + + 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 static function getPokeVerbs() + { + // index is present tense verb + // value is array containing past tense verb, translation of present, translation of past + $arr = [ + 'poke' => ['poked', self::t('poke'), self::t('poked')], + 'ping' => ['pinged', self::t('ping'), self::t('pinged')], + 'prod' => ['prodded', self::t('prod'), self::t('prodded')], + 'slap' => ['slapped', self::t('slap'), self::t('slapped')], + 'finger' => ['fingered', self::t('finger'), self::t('fingered')], + 'rebuff' => ['rebuffed', self::t('rebuff'), self::t('rebuffed')], + ]; + + Hook::callAll('poke_verbs', $arr); + + return $arr; + } }