friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Move L10n::getCurrentLang() calls to DI::l10n()->getCurrentLang() calls

This commit is contained in:
Philipp Holzer 2020-01-18 20:55:41 +01:00
parent cb4ad529f4
commit d83f6335eb
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/settings.php
View File

@ -1165,7 +1165,7 @@ function settings_content(App $a)
} }
/* Installed langs */ /* Installed langs */
$lang_choices = L10n::getAvailableLanguages(); $lang_choices = DI::l10n()->getAvailableLanguages();
/// @TODO Fix indending (or so) /// @TODO Fix indending (or so)
$o .= Renderer::replaceMacros($stpl, [ $o .= Renderer::replaceMacros($stpl, [

2
src/Module/Admin/Site.php
View File

@ -414,7 +414,7 @@ class Site extends BaseAdminModule
parent::content($parameters); parent::content($parameters);
/* Installed langs */ /* Installed langs */
$lang_choices = L10n::getAvailableLanguages(); $lang_choices = DI::l10n()->getAvailableLanguages();
if (strlen(Config::get('system', 'directory_submit_url')) && if (strlen(Config::get('system', 'directory_submit_url')) &&
!strlen(Config::get('system', 'directory'))) { !strlen(Config::get('system', 'directory'))) {

2
src/Module/Install.php
View File

@ -255,7 +255,7 @@ class Install extends BaseModule
case self::SITE_SETTINGS: case self::SITE_SETTINGS:
/* Installed langs */ /* Installed langs */
$lang_choices = L10n::getAvailableLanguages(); $lang_choices = DI::l10n()->getAvailableLanguages();
$tpl = Renderer::getMarkupTemplate('install_settings.tpl'); $tpl = Renderer::getMarkupTemplate('install_settings.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [

2
src/Util/Temporal.php
View File

@ -219,7 +219,7 @@ class Temporal
// First day of the week (0 = Sunday) // First day of the week (0 = Sunday)
$firstDay = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0); $firstDay = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0);
$lang = substr(L10n::getCurrentLang(), 0, 2); $lang = substr(DI::l10n()->getCurrentLang(), 0, 2);
// Check if the detected language is supported by the picker // Check if the detected language is supported by the picker
if (!in_array($lang, if (!in_array($lang,

2
update.php
View File

@ -300,7 +300,7 @@ function update_1298()
$keys = ['gender', 'marital', 'sexual']; $keys = ['gender', 'marital', 'sexual'];
foreach ($keys as $translateKey) { foreach ($keys as $translateKey) {
$allData = DBA::select('profile', ['id', $translateKey]); $allData = DBA::select('profile', ['id', $translateKey]);
$allLangs = L10n::getAvailableLanguages(); $allLangs = DI::l10n()->getAvailableLanguages();
$success = 0; $success = 0;
$fail = 0; $fail = 0;
foreach ($allData as $key => $data) { foreach ($allData as $key => $data) {