Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / plugins / Geonames / GeonamesPlugin.php

diff --git a/plugins/Geonames/GeonamesPlugin.php b/plugins/Geonames/GeonamesPlugin.php
index 310641ce6027dfac967f17b1b625c2f57e6ea0c6..ff9192283f62ccf73b15c07e8a8769c5f6cf1ac0 100644 (file)
--- a/plugins/Geonames/GeonamesPlugin.php
+++ b/plugins/Geonames/GeonamesPlugin.php
@@ -377,7 +377,7 @@ class GeonamesPlugin extends Plugin
 
     function getCache($attrs)
     {
-        $c = common_memcache();
+        $c = Cache::instance();
 
         if (empty($c)) {
             return null;
@@ -392,7 +392,7 @@ class GeonamesPlugin extends Plugin
 
     function setCache($attrs, $loc)
     {
-        $c = common_memcache();
+        $c = Cache::instance();
 
         if (empty($c)) {
             return null;
@@ -409,11 +409,11 @@ class GeonamesPlugin extends Plugin
     {
         $key = 'geonames:' .
                implode(',', array_keys($attrs)) . ':'.
-               common_keyize(implode(',', array_values($attrs)));
+               Cache::keyize(implode(',', array_values($attrs)));
         if ($this->cachePrefix) {
             return $this->cachePrefix . ':' . $key;
         } else {
-            return common_cache_key($key);
+            return Cache::key($key);
         }
     }
 
@@ -435,7 +435,8 @@ class GeonamesPlugin extends Plugin
     function getGeonames($method, $params)
     {
         if ($this->lastTimeout && (time() - $this->lastTimeout < $this->timeoutWindow)) {
-            throw new Exception("skipping due to recent web service timeout");
+            // TRANS: Exception thrown when a geo names service is not used because of a recent timeout.
+            throw new Exception(_m('Skipping due to recent web service timeout.'));
         }
 
         $client = HTTPClient::start();
@@ -451,13 +452,16 @@ class GeonamesPlugin extends Plugin
         }
 
         if (!$result->isOk()) {
-            throw new Exception("HTTP error code " . $result->getStatus());
+            // TRANS: Exception thrown when a geo names service does not return an expected response.
+            // TRANS: %s is an HTTP error code.
+            throw new Exception(sprintf(_m('HTTP error code %s.'),$result->getStatus()));
         }
 
         $body = $result->getBody();
 
         if (empty($body)) {
-            throw new Exception("Empty HTTP body in response");
+            // TRANS: Exception thrown when a geo names service returns an empty body.
+            throw new Exception(_m('Empty HTTP body in response.'));
         }
 
         // This will throw an exception if the XML is mal-formed
@@ -473,7 +477,9 @@ class GeonamesPlugin extends Plugin
         }
 
         if (isset($document->status)) {
-            throw new Exception("Error #".$document->status['value']." ('".$document->status['message']."')");
+            // TRANS: Exception thrown when a geo names service return a specific error number and error text.
+            // TRANS: %1$s is an error code, %2$s is an error message.
+            throw new Exception(sprintf(_m('Error #%1$s ("%2$s").'),$document->status['value'],$document->status['message']));
         }
 
         // Array of elements, >0 elements
@@ -481,13 +487,14 @@ class GeonamesPlugin extends Plugin
         return $document->geoname;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Geonames',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:Geonames',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Uses <a href="http://geonames.org/">Geonames</a> service to get human-readable '.
                                'names for locations based on user-provided lat/long pairs.'));
         return true;