X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FCore%2FL10n.php;h=f7ed9918ce7bd8feb139774ab2676074aed1aff9;hb=4bad2645e5276431fcb70e01f4f3341740a6b89b;hp=aa36c2e4f9865768eacc571be7640be1b560e780;hpb=acaee626f5f23f4c1dc19c31896a0797a251b58f;p=friendica.git

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index aa36c2e4f9..f7ed9918ce 100644
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -6,9 +6,6 @@ namespace Friendica\Core;
 
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
-use Friendica\Core\Addon;
-use Friendica\Core\Logger;
-use Friendica\Core\System;
 
 /**
  * Provide Language, Translation, and Localization functions to the application
@@ -77,6 +74,10 @@ class L10n extends BaseObject
 				}
 			}
 		}
+
+		if (isset($_GET['lang'])) {
+			$_SESSION['language'] = $_GET['lang'];
+		}
 	}
 
 	public static function setLangFromSession()
@@ -89,6 +90,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()
 	{
@@ -113,6 +115,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"))) {
@@ -136,9 +142,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)
 	{
@@ -182,6 +189,7 @@ 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)
 	{
@@ -264,8 +272,9 @@ 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)
 	{
@@ -309,6 +318,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)
 	{
@@ -386,7 +398,8 @@ class L10n extends BaseObject
 	 * Load poke verbs
 	 *
 	 * @return array index is present tense verb
-	 * 				 value is array containing past tense verb, translation of present, translation of past
+	 *                 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()
@@ -402,7 +415,7 @@ class L10n extends BaseObject
 			'rebuff' => ['rebuffed', self::t('rebuff'), self::t('rebuffed')],
 		];
 
-		Addon::callHooks('poke_verbs', $arr);
+		Hook::callAll('poke_verbs', $arr);
 
 		return $arr;
 	}