Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-12 02:14:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move $strings from App to Core\L10n

Browse source 
- Add L10n::init() call in App constructor
- Improve pushLang/popLang
- Remove no longer needed references to App
This commit is contained in:
Hypolite Petovan 2018-10-22 00:16:30 -04:00 • committed by Benjamin Lorteau
parent baa1094489
commit c6f0bea51d
6 changed files with 137 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/App.php
View file

@ -50,7 +50,6 @@ class App
public $argv;
public $argc;
public $module;
public $strings;
public $hooks = [];
public $timezone;
public $interactive = true;
@ -370,6 +369,8 @@ class App
$this->loadDefaultTimezone();
Core\L10n::init();
$this->page = [
'aside' => '',
'bottom' => '',
@ -1663,40 +1664,18 @@ class App
Core\Addon::callHooks('init_1');
}
$lang = Core\L10n::getBrowserLanguage();
Core\L10n::loadTranslationTable($lang);
// Exclude the backend processes from the session management
if (!$this->isBackend()) {
$stamp1 = microtime(true);
session_start();
$this->saveTimestamp($stamp1, "parser");
$this->saveTimestamp($stamp1, 'parser');
Core\L10n::setSessionVariable();
Core\L10n::setLangFromSession();
} else {
$_SESSION = [];
Core\Worker::executeIfIdle();
}
/* Language was set earlier, but we can over-ride it in the session.
* We have to do it here because the session was just now opened.
*/
if (!empty($_SESSION['authenticated']) && empty($_SESSION['language'])) {
$_SESSION['language'] = $lang;
// we haven't loaded user data yet, but we need user language
if (!empty($_SESSION['uid'])) {
$user = DBA::selectFirst('user', ['language'], ['uid' => $_SESSION['uid']]);
if (DBA::isResult($user)) {
$_SESSION['language'] = $user['language'];
}
}
}
if (!empty($_SESSION['language']) && $_SESSION['language'] !== $lang) {
$lang = $_SESSION['language'];
Core\L10n::loadTranslationTable($lang);
}
// ZRL
if (!empty($_GET['zrl']) && $this->getMode()->isNormal()) {
$this->query_string = Model\Profile::stripZrls($this->query_string);