summaryrefslogtreecommitdiff
path: root/plugins/Mapstraction
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Mapstraction')
-rw-r--r--plugins/Mapstraction/MapstractionPlugin.php8
-rw-r--r--plugins/Mapstraction/allmap.php9
-rw-r--r--plugins/Mapstraction/locale/Mapstraction.pot26
-rw-r--r--plugins/Mapstraction/map.php2
-rw-r--r--plugins/Mapstraction/usermap.php7
5 files changed, 25 insertions, 27 deletions
diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index e7240a644..c4ba6464e 100644
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
*
* @seeAlso Location
*/
-
class MapstractionPlugin extends Plugin
{
const VERSION = STATUSNET_VERSION;
@@ -64,7 +63,6 @@ class MapstractionPlugin extends Plugin
*
* @return boolean event handler return
*/
-
function onRouterInitialized($m)
{
$m->connect(':nickname/all/map',
@@ -85,7 +83,6 @@ class MapstractionPlugin extends Plugin
*
* @return boolean event handler return
*/
-
function onAutoload($cls)
{
switch ($cls)
@@ -109,7 +106,6 @@ class MapstractionPlugin extends Plugin
*
* @return boolean event handler return
*/
-
function onEndShowScripts($action)
{
$actionName = $action->trimmed('action');
@@ -190,6 +186,7 @@ class MapstractionPlugin extends Plugin
array('nickname' => $action->trimmed('nickname')));
$action->element('a', array('href' => $mapUrl),
+ // TRANS: Clickable item to allow opening the map in full size.
_m("Full size"));
$action->elementEnd('div');
@@ -203,8 +200,7 @@ class MapstractionPlugin extends Plugin
'homepage' => 'http://status.net/wiki/Plugin:Mapstraction',
'rawdescription' =>
_m('Show maps of users\' and friends\' notices '.
- 'with <a href="http://www.mapstraction.com/">Mapstraction</a> '.
- 'JavaScript library.'));
+ 'with <a href="http://www.mapstraction.com/">Mapstraction</a>.'));
return true;
}
}
diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php
index 5dab670e2..fa05ccc7a 100644
--- a/plugins/Mapstraction/allmap.php
+++ b/plugins/Mapstraction/allmap.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class AllmapAction extends MapAction
{
function prepare($args)
@@ -63,16 +62,22 @@ class AllmapAction extends MapAction
function title()
{
if (!empty($this->profile->fullname)) {
+ // @todo FIXME: Bad i18n. Should be "%1$s (%2$s)".
$base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
} else {
$base = $this->user->nickname;
}
if ($this->page == 1) {
+ // TRANS: Page title.
+ // TRANS: %s is a user nickname.
return sprintf(_m("%s friends map"),
$base);
} else {
- return sprintf(_m("%s friends map, page %d"),
+ // @todo CHECKME: does this even happen? May not be needed.
+ // TRANS: Page title.
+ // TRANS: %1$s is a user nickname, %2$d is a page number.
+ return sprintf(_m("%1$s friends map, page %2$d"),
$base,
$this->page);
}
diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot
index 3d7f71f89..7a971cabe 100644
--- a/plugins/Mapstraction/locale/Mapstraction.pot
+++ b/plugins/Mapstraction/locale/Mapstraction.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-14 22:56+0000\n"
+"POT-Creation-Date: 2010-09-18 22:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,39 +16,37 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MapstractionPlugin.php:182
+#: MapstractionPlugin.php:178
msgid "Map"
msgstr ""
-#: MapstractionPlugin.php:193
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
msgid "Full size"
msgstr ""
-#: MapstractionPlugin.php:205
+#: MapstractionPlugin.php:202
msgid ""
"Show maps of users' and friends' notices with <a href=\"http://www."
-"mapstraction.com/\">Mapstraction</a> JavaScript library."
+"mapstraction.com/\">Mapstraction</a>."
msgstr ""
-#: map.php:73
+#: map.php:72
msgid "No such user."
msgstr ""
-#: map.php:80
+#: map.php:79
msgid "User has no profile."
msgstr ""
-#: allmap.php:72
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
#, php-format
msgid "%s friends map"
msgstr ""
-#: allmap.php:75
-#, php-format
-msgid "%s friends map, page %d"
-msgstr ""
-
-#: usermap.php:72
+#: usermap.php:73
#, php-format
msgid "%s map, page %d"
msgstr ""
diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php
index 7dab8e10a..50ff82b67 100644
--- a/plugins/Mapstraction/map.php
+++ b/plugins/Mapstraction/map.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class MapAction extends OwnerDesignAction
{
var $profile = null;
@@ -116,7 +115,6 @@ class MapAction extends OwnerDesignAction
*
* @return boolean event handler return
*/
-
function showScripts()
{
parent::showScripts();
diff --git a/plugins/Mapstraction/usermap.php b/plugins/Mapstraction/usermap.php
index 094334f60..0ee956159 100644
--- a/plugins/Mapstraction/usermap.php
+++ b/plugins/Mapstraction/usermap.php
@@ -42,10 +42,8 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class UsermapAction extends MapAction
{
-
function prepare($args)
{
if(parent::prepare($args)) {
@@ -61,14 +59,17 @@ class UsermapAction extends MapAction
function title()
{
if (!empty($this->profile->fullname)) {
- $base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
+ // @todo FIXME: Bad i18n. Should be '%1$s (%2$s)'
+ $base = $this->profile->fullname . ' (' . $this->user->nickname . ')';
} else {
$base = $this->user->nickname;
}
if ($this->page == 1) {
+ // @todo CHECKME: inconsisten with paged variant below. " map" missing.
return $base;
} else {
+ // @todo CHECKME: Is the part ", page %2$d" relevant here?
return sprintf(_m("%s map, page %d"),
$base,
$this->page);