* FIXME/CHECKMEs added for (possible) bad i18n
* translator hints added * superfluous whitespace removed
This commit is contained in:
parent
977472bcf6
commit
34f95c26fd
@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
|
|||||||
*
|
*
|
||||||
* @seeAlso Location
|
* @seeAlso Location
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class MapstractionPlugin extends Plugin
|
class MapstractionPlugin extends Plugin
|
||||||
{
|
{
|
||||||
const VERSION = STATUSNET_VERSION;
|
const VERSION = STATUSNET_VERSION;
|
||||||
@ -64,7 +63,6 @@ class MapstractionPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean event handler return
|
* @return boolean event handler return
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onRouterInitialized($m)
|
function onRouterInitialized($m)
|
||||||
{
|
{
|
||||||
$m->connect(':nickname/all/map',
|
$m->connect(':nickname/all/map',
|
||||||
@ -85,7 +83,6 @@ class MapstractionPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean event handler return
|
* @return boolean event handler return
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onAutoload($cls)
|
function onAutoload($cls)
|
||||||
{
|
{
|
||||||
switch ($cls)
|
switch ($cls)
|
||||||
@ -109,7 +106,6 @@ class MapstractionPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean event handler return
|
* @return boolean event handler return
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onEndShowScripts($action)
|
function onEndShowScripts($action)
|
||||||
{
|
{
|
||||||
$actionName = $action->trimmed('action');
|
$actionName = $action->trimmed('action');
|
||||||
@ -190,6 +186,7 @@ class MapstractionPlugin extends Plugin
|
|||||||
array('nickname' => $action->trimmed('nickname')));
|
array('nickname' => $action->trimmed('nickname')));
|
||||||
|
|
||||||
$action->element('a', array('href' => $mapUrl),
|
$action->element('a', array('href' => $mapUrl),
|
||||||
|
// TRANS: Clickable item to allow opening the map in full size.
|
||||||
_m("Full size"));
|
_m("Full size"));
|
||||||
|
|
||||||
$action->elementEnd('div');
|
$action->elementEnd('div');
|
||||||
@ -203,8 +200,7 @@ class MapstractionPlugin extends Plugin
|
|||||||
'homepage' => 'http://status.net/wiki/Plugin:Mapstraction',
|
'homepage' => 'http://status.net/wiki/Plugin:Mapstraction',
|
||||||
'rawdescription' =>
|
'rawdescription' =>
|
||||||
_m('Show maps of users\' and friends\' notices '.
|
_m('Show maps of users\' and friends\' notices '.
|
||||||
'with <a href="http://www.mapstraction.com/">Mapstraction</a> '.
|
'with <a href="http://www.mapstraction.com/">Mapstraction</a>.'));
|
||||||
'JavaScript library.'));
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||||
* @link http://status.net/
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class AllmapAction extends MapAction
|
class AllmapAction extends MapAction
|
||||||
{
|
{
|
||||||
function prepare($args)
|
function prepare($args)
|
||||||
@ -63,16 +62,22 @@ class AllmapAction extends MapAction
|
|||||||
function title()
|
function title()
|
||||||
{
|
{
|
||||||
if (!empty($this->profile->fullname)) {
|
if (!empty($this->profile->fullname)) {
|
||||||
|
// @todo FIXME: Bad i18n. Should be "%1$s (%2$s)".
|
||||||
$base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
|
$base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
|
||||||
} else {
|
} else {
|
||||||
$base = $this->user->nickname;
|
$base = $this->user->nickname;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->page == 1) {
|
if ($this->page == 1) {
|
||||||
|
// TRANS: Page title.
|
||||||
|
// TRANS: %s is a user nickname.
|
||||||
return sprintf(_m("%s friends map"),
|
return sprintf(_m("%s friends map"),
|
||||||
$base);
|
$base);
|
||||||
} else {
|
} 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,
|
$base,
|
||||||
$this->page);
|
$this->page);
|
||||||
}
|
}
|
||||||
|
@ -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
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||||
* @link http://status.net/
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class MapAction extends OwnerDesignAction
|
class MapAction extends OwnerDesignAction
|
||||||
{
|
{
|
||||||
var $profile = null;
|
var $profile = null;
|
||||||
@ -116,7 +115,6 @@ class MapAction extends OwnerDesignAction
|
|||||||
*
|
*
|
||||||
* @return boolean event handler return
|
* @return boolean event handler return
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function showScripts()
|
function showScripts()
|
||||||
{
|
{
|
||||||
parent::showScripts();
|
parent::showScripts();
|
||||||
|
@ -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
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||||
* @link http://status.net/
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class UsermapAction extends MapAction
|
class UsermapAction extends MapAction
|
||||||
{
|
{
|
||||||
|
|
||||||
function prepare($args)
|
function prepare($args)
|
||||||
{
|
{
|
||||||
if(parent::prepare($args)) {
|
if(parent::prepare($args)) {
|
||||||
@ -61,14 +59,17 @@ class UsermapAction extends MapAction
|
|||||||
function title()
|
function title()
|
||||||
{
|
{
|
||||||
if (!empty($this->profile->fullname)) {
|
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 {
|
} else {
|
||||||
$base = $this->user->nickname;
|
$base = $this->user->nickname;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->page == 1) {
|
if ($this->page == 1) {
|
||||||
|
// @todo CHECKME: inconsisten with paged variant below. " map" missing.
|
||||||
return $base;
|
return $base;
|
||||||
} else {
|
} else {
|
||||||
|
// @todo CHECKME: Is the part ", page %2$d" relevant here?
|
||||||
return sprintf(_m("%s map, page %d"),
|
return sprintf(_m("%s map, page %d"),
|
||||||
$base,
|
$base,
|
||||||
$this->page);
|
$this->page);
|
||||||
|
Loading…
Reference in New Issue
Block a user