GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Use profile->getBestName() instead of more complex i18n unfriendly construction.

Browse Source 
Update translator documentation.
Number parameters where more than one is used.
L10n updates.
Update README file to break lines at or just before 80 characters.
Remove PHP4-ism "?>"
Update indentation.
Update whitespace.
This commit is contained in:
Siebrand Mazeland
2011-04-25 19:12:26 +02:00
parent a2e4a1803c
commit 3bcff2fa86
14 changed files with 62 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ModPlus/ModPlusPlugin.php
View File

@@ -36,7 +36,8 @@ class ModPlusPlugin extends Plugin
'author' => 'Brion Vibber',
'homepage' => 'http://status.net/wiki/Plugin:ModPlus',
'rawdescription' =>
_m('UI extensions for profile moderation actions.'));
// TRANS: Plugin description.
_m('UI extension for profile moderation actions.'));
return true;
}
@@ -136,6 +137,7 @@ class ModPlusPlugin extends Plugin
$isRemote = !(User::staticGet('id', $profile->id));
if ($isRemote) {
$target = common_local_url('remoteprofile', array('id' => $profile->id));
// TRANS: Label for access to remote profile options.
$label = _m('Remote profile options...');
$out->elementStart('div', 'remote-profile-options');
$out->element('a', array('href' => $target), $label);

22
plugins/ModPlus/remoteprofileaction.php
View File

@@ -1,5 +1,5 @@
<?php
/*
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
@@ -42,14 +42,11 @@ class RemoteProfileAction extends ShowstreamAction
function title()
{
// maybe fixed in 0.9.x
if (!empty($this->profile->fullname)) {
$base = $this->profile->fullname . ' (' . $this->profile->nickname . ') ';
} else {
$base = $this->profile->nickname;
}
$base = $this->profile->getBestName();
$host = parse_url($this->profile->profileurl, PHP_URL_HOST);
return sprintf(_m('%s on %s'), $base, $host);
// TRANS: Remote profile action page title.
// TRANS: %1$s is a username, %2$s is a hostname.
return sprintf(_m('%1$s on %2$s'), $base, $host);
}
/**
@@ -60,7 +57,10 @@ class RemoteProfileAction extends ShowstreamAction
$url = $this->profile->profileurl;
$host = parse_url($url, PHP_URL_HOST);
$markdown = sprintf(
_m('This remote profile is registered on another site; see [%s\'s original profile page on %s](%s).'),
// TRANS: Message on remote profile page.
// TRANS: This message contains Markdown links in the form [description](link).
// TRANS: %1$s is a profile nickname, %2$s is a hostname, %3$s is a URL.
_m('This remote profile is registered on another site; see [%1$s\'s original profile page on %2$s](%3$s).'),
$this->profile->nickname,
$host,
$url);
@@ -68,6 +68,7 @@ class RemoteProfileAction extends ShowstreamAction
$this->raw($html);
if ($this->profile->hasRole(Profile_role::SILENCED)) {
// TRANS: Message on blocked remote profile page.
$markdown = _m('Site moderators have silenced this profile, which prevents delivery of new messages to any users on this site.');
$this->raw(common_markup_to_html($markdown));
}
@@ -103,5 +104,4 @@ class RemoteProfileAction extends ShowstreamAction
{
// skip
}
}
}