i18n/L10n updates and superfluous whitespace removed.
This commit is contained in:
parent
04fcfeaf6f
commit
d0bbd343f0
|
@ -145,7 +145,8 @@ class BlacklistPlugin extends Plugin
|
||||||
|
|
||||||
if (!empty($homepage)) {
|
if (!empty($homepage)) {
|
||||||
if (!$this->_checkUrl($homepage)) {
|
if (!$this->_checkUrl($homepage)) {
|
||||||
$msg = sprintf(_m("You may not register with homepage '%s'."),
|
// TRANS: Validation failure for URL. %s is the URL.
|
||||||
|
$msg = sprintf(_m("You may not register with homepage \"%s\"."),
|
||||||
$homepage);
|
$homepage);
|
||||||
throw new ClientException($msg);
|
throw new ClientException($msg);
|
||||||
}
|
}
|
||||||
|
@ -155,7 +156,8 @@ class BlacklistPlugin extends Plugin
|
||||||
|
|
||||||
if (!empty($nickname)) {
|
if (!empty($nickname)) {
|
||||||
if (!$this->_checkNickname($nickname)) {
|
if (!$this->_checkNickname($nickname)) {
|
||||||
$msg = sprintf(_m("You may not register with nickname '%s'."),
|
// TRANS: Validation failure for nickname. %s is the nickname.
|
||||||
|
$msg = sprintf(_m("You may not register with nickname \"%s\"."),
|
||||||
$nickname);
|
$nickname);
|
||||||
throw new ClientException($msg);
|
throw new ClientException($msg);
|
||||||
}
|
}
|
||||||
|
@ -179,7 +181,8 @@ class BlacklistPlugin extends Plugin
|
||||||
|
|
||||||
if (!empty($homepage)) {
|
if (!empty($homepage)) {
|
||||||
if (!$this->_checkUrl($homepage)) {
|
if (!$this->_checkUrl($homepage)) {
|
||||||
$msg = sprintf(_m("You may not use homepage '%s'."),
|
// TRANS: Validation failure for URL. %s is the URL.
|
||||||
|
$msg = sprintf(_m("You may not use homepage \"%s\"."),
|
||||||
$homepage);
|
$homepage);
|
||||||
throw new ClientException($msg);
|
throw new ClientException($msg);
|
||||||
}
|
}
|
||||||
|
@ -189,7 +192,8 @@ class BlacklistPlugin extends Plugin
|
||||||
|
|
||||||
if (!empty($nickname)) {
|
if (!empty($nickname)) {
|
||||||
if (!$this->_checkNickname($nickname)) {
|
if (!$this->_checkNickname($nickname)) {
|
||||||
$msg = sprintf(_m("You may not use nickname '%s'."),
|
// TRANS: Validation failure for nickname. %s is the nickname.
|
||||||
|
$msg = sprintf(_m("You may not use nickname \"%s\"."),
|
||||||
$nickname);
|
$nickname);
|
||||||
throw new ClientException($msg);
|
throw new ClientException($msg);
|
||||||
}
|
}
|
||||||
|
@ -231,6 +235,7 @@ class BlacklistPlugin extends Plugin
|
||||||
$url = htmlspecialchars_decode($url);
|
$url = htmlspecialchars_decode($url);
|
||||||
|
|
||||||
if (!$this->_checkUrl($url)) {
|
if (!$this->_checkUrl($url)) {
|
||||||
|
// TRANS: Validation failure for URL. %s is the URL.
|
||||||
$msg = sprintf(_m("You may not use URL \"%s\" in notices."),
|
$msg = sprintf(_m("You may not use URL \"%s\" in notices."),
|
||||||
$url);
|
$url);
|
||||||
throw new ClientException($msg);
|
throw new ClientException($msg);
|
||||||
|
@ -372,8 +377,10 @@ class BlacklistPlugin extends Plugin
|
||||||
$action_name = $nav->action->trimmed('action');
|
$action_name = $nav->action->trimmed('action');
|
||||||
|
|
||||||
$nav->out->menuItem(common_local_url('blacklistadminpanel'),
|
$nav->out->menuItem(common_local_url('blacklistadminpanel'),
|
||||||
_m('Blacklist'),
|
// TRANS: Menu item in admin panel.
|
||||||
_m('Blacklist configuration'),
|
_m('MENU','Blacklist'),
|
||||||
|
// TRANS: Tooltip for menu item in admin panel.
|
||||||
|
_m('TOOLTIP','Blacklist configuration'),
|
||||||
$action_name == 'blacklistadminpanel',
|
$action_name == 'blacklistadminpanel',
|
||||||
'nav_blacklist_admin_panel');
|
'nav_blacklist_admin_panel');
|
||||||
}
|
}
|
||||||
|
@ -399,6 +406,7 @@ class BlacklistPlugin extends Plugin
|
||||||
$action->elementStart('li');
|
$action->elementStart('li');
|
||||||
$this->checkboxAndText($action,
|
$this->checkboxAndText($action,
|
||||||
'blacklistnickname',
|
'blacklistnickname',
|
||||||
|
// TRANS: Checkbox with text label in the delete user form.
|
||||||
_m('Add this nickname pattern to blacklist'),
|
_m('Add this nickname pattern to blacklist'),
|
||||||
'blacklistnicknamepattern',
|
'blacklistnicknamepattern',
|
||||||
$this->patternizeNickname($user->nickname));
|
$this->patternizeNickname($user->nickname));
|
||||||
|
@ -408,6 +416,7 @@ class BlacklistPlugin extends Plugin
|
||||||
$action->elementStart('li');
|
$action->elementStart('li');
|
||||||
$this->checkboxAndText($action,
|
$this->checkboxAndText($action,
|
||||||
'blacklisthomepage',
|
'blacklisthomepage',
|
||||||
|
// TRANS: Checkbox with text label in the delete user form.
|
||||||
_m('Add this homepage pattern to blacklist'),
|
_m('Add this homepage pattern to blacklist'),
|
||||||
'blacklisthomepagepattern',
|
'blacklisthomepagepattern',
|
||||||
$this->patternizeHomepage($profile->homepage));
|
$this->patternizeHomepage($profile->homepage));
|
||||||
|
@ -486,7 +495,8 @@ class BlacklistPlugin extends Plugin
|
||||||
|
|
||||||
if (!empty($homepage)) {
|
if (!empty($homepage)) {
|
||||||
if (!$this->_checkUrl($homepage)) {
|
if (!$this->_checkUrl($homepage)) {
|
||||||
$msg = sprintf(_m("Users from '%s' blocked."),
|
// TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
|
||||||
|
$msg = sprintf(_m("Users from \"%s\" blocked."),
|
||||||
$homepage);
|
$homepage);
|
||||||
throw new ClientException($msg);
|
throw new ClientException($msg);
|
||||||
}
|
}
|
||||||
|
@ -496,7 +506,8 @@ class BlacklistPlugin extends Plugin
|
||||||
|
|
||||||
if (!empty($nickname)) {
|
if (!empty($nickname)) {
|
||||||
if (!$this->_checkNickname($nickname)) {
|
if (!$this->_checkNickname($nickname)) {
|
||||||
$msg = sprintf(_m("Posts from nickname '%s' disallowed."),
|
// TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
|
||||||
|
$msg = sprintf(_m("Posts from nickname \"%s\" disallowed."),
|
||||||
$nickname);
|
$nickname);
|
||||||
throw new ClientException($msg);
|
throw new ClientException($msg);
|
||||||
}
|
}
|
||||||
|
@ -508,7 +519,6 @@ class BlacklistPlugin extends Plugin
|
||||||
/**
|
/**
|
||||||
* Check URLs and homepages for blacklisted users.
|
* Check URLs and homepages for blacklisted users.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onStartSubscribe($subscriber, $other)
|
function onStartSubscribe($subscriber, $other)
|
||||||
{
|
{
|
||||||
foreach (array($other->profileurl, $other->homepage) as $url) {
|
foreach (array($other->profileurl, $other->homepage) as $url) {
|
||||||
|
@ -520,7 +530,8 @@ class BlacklistPlugin extends Plugin
|
||||||
$url = strtolower($url);
|
$url = strtolower($url);
|
||||||
|
|
||||||
if (!$this->_checkUrl($url)) {
|
if (!$this->_checkUrl($url)) {
|
||||||
$msg = sprintf(_m("Users from '%s' blocked."),
|
// TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
|
||||||
|
$msg = sprintf(_m("Users from \"%s\" blocked."),
|
||||||
$url);
|
$url);
|
||||||
throw new ClientException($msg);
|
throw new ClientException($msg);
|
||||||
}
|
}
|
||||||
|
@ -530,7 +541,8 @@ class BlacklistPlugin extends Plugin
|
||||||
|
|
||||||
if (!empty($nickname)) {
|
if (!empty($nickname)) {
|
||||||
if (!$this->_checkNickname($nickname)) {
|
if (!$this->_checkNickname($nickname)) {
|
||||||
$msg = sprintf(_m("Can't subscribe to nickname '%s'."),
|
// TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
|
||||||
|
$msg = sprintf(_m("Can't subscribe to nickname \"%s\"."),
|
||||||
$nickname);
|
$nickname);
|
||||||
throw new ClientException($msg);
|
throw new ClientException($msg);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user