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

This commit is contained in:
nupplaPhil 2020-01-18 20:52:33 +01:00
parent 1eb23e3667
commit 48fecb9a40
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
71 changed files with 721 additions and 721 deletions

View file

@ -53,7 +53,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
$res = new SimpleXMLElement(Network::fetchUrl($url));
} catch (Exception $e) {
if (empty($_SESSION['curweather_notice_shown'])) {
info(L10n::t('Error fetching weather data. Error was: '.$e->getMessage()));
info(DI::l10n()->t('Error fetching weather data. Error was: '.$e->getMessage()));
$_SESSION['curweather_notice_shown'] = true;
}
@ -136,26 +136,26 @@ function curweather_network_mod_init(App $a, &$b)
if ($ok) {
$t = Renderer::getMarkupTemplate("widget.tpl", "addon/curweather/" );
$curweather = Renderer::replaceMacros($t, [
'$title' => L10n::t("Current Weather"),
'$title' => DI::l10n()->t("Current Weather"),
'$icon' => ProxyUtils::proxifyUrl('http://openweathermap.org/img/w/'.$res['icon'].'.png'),
'$city' => $res['city'],
'$lon' => $res['lon'],
'$lat' => $res['lat'],
'$description' => $res['descripion'],
'$temp' => $res['temperature'],
'$relhumidity' => ['caption'=>L10n::t('Relative Humidity'), 'val'=>$res['humidity']],
'$pressure' => ['caption'=>L10n::t('Pressure'), 'val'=>$res['pressure']],
'$wind' => ['caption'=>L10n::t('Wind'), 'val'=> $res['wind']],
'$lastupdate' => L10n::t('Last Updated').': '.$res['update'].'UTC',
'$databy' => L10n::t('Data by'),
'$showonmap' => L10n::t('Show on map')
'$relhumidity' => ['caption'=>DI::l10n()->t('Relative Humidity'), 'val'=>$res['humidity']],
'$pressure' => ['caption'=>DI::l10n()->t('Pressure'), 'val'=>$res['pressure']],
'$wind' => ['caption'=>DI::l10n()->t('Wind'), 'val'=> $res['wind']],
'$lastupdate' => DI::l10n()->t('Last Updated').': '.$res['update'].'UTC',
'$databy' => DI::l10n()->t('Data by'),
'$showonmap' => DI::l10n()->t('Show on map')
]);
} else {
$t = Renderer::getMarkupTemplate('widget-error.tpl', 'addon/curweather/');
$curweather = Renderer::replaceMacros( $t, [
'$problem' => L10n::t('There was a problem accessing the weather data. But have a look'),
'$problem' => DI::l10n()->t('There was a problem accessing the weather data. But have a look'),
'$rpt' => $rpt,
'$atOWM' => L10n::t('at OpenWeatherMap')
'$atOWM' => DI::l10n()->t('at OpenWeatherMap')
]);
}
@ -172,7 +172,7 @@ function curweather_addon_settings_post(App $a, $post)
DI::pConfig()->set(local_user(), 'curweather', 'curweather_enable', intval($_POST['curweather_enable']));
DI::pConfig()->set(local_user(), 'curweather', 'curweather_units' , trim($_POST['curweather_units']));
info(L10n::t('Current Weather settings updated.') . EOL);
info(DI::l10n()->t('Current Weather settings updated.') . EOL);
}
function curweather_addon_settings(App $a, &$s)
@ -187,7 +187,7 @@ function curweather_addon_settings(App $a, &$s)
$appid = Config::get('curweather', 'appid');
if ($appid == "") {
$noappidtext = L10n::t('No APPID found, please contact your admin to obtain one.');
$noappidtext = DI::l10n()->t('No APPID found, please contact your admin to obtain one.');
} else {
$noappidtext = '';
}
@ -199,13 +199,13 @@ function curweather_addon_settings(App $a, &$s)
$t = Renderer::getMarkupTemplate("settings.tpl", "addon/curweather/" );
$s = Renderer::replaceMacros($t, [
'$submit' => L10n::t('Save Settings'),
'$header' => L10n::t('Current Weather').' '.L10n::t('Settings'),
'$submit' => DI::l10n()->t('Save Settings'),
'$header' => DI::l10n()->t('Current Weather').' '.DI::l10n()->t('Settings'),
'$noappidtext' => $noappidtext,
'$info' => L10n::t('Enter either the name of your location or the zip code.'),
'$curweather_loc' => [ 'curweather_loc', L10n::t('Your Location'), $curweather_loc, L10n::t('Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.') ],
'$curweather_units' => [ 'curweather_units', L10n::t('Units'), $curweather_units, L10n::t('select if the temperature should be displayed in &deg;C or &deg;F'), ['metric'=>'°C', 'imperial'=>'°F']],
'$enabled' => [ 'curweather_enable', L10n::t('Show weather data'), $enable, '']
'$info' => DI::l10n()->t('Enter either the name of your location or the zip code.'),
'$curweather_loc' => [ 'curweather_loc', DI::l10n()->t('Your Location'), $curweather_loc, DI::l10n()->t('Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.') ],
'$curweather_units' => [ 'curweather_units', DI::l10n()->t('Units'), $curweather_units, DI::l10n()->t('select if the temperature should be displayed in &deg;C or &deg;F'), ['metric'=>'°C', 'imperial'=>'°F']],
'$enabled' => [ 'curweather_enable', DI::l10n()->t('Show weather data'), $enable, '']
]);
return;
@ -223,7 +223,7 @@ function curweather_addon_admin_post(App $a)
Config::set('curweather', 'appid', trim($_POST['appid']));
Config::set('curweather', 'cachetime', trim($_POST['cachetime']));
info(L10n::t('Curweather settings saved.' . PHP_EOL));
info(DI::l10n()->t('Curweather settings saved.' . PHP_EOL));
}
}
@ -239,19 +239,19 @@ function curweather_addon_admin(App $a, &$o)
$t = Renderer::getMarkupTemplate("admin.tpl", "addon/curweather/" );
$o = Renderer::replaceMacros($t, [
'$submit' => L10n::t('Save Settings'),
'$submit' => DI::l10n()->t('Save Settings'),
'$cachetime' => [
'cachetime',
L10n::t('Caching Interval'),
DI::l10n()->t('Caching Interval'),
$cachetime,
L10n::t('For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'), [
'0' => L10n::t('no cache'),
'300' => '5 ' . L10n::t('minutes'),
'900' => '15 ' . L10n::t('minutes'),
'1800' => '30 ' . L10n::t('minutes'),
'3600' => '60 ' . L10n::t('minutes')
DI::l10n()->t('For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'), [
'0' => DI::l10n()->t('no cache'),
'300' => '5 ' . DI::l10n()->t('minutes'),
'900' => '15 ' . DI::l10n()->t('minutes'),
'1800' => '30 ' . DI::l10n()->t('minutes'),
'3600' => '60 ' . DI::l10n()->t('minutes')
]
],
'$appid' => ['appid', L10n::t('Your APPID'), $appid, L10n::t('Your API key provided by OpenWeatherMap')]
'$appid' => ['appid', DI::l10n()->t('Your APPID'), $appid, DI::l10n()->t('Your API key provided by OpenWeatherMap')]
]);
}