Update t() calls

[friendica-addons.git] / curweather / curweather.php

diff --git a/curweather/curweather.php b/curweather/curweather.php
index dc9f9bb833703469c15221974e67663756767fa9..525b03d027ffca882563f28556d4627acfb3d052 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -9,13 +9,14 @@
  *
  */
 
-require_once('include/network.php');
-require_once("mod/proxy.php");
-require_once('include/text.php');
+require_once 'include/network.php';
+require_once 'mod/proxy.php';
+require_once 'include/text.php';
 
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 
 //  get the weather data from OpenWeatherMap
@@ -33,7 +34,7 @@ function getWeather( $loc, $units='metric', $lang='en', $appid='', $cachetime=0)
     try {
        $res = new SimpleXMLElement(fetch_url($url));
     } catch (Exception $e) {
-       info(t('Error fetching weather data.\nError was: '.$e->getMessage()));
+       info(L10n::t('Error fetching weather data.\nError was: '.$e->getMessage()));
        return false;
     }
     if ((string)$res->temperature['unit']==='metric') {
@@ -114,26 +115,26 @@ function curweather_network_mod_init(&$fk_app,&$b) {
     if ($ok) {
        $t = get_markup_template("widget.tpl", "addon/curweather/" );
        $curweather = replace_macros ($t, [
-           '$title' => t("Current Weather"),
+           '$title' => L10n::t("Current Weather"),
            '$icon' => proxy_url('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'=>t('Relative Humidity'), 'val'=>$res['humidity']],
-           '$pressure' => ['caption'=>t('Pressure'), 'val'=>$res['pressure']],
-           '$wind' => ['caption'=>t('Wind'), 'val'=> $res['wind']],
-           '$lastupdate' => t('Last Updated').': '.$res['update'].'UTC',
-           '$databy' =>  t('Data by'),
-           '$showonmap' => t('Show on map')
+           '$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')
        ]);
     } else {
        $t = get_markup_template('widget-error.tpl', 'addon/curweather/');
        $curweather = replace_macros( $t, [
-           '$problem' => t('There was a problem accessing the weather data. But have a look'),
+           '$problem' => L10n::t('There was a problem accessing the weather data. But have a look'),
            '$rpt' => $rpt,
-           '$atOWM' => t('at OpenWeatherMap')
+           '$atOWM' => L10n::t('at OpenWeatherMap')
        ]);
     }
 
@@ -149,7 +150,7 @@ function curweather_addon_settings_post($a,$post) {
        PConfig::set(local_user(),'curweather','curweather_enable',intval($_POST['curweather_enable']));
        PConfig::set(local_user(),'curweather','curweather_units',trim($_POST['curweather_units']));
 
-       info( t('Current Weather settings updated.') . EOL);
+       info(L10n::t('Current Weather settings updated.') . EOL);
 }
 
 
@@ -164,7 +165,7 @@ function curweather_addon_settings(&$a,&$s) {
        $curweather_units = PConfig::get(local_user(), 'curweather', 'curweather_units');
        $appid = Config::get('curweather','appid');
        if ($appid=="") {
-               $noappidtext = t('No APPID found, please contact your admin to obtain one.');
+               $noappidtext = L10n::t('No APPID found, please contact your admin to obtain one.');
        } else {
            $noappidtext = '';
        }
@@ -174,13 +175,13 @@ function curweather_addon_settings(&$a,&$s) {
        // load template and replace the macros
        $t = get_markup_template("settings.tpl", "addon/curweather/" );
        $s = replace_macros ($t, [
-               '$submit' => t('Save Settings'),
-               '$header' => t('Current Weather').' '.t('Settings'),
+               '$submit' => L10n::t('Save Settings'),
+               '$header' => L10n::t('Current Weather').' '.L10n::t('Settings'),
                '$noappidtext' => $noappidtext,
-               '$info' => t('Enter either the name of your location or the zip code.'),
-               '$curweather_loc' => [ 'curweather_loc', t('Your Location'), $curweather_loc, t('Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.') ],
-               '$curweather_units' => [ 'curweather_units', t('Units'), $curweather_units, t('select if the temperature should be displayed in &deg;C or &deg;F'), ['metric'=>'°C', 'imperial'=>'°F']],
-               '$enabled' => [ 'curweather_enable', t('Show weather data'), $enable, '']
+               '$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, '']
            ]);
        return;
 
@@ -193,7 +194,7 @@ function curweather_addon_admin_post (&$a) {
        if ($_POST['curweather-submit']) {
            Config::set('curweather','appid',trim($_POST['appid']));
            Config::set('curweather','cachetime',trim($_POST['cachetime']));
-           info( t('Curweather settings saved.'.EOL));
+           info(L10n::t('Curweather settings saved.'.EOL));
        }
 }
 function curweather_addon_admin (&$a, &$o) {
@@ -203,8 +204,8 @@ function curweather_addon_admin (&$a, &$o) {
     $cachetime = Config::get('curweather','cachetime');
     $t = get_markup_template("admin.tpl", "addon/curweather/" );
     $o = replace_macros ($t, [
-       '$submit' => t('Save Settings'),
-       '$cachetime' => ['cachetime', t('Caching Interval'), $cachetime, t('For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'), ['0'=>t('no cache'), '300'=>'5 '.t('minutes'), '900'=>'15 '.t('minutes'), '1800'=>'30 '.t('minutes'), '3600'=>'60 '.t('minutes')]],
-       '$appid' => ['appid', t('Your APPID'), $appid, t('Your API key provided by OpenWeatherMap')]
+       '$submit' => L10n::t('Save Settings'),
+       '$cachetime' => ['cachetime', 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')]],
+       '$appid' => ['appid', L10n::t('Your APPID'), $appid, L10n::t('Your API key provided by OpenWeatherMap')]
     ]);
 }