Merge pull request #554 from fabrixxm/3.6-rc-it

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

diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index fa72c2a879a8091eadad46f5e39d9d5bc1bc5123..89ccd88396441eabeb1c679f8d876ca11d5fee27 100644 (file)
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -8,6 +8,8 @@
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Util\Network;
 
 function geocoordinates_install()
 {
@@ -49,7 +51,7 @@ function geocoordinates_resolve_item(&$item)
                return;
        }
 
-       $s = fetch_url("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language);
+       $s = Network::fetchUrl("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language);
 
        if (!$s) {
                logger("API could not be queried", LOGGER_DEBUG);
@@ -87,9 +89,9 @@ function geocoordinates_addon_admin(&$a, &$o)
        $t = get_markup_template("admin.tpl", "addon/geocoordinates/");
 
        $o = replace_macros($t, [
-               '$submit' => t('Save Settings'),
-               '$api_key' => ['api_key', t('API Key'), Config::get('geocoordinates', 'api_key'), ''],
-               '$language' => ['language', t('Language code (IETF format)'), Config::get('geocoordinates', 'language'), ''],
+               '$submit' => L10n::t('Save Settings'),
+               '$api_key' => ['api_key', L10n::t('API Key'), Config::get('geocoordinates', 'api_key'), ''],
+               '$language' => ['language', L10n::t('Language code (IETF format)'), Config::get('geocoordinates', 'language'), ''],
        ]);
 }
 
@@ -100,5 +102,5 @@ function geocoordinates_addon_admin_post(&$a)
 
        $language  = ((x($_POST, 'language')) ? notags(trim($_POST['language']))   : '');
        Config::set('geocoordinates', 'language', $language);
-       info(t('Settings updated.'). EOL);
+       info(L10n::t('Settings updated.'). EOL);
 }