* i18n/L10n updates.
* translator documentation added. * superfluous whitespace removed.
This commit is contained in:
parent
5c6732c4bb
commit
6ab34fd8e8
|
@ -185,7 +185,7 @@ class EditApplicationAction extends OwnerDesignAction
|
|||
return;
|
||||
} elseif (mb_strlen($name) > 255) {
|
||||
// TRANS: Validation error shown when providing too long a name in the "Edit application" form.
|
||||
$this->showForm(_('Name is too long (max 255 characters).'));
|
||||
$this->showForm(_('Name is too long (maximum 255 characters).'));
|
||||
return;
|
||||
} else if ($this->nameExists($name)) {
|
||||
// TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
|
||||
|
|
|
@ -153,7 +153,7 @@ class LicenseadminpanelAction extends AdminPanelAction
|
|||
// Make sure the license title is not too long
|
||||
if (mb_strlen($values['license']['type']) > 255) {
|
||||
$this->clientError(
|
||||
_("Invalid license title. Max length is 255 characters.")
|
||||
_('Invalid license title. Maximum length is 255 characters.')
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -166,7 +166,7 @@ class NewApplicationAction extends OwnerDesignAction
|
|||
$this->showForm(_('Name already in use. Try another one.'));
|
||||
return;
|
||||
} elseif (mb_strlen($name) > 255) {
|
||||
$this->showForm(_('Name is too long (maximum 255 chars).'));
|
||||
$this->showForm(_('Name is too long (maximum 255 characters).'));
|
||||
return;
|
||||
} elseif (empty($description)) {
|
||||
$this->showForm(_('Description is required.'));
|
||||
|
@ -196,7 +196,7 @@ class NewApplicationAction extends OwnerDesignAction
|
|||
$this->showForm(_('Organization is required.'));
|
||||
return;
|
||||
} elseif (mb_strlen($organization) > 255) {
|
||||
$this->showForm(_('Organization is too long (maximum 255 chars).'));
|
||||
$this->showForm(_('Organization is too long (maximum 255 characters).'));
|
||||
return;
|
||||
} elseif (empty($homepage)) {
|
||||
$this->showForm(_('Organization homepage is required.'));
|
||||
|
|
|
@ -156,8 +156,11 @@ class NewnoticeAction extends Action
|
|||
|
||||
$content_shortened = common_shorten_links($content);
|
||||
if (Notice::contentTooLong($content_shortened)) {
|
||||
$this->clientError(sprintf(_('That\'s too long. '.
|
||||
'Max notice size is %d chars.'),
|
||||
// TRANS: Client error displayed when the parameter "status" is missing.
|
||||
// TRANS: %d is the maximum number of character for a notice.
|
||||
$this->clientError(sprintf(_m('That\'s too long. Maximum notice size is %d character.',
|
||||
'That\'s too long. Maximum notice size is %d characters.',
|
||||
Notice::maxContent()),
|
||||
Notice::maxContent()));
|
||||
}
|
||||
|
||||
|
@ -178,12 +181,10 @@ class NewnoticeAction extends Action
|
|||
|
||||
if (Notice::contentTooLong($content_shortened)) {
|
||||
$upload->delete();
|
||||
$this->clientError(
|
||||
sprintf(
|
||||
_('Max notice size is %d chars, including attachment URL.'),
|
||||
Notice::maxContent()
|
||||
)
|
||||
);
|
||||
$this->clientError(sprintf(_m('Maximum notice size is %d character, including attachment URL.',
|
||||
'Maximum notice size is %d characters, including attachment URL.',
|
||||
Notice::maxContent()),
|
||||
Notice::maxContent()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -159,7 +159,7 @@ class OthersettingsAction extends AccountSettingsAction
|
|||
|
||||
if (!is_null($urlshorteningservice) && strlen($urlshorteningservice) > 50) {
|
||||
// TRANS: Form validation error for form "Other settings" in user profile.
|
||||
$this->showForm(_('URL shortening service is too long (maximum 50 chars).'));
|
||||
$this->showForm(_('URL shortening service is too long (maximum 50 characters).'));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -362,7 +362,7 @@ class RecoverpasswordAction extends Action
|
|||
$confirm = $this->trimmed('confirm');
|
||||
|
||||
if (!$newpassword || strlen($newpassword) < 6) {
|
||||
$this->showPasswordForm(_('Password must be 6 chars or more.'));
|
||||
$this->showPasswordForm(_('Password must be 6 characters or more.'));
|
||||
return;
|
||||
}
|
||||
if ($newpassword != $confirm) {
|
||||
|
|
|
@ -42,7 +42,6 @@ require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
|
|||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
class SitenoticeadminpanelAction extends AdminPanelAction
|
||||
{
|
||||
/**
|
||||
|
@ -50,9 +49,9 @@ class SitenoticeadminpanelAction extends AdminPanelAction
|
|||
*
|
||||
* @return string page title
|
||||
*/
|
||||
|
||||
function title()
|
||||
{
|
||||
// TRANS: Page title for site-wide notice tab in admin panel.
|
||||
return _('Site Notice');
|
||||
}
|
||||
|
||||
|
@ -61,9 +60,9 @@ class SitenoticeadminpanelAction extends AdminPanelAction
|
|||
*
|
||||
* @return string instructions
|
||||
*/
|
||||
|
||||
function getInstructions()
|
||||
{
|
||||
// TRANS: Instructions for site-wide notice tab in admin panel.
|
||||
return _('Edit site-wide message');
|
||||
}
|
||||
|
||||
|
@ -72,7 +71,6 @@ class SitenoticeadminpanelAction extends AdminPanelAction
|
|||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
function showForm()
|
||||
{
|
||||
$form = new SiteNoticeAdminPanelForm($this);
|
||||
|
@ -85,7 +83,6 @@ class SitenoticeadminpanelAction extends AdminPanelAction
|
|||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
function saveSettings()
|
||||
{
|
||||
$siteNotice = $this->trimmed('site-notice');
|
||||
|
@ -100,6 +97,7 @@ class SitenoticeadminpanelAction extends AdminPanelAction
|
|||
$result = Config::save('site', 'notice', $siteNotice);
|
||||
|
||||
if (!$result) {
|
||||
// TRANS: Server error displayed when saving a site-wide notice was impossible.
|
||||
$this->ServerError(_("Unable to save site notice."));
|
||||
}
|
||||
}
|
||||
|
@ -110,7 +108,8 @@ class SitenoticeadminpanelAction extends AdminPanelAction
|
|||
|
||||
if (mb_strlen($siteNotice) > 255) {
|
||||
$this->clientError(
|
||||
_('Max length for the site-wide notice is 255 chars.')
|
||||
// TRANS: Client error displayed when a site-wide notice was longer than allowed.
|
||||
_('Maximum length for the site-wide notice is 255 characters.')
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -173,9 +172,11 @@ class SiteNoticeAdminPanelForm extends AdminForm
|
|||
$this->out->elementStart('li');
|
||||
$this->out->textarea(
|
||||
'site-notice',
|
||||
// TRANS: Label for site-wide notice text field in admin panel.
|
||||
_('Site notice text'),
|
||||
common_config('site', 'notice'),
|
||||
_('Site-wide notice text (255 chars max; HTML okay)')
|
||||
// TRANS: Tooltip for site-wide notice text field in admin panel.
|
||||
_('Site-wide notice text (255 characters maximum; HTML allowed)')
|
||||
);
|
||||
$this->out->elementEnd('li');
|
||||
|
||||
|
@ -192,9 +193,11 @@ class SiteNoticeAdminPanelForm extends AdminForm
|
|||
{
|
||||
$this->out->submit(
|
||||
'submit',
|
||||
_('Save'),
|
||||
// TRANS: Button text for saving site notice in admin panel.
|
||||
_m('BUTTON','Save'),
|
||||
'submit',
|
||||
null,
|
||||
// TRANS: Title for button to save site notice in admin panel.
|
||||
_('Save site notice')
|
||||
);
|
||||
}
|
||||
|
|
|
@ -45,7 +45,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 UseradminpanelAction extends AdminPanelAction
|
||||
{
|
||||
/**
|
||||
|
@ -53,7 +52,6 @@ class UseradminpanelAction extends AdminPanelAction
|
|||
*
|
||||
* @return string page title
|
||||
*/
|
||||
|
||||
function title()
|
||||
{
|
||||
// TRANS: User admin panel title
|
||||
|
@ -65,9 +63,9 @@ class UseradminpanelAction extends AdminPanelAction
|
|||
*
|
||||
* @return string instructions
|
||||
*/
|
||||
|
||||
function getInstructions()
|
||||
{
|
||||
// TRANS: Instruction for user admin panel.
|
||||
return _('User settings for this StatusNet site');
|
||||
}
|
||||
|
||||
|
@ -76,7 +74,6 @@ class UseradminpanelAction extends AdminPanelAction
|
|||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
function showForm()
|
||||
{
|
||||
$form = new UserAdminPanelForm($this);
|
||||
|
@ -89,7 +86,6 @@ class UseradminpanelAction extends AdminPanelAction
|
|||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
function saveSettings()
|
||||
{
|
||||
static $settings = array(
|
||||
|
@ -147,13 +143,15 @@ class UseradminpanelAction extends AdminPanelAction
|
|||
// Validate biolimit
|
||||
|
||||
if (!Validate::number($values['profile']['biolimit'])) {
|
||||
$this->clientError(_("Invalid bio limit. Must be numeric."));
|
||||
// TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
|
||||
$this->clientError(_('Invalid bio limit. Must be numeric.'));
|
||||
}
|
||||
|
||||
// Validate welcome text
|
||||
|
||||
if (mb_strlen($values['newuser']['welcome']) > 255) {
|
||||
$this->clientError(_("Invalid welcome text. Max length is 255 characters."));
|
||||
// TRANS: Form validation error in user admin panel when welcome text is too long.
|
||||
$this->clientError(_('Invalid welcome text. Maximum length is 255 characters.'));
|
||||
}
|
||||
|
||||
// Validate default subscription
|
||||
|
@ -163,7 +161,9 @@ class UseradminpanelAction extends AdminPanelAction
|
|||
if (empty($defuser)) {
|
||||
$this->clientError(
|
||||
sprintf(
|
||||
_('Invalid default subscripton: \'%1$s\' is not user.'),
|
||||
// TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
|
||||
// TRANS: users in user admin panel. %1$s is the invalid nickname.
|
||||
_('Invalid default subscripton: \'%1$s\' is not a user.'),
|
||||
$values['newuser']['default']
|
||||
)
|
||||
);
|
||||
|
@ -179,7 +179,6 @@ class UserAdminPanelForm extends AdminForm
|
|||
*
|
||||
* @return int ID of the form
|
||||
*/
|
||||
|
||||
function id()
|
||||
{
|
||||
return 'useradminpanel';
|
||||
|
@ -190,7 +189,6 @@ class UserAdminPanelForm extends AdminForm
|
|||
*
|
||||
* @return string class of the form
|
||||
*/
|
||||
|
||||
function formClass()
|
||||
{
|
||||
return 'form_settings';
|
||||
|
@ -201,7 +199,6 @@ class UserAdminPanelForm extends AdminForm
|
|||
*
|
||||
* @return string URL of the action
|
||||
*/
|
||||
|
||||
function action()
|
||||
{
|
||||
return common_local_url('useradminpanel');
|
||||
|
@ -212,7 +209,6 @@ class UserAdminPanelForm extends AdminForm
|
|||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
function formData()
|
||||
{
|
||||
$this->out->elementStart('fieldset', array('id' => 'settings_user-profile'));
|
||||
|
@ -220,7 +216,9 @@ class UserAdminPanelForm extends AdminForm
|
|||
$this->out->elementStart('ul', 'form_data');
|
||||
|
||||
$this->li();
|
||||
// TRANS: Field label in user admin panel for setting the character limit for the bio field.
|
||||
$this->input('biolimit', _('Bio Limit'),
|
||||
// TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
|
||||
_('Maximum length of a profile bio in characters.'),
|
||||
'profile');
|
||||
$this->unli();
|
||||
|
@ -229,17 +227,22 @@ class UserAdminPanelForm extends AdminForm
|
|||
$this->out->elementEnd('fieldset');
|
||||
|
||||
$this->out->elementStart('fieldset', array('id' => 'settings_user-newusers'));
|
||||
// TRANS: Form legend in user admin panel.
|
||||
$this->out->element('legend', null, _('New users'));
|
||||
$this->out->elementStart('ul', 'form_data');
|
||||
|
||||
$this->li();
|
||||
// TRANS: Field label in user admin panel for setting new user welcome text.
|
||||
$this->input('welcome', _('New user welcome'),
|
||||
_('Welcome text for new users (Max 255 chars).'),
|
||||
// TRANS: Tooltip in user admin panel for setting new user welcome text.
|
||||
_('Welcome text for new users (maximum 255 characters).'),
|
||||
'newuser');
|
||||
$this->unli();
|
||||
|
||||
$this->li();
|
||||
// TRANS: Field label in user admin panel for setting default subscription for new users.
|
||||
$this->input('default', _('Default subscription'),
|
||||
// TRANS: Tooltip in user admin panel for setting default subscription for new users.
|
||||
_('Automatically subscribe new users to this user.'),
|
||||
'newuser');
|
||||
$this->unli();
|
||||
|
@ -249,21 +252,21 @@ class UserAdminPanelForm extends AdminForm
|
|||
$this->out->elementEnd('fieldset');
|
||||
|
||||
$this->out->elementStart('fieldset', array('id' => 'settings_user-invitations'));
|
||||
// TRANS: Form legend in user admin panel.
|
||||
$this->out->element('legend', null, _('Invitations'));
|
||||
$this->out->elementStart('ul', 'form_data');
|
||||
|
||||
$this->li();
|
||||
|
||||
// TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
|
||||
$this->out->checkbox('invite-enabled', _('Invitations enabled'),
|
||||
(bool) $this->value('enabled', 'invite'),
|
||||
// TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
|
||||
_('Whether to allow users to invite new users.'));
|
||||
$this->unli();
|
||||
|
||||
$this->out->elementEnd('ul');
|
||||
$this->out->elementEnd('fieldset');
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -278,7 +281,6 @@ class UserAdminPanelForm extends AdminForm
|
|||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
function input($setting, $title, $instructions, $section='site')
|
||||
{
|
||||
$this->out->input("$section-$setting", $title, $this->value($setting, $section), $instructions);
|
||||
|
@ -289,9 +291,14 @@ class UserAdminPanelForm extends AdminForm
|
|||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
function formActions()
|
||||
{
|
||||
$this->out->submit('submit', _('Save'), 'submit', null, _('Save user settings'));
|
||||
$this->out->submit('submit',
|
||||
// TRANS: Button text to save user settings in user admin panel.
|
||||
_m('BUTTON','Save'),
|
||||
'submit',
|
||||
null,
|
||||
// TRANS: Title for button to save user settings in user admin panel.
|
||||
_('Save user settings'));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -204,6 +204,6 @@ class GroupEditForm extends Form
|
|||
|
||||
function formActions()
|
||||
{
|
||||
$this->out->submit('submit', _('Save'));
|
||||
$this->out->submit('submit', _m('BUTTON','Save'));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -57,8 +57,9 @@ class MailHandler
|
|||
$msg = $this->cleanup_msg($msg);
|
||||
$msg = common_shorten_links($msg);
|
||||
if (Notice::contentTooLong($msg)) {
|
||||
$this->error($from, sprintf(_('That\'s too long. '.
|
||||
'Max notice size is %d chars.'),
|
||||
$this->error($from, sprintf(_('That\'s too long. Maximum notice size is %d character.',
|
||||
'That\'s too long. Maximum notice size is %d characters.',
|
||||
Notice::maxContent()),
|
||||
Notice::maxContent()));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user