Merge pull request #549 from tobiasd/20180316-translations

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

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 45d8fde5774c9a84c8e066e3ac2f5aebb4b55eab..79e268e6eeddb2d948953fa2b41d32e97636d6ca 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -21,7 +21,10 @@
  */
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 function geonames_install() {
 
@@ -110,12 +113,12 @@ function geonames_post_hook($a, &$item) {
         *
         */
 
-       $s = fetch_url('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
+       $s = Network::fetchUrl('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
 
        if(! $s)
                return;
 
-       $xml = parse_xml_string($s);
+       $xml = XML::parseString($s);
 
        if($xml->geoname->name && $xml->geoname->countryName)
                $item['location'] = $xml->geoname->name . ', ' . $xml->geoname->countryName;
@@ -142,7 +145,7 @@ function geonames_addon_admin_post($a,$post) {
                return;
        PConfig::set(local_user(),'geonames','enable',intval($_POST['geonames']));
 
-       info( t('Geonames settings updated.') . EOL);
+       info(L10n::t('Geonames settings updated.') . EOL);
 }
 
 
@@ -178,14 +181,14 @@ function geonames_addon_admin(&$a,&$s) {
        /* Add some HTML to the existing form */
 
        $s .= '<div class="settings-block">';
-       $s .= '<h3>' . t('Geonames Settings') . '</h3>';
+       $s .= '<h3>' . L10n::t('Geonames Settings') . '</h3>';
        $s .= '<div id="geonames-enable-wrapper">';
-       $s .= '<label id="geonames-enable-label" for="geonames-checkbox">' . t('Enable Geonames Addon') . '</label>';
+       $s .= '<label id="geonames-enable-label" for="geonames-checkbox">' . L10n::t('Enable Geonames Addon') . '</label>';
        $s .= '<input id="geonames-checkbox" type="checkbox" name="geonames" value="1" ' . $checked . '/>';
        $s .= '</div><div class="clear"></div>';
 
        /* provide a submit button */
 
-       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="geonames-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="geonames-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
 }