OStatus: save updated profile bits when they come in over the wire; fix up nicknames

[quix0rs-gnu-social.git] / plugins / Mapstraction / map.php

diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php
index 89723f43ce78a6a4eb0584f038b67bf3c015f535..a33dfc7360a82e1ffd40be0df97019e402f46b65 100644 (file)
--- a/plugins/Mapstraction/map.php
+++ b/plugins/Mapstraction/map.php
@@ -69,14 +69,14 @@ class MapAction extends OwnerDesignAction
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
-            $this->clientError(_('No such user.'), 404);
+            $this->clientError(_m('No such user.'), 404);
             return false;
         }
 
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
-            $this->serverError(_('User has no profile.'));
+            $this->serverError(_m('User has no profile.'));
             return false;
         }
 
@@ -128,12 +128,9 @@ class MapAction extends OwnerDesignAction
             }
         }
 
-        $this->elementStart('script', array('type' => 'text/javascript'));
-        $this->raw('/*<![CDATA[*/'); // XHTML compat for Safari
-        $this->raw('var _notices = ' . json_encode($jsonArray).'; ');
-        $this->raw('showMapstraction($("#map_canvas"),_notices);');
-        $this->raw('/*]]>*/'); // XHTML compat for Safari
-        $this->elementEnd('script');
+        $this->inlineScript('$(document).ready(function() { '.
+                            ' var _notices = ' . json_encode($jsonArray).'; ' .
+                            'showMapstraction($("#map_canvas"), _notices); });');
 
         return true;
     }