git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 14456cbb authored by Siebrand Mazeland's avatar Siebrand Mazeland

Fix gettext domain for messages in plugins "_()" to "_m()".

Some other i18n and L10n updates, too.

i18n/L10n review not complete.
parent 0ac09253
......@@ -233,6 +233,10 @@ class BitlyAdminPanelForm extends AdminForm
function formActions()
{
$this->out->submit('submit', _('Save'), 'submit', null, _m('Save bit.ly settings'));
$this->out->submit('submit',
_m('BUTTON','Save'),
'submit',
null,
_m('Save bit.ly settings'));
}
}
......@@ -82,13 +82,13 @@ class BlogspamNetPlugin extends Plugin
} else {
common_debug("Blogspamnet results = " . $response);
if (preg_match('/^ERROR(:(.*))?$/', $response, $match)) {
throw new ServerException(sprintf(_("Error from %s: %s"), $this->baseUrl, $match[2]), 500);
throw new ServerException(sprintf(_m("Error from %1$s: %2$s"), $this->baseUrl, $match[2]), 500);
} else if (preg_match('/^SPAM(:(.*))?$/', $response, $match)) {
throw new ClientException(sprintf(_("Spam checker results: %s"), $match[2]), 400);
throw new ClientException(sprintf(_m("Spam checker results: %s"), $match[2]), 400);
} else if (preg_match('/^OK$/', $response)) {
// don't do anything
} else {
throw new ServerException(sprintf(_("Unexpected response from %s: %s"), $this->baseUrl, $response), 500);
throw new ServerException(sprintf(_m("Unexpected response from %1$s: %2$s"), $this->baseUrl, $response), 500);
}
}
return true;
......
......@@ -199,7 +199,7 @@ class Bookmark extends Memcached_DataObject
$nb = self::getByURL($profile, $url);
if (!empty($nb)) {
throw new ClientException(_('Bookmark already exists.'));
throw new ClientException(_m('Bookmark already exists.'));
}
if (empty($options)) {
......@@ -209,7 +209,7 @@ class Bookmark extends Memcached_DataObject
if (array_key_exists('uri', $options)) {
$other = Bookmark::staticGet('uri', $options['uri']);
if (!empty($other)) {
throw new ClientException(_('Bookmark already exists.'));
throw new ClientException(_m('Bookmark already exists.'));
}
}
......@@ -288,16 +288,19 @@ class Bookmark extends Memcached_DataObject
$shortUrl = $url;
}
$content = sprintf(_('"%s" %s %s %s'),
// @todo FIXME: i18n documentation.
// TRANS: %1$s is a title, %2$s is a short URL, %3$s is a description,
// TRANS: %4$s is space separated list of hash tags.
$content = sprintf(_m('"%1$s" %2$s %3$s %4$s'),
$title,
$shortUrl,
$description,
implode(' ', $hashtags));
$rendered = sprintf(_('<span class="xfolkentry">'.
'<a class="taggedlink" href="%s">%s</a> '.
'<span class="description">%s</span> '.
'<span class="meta">%s</span>'.
$rendered = sprintf(_m('<span class="xfolkentry">'.
'<a class="taggedlink" href="%1$s">%2$s</a> '.
'<span class="description">%3$s</span> '.
'<span class="meta">%4$s</span>'.
'</span>'),
htmlspecialchars($url),
htmlspecialchars($title),
......
......@@ -274,7 +274,7 @@ class BookmarkPlugin extends MicroAppPlugin
$action->elementStart('li');
$action->element('a',
array('href' => common_local_url('importdelicious')),
_('Import del.icio.us bookmarks'));
_m('Import del.icio.us bookmarks'));
$action->elementEnd('li');
}
......@@ -379,7 +379,7 @@ class BookmarkPlugin extends MicroAppPlugin
$relLinkEls = ActivityUtils::getLinks($bookmark->element, 'related');
if (count($relLinkEls) < 1) {
throw new ClientException(_('Expected exactly 1 link '.
throw new ClientException(_m('Expected exactly 1 link '.
'rel=related in a Bookmark.'));
}
......@@ -472,7 +472,7 @@ class BookmarkPlugin extends MicroAppPlugin
$attachments = $notice->attachments();
if (count($attachments) != 1) {
throw new ServerException(_('Bookmark notice with the '.
throw new ServerException(_m('Bookmark notice with the '.
'wrong number of attachments.'));
}
......
......@@ -121,30 +121,30 @@ class BookmarkForm extends Form
$this->li();
$this->out->input('title',
_('Title'),
_m('LABEL','Title'),
$this->_title,
_('Title of the bookmark'));
_m('Title of the bookmark'));
$this->unli();
$this->li();
$this->out->input('url',
_('URL'),
_m('LABEL','URL'),
$this->_url,
_('URL to bookmark'));
_m('URL to bookmark'));
$this->unli();
$this->li();
$this->out->input('tags',
_('Tags'),
_m('LABEL','Tags'),
$this->_tags,
_('Comma- or space-separated list of tags'));
_m('Comma- or space-separated list of tags'));
$this->unli();
$this->li();
$this->out->input('description',
_('Description'),
_m('LABEL','Description'),
$this->_description,
_('Description of the URL'));
_m('Description of the URL'));
$this->unli();
$this->out->elementEnd('ul');
......
......@@ -55,7 +55,7 @@ class BookmarkpopupAction extends NewbookmarkAction
// TRANS: Title for mini-posting window loaded from bookmarklet.
// TRANS: %s is the StatusNet site name.
$this->element('title',
null, sprintf(_('Bookmark on %s'),
null, sprintf(_m('Bookmark on %s'),
common_config('site', 'name')));
}
......
......@@ -82,7 +82,7 @@ class DeliciousBackupImporter extends QueueHandler
$dls = $doc->getElementsByTagName('dl');
if ($dls->length != 1) {
throw new ClientException(_("Bad import file."));
throw new ClientException(_m("Bad import file."));
}
$dl = $dls->item(0);
......@@ -165,7 +165,7 @@ class DeliciousBackupImporter extends QueueHandler
$as = $dt->getElementsByTagName('a');
if ($as->length == 0) {
throw new ClientException(_("No <A> tag in a <DT>."));
throw new ClientException(_m("No <A> tag in a <DT>."));
}
$a = $as->item(0);
......@@ -173,7 +173,7 @@ class DeliciousBackupImporter extends QueueHandler
$private = $a->getAttribute('private');
if ($private != 0) {
throw new ClientException(_('Skipping private bookmark.'));
throw new ClientException(_m('Skipping private bookmark.'));
}
if (!empty($dd)) {
......
......@@ -75,7 +75,7 @@ function getBookmarksFile()
}
// TRANS: %s is the filename that contains a backup for a user.
printfv(_("Getting backup from file '%s'.")."\n", $filename);
printfv(_m("Getting backup from file \"%s\".")."\n", $filename);
$html = file_get_contents($filename);
......
......@@ -58,7 +58,7 @@ class ImportdeliciousAction extends Action
function title()
{
return _("Import del.icio.us bookmarks");
return _m("Import del.icio.us bookmarks");
}
/**
......@@ -76,13 +76,13 @@ class ImportdeliciousAction extends Action
$cur = common_current_user();
if (empty($cur)) {
throw new ClientException(_('Only logged-in users can '.
throw new ClientException(_m('Only logged-in users can '.
'import del.icio.us backups.'),
403);
}
if (!$cur->hasRight(BookmarkPlugin::IMPORTDELICIOUS)) {
throw new ClientException(_('You may not restore your account.'), 403);
throw new ClientException(_m('You may not restore your account.'), 403);
}
return true;
......@@ -121,7 +121,7 @@ class ImportdeliciousAction extends Action
$this->checkSessionToken();
if (!isset($_FILES[ImportDeliciousForm::FILEINPUT]['error'])) {
throw new ClientException(_('No uploaded file.'));
throw new ClientException(_m('No uploaded file.'));
}
switch ($_FILES[ImportDeliciousForm::FILEINPUT]['error']) {
......@@ -129,42 +129,42 @@ class ImportdeliciousAction extends Action
break;
case UPLOAD_ERR_INI_SIZE:
// TRANS: Client exception thrown when an uploaded file is too large.
throw new ClientException(_('The uploaded file exceeds the ' .
throw new ClientException(_m('The uploaded file exceeds the ' .
'upload_max_filesize directive in php.ini.'));
return;
case UPLOAD_ERR_FORM_SIZE:
throw new ClientException(
// TRANS: Client exception.
_('The uploaded file exceeds the MAX_FILE_SIZE directive' .
_m('The uploaded file exceeds the MAX_FILE_SIZE directive' .
' that was specified in the HTML form.'));
return;
case UPLOAD_ERR_PARTIAL:
@unlink($_FILES[ImportDeliciousForm::FILEINPUT]['tmp_name']);
// TRANS: Client exception.
throw new ClientException(_('The uploaded file was only' .
throw new ClientException(_m('The uploaded file was only' .
' partially uploaded.'));
return;
case UPLOAD_ERR_NO_FILE:
// No file; probably just a non-AJAX submission.
throw new ClientException(_('No uploaded file.'));
throw new ClientException(_m('No uploaded file.'));
return;
case UPLOAD_ERR_NO_TMP_DIR:
// TRANS: Client exception thrown when a temporary folder is not present
throw new ClientException(_('Missing a temporary folder.'));
throw new ClientException(_m('Missing a temporary folder.'));
return;
case UPLOAD_ERR_CANT_WRITE:
// TRANS: Client exception thrown when writing to disk is not possible
throw new ClientException(_('Failed to write file to disk.'));
throw new ClientException(_m('Failed to write file to disk.'));
return;
case UPLOAD_ERR_EXTENSION:
// TRANS: Client exception thrown when a file upload has been stopped
throw new ClientException(_('File upload stopped by extension.'));
throw new ClientException(_m('File upload stopped by extension.'));
return;
default:
common_log(LOG_ERR, __METHOD__ . ": Unknown upload error " .
$_FILES[ImportDeliciousForm::FILEINPUT]['error']);
// TRANS: Client exception thrown when a file upload operation has failed
throw new ClientException(_('System error uploading file.'));
throw new ClientException(_m('System error uploading file.'));
return;
}
......@@ -183,7 +183,7 @@ class ImportdeliciousAction extends Action
throw new ServerException("File '$filename' not readable.");
}
common_debug(sprintf(_("Getting backup from file '%s'."), $filename));
common_debug(sprintf(_m("Getting backup from file '%s'."), $filename));
$html = file_get_contents($filename);
......@@ -219,10 +219,10 @@ class ImportdeliciousAction extends Action
{
if ($this->success) {
$this->element('p', null,
_('Bookmarks have been imported. Your bookmarks should now appear in search and your profile page.'));
_m('Bookmarks have been imported. Your bookmarks should now appear in search and your profile page.'));
} else if ($this->inprogress) {
$this->element('p', null,
_('Bookmarks are being imported. Please wait a few minutes for results.'));
_m('Bookmarks are being imported. Please wait a few minutes for results.'));
} else {
$form = new ImportDeliciousForm($this);
$form->show();
......@@ -310,7 +310,7 @@ class ImportDeliciousForm extends Form
{
$this->out->elementStart('p', 'instructions');
$this->out->raw(_('You can upload a backed-up '.
$this->out->raw(_m('You can upload a backed-up '.
'delicious.com bookmarks file.'));
$this->out->elementEnd('p');
......@@ -340,6 +340,6 @@ class ImportDeliciousForm extends Form
_m('BUTTON', 'Upload'),
'submit',
null,
_('Upload the file'));
_m('Upload the file'));
}
}
......@@ -62,7 +62,7 @@ class NewbookmarkAction extends Action
function title()
{
return _('New bookmark');
return _m('New bookmark');
}
/**
......@@ -80,7 +80,7 @@ class NewbookmarkAction extends Action
$this->user = common_current_user();
if (empty($this->user)) {
throw new ClientException(_("Must be logged in to post a bookmark."),
throw new ClientException(_m("Must be logged in to post a bookmark."),
403);
}
......@@ -130,11 +130,11 @@ class NewbookmarkAction extends Action
}
try {
if (empty($this->title)) {
throw new ClientException(_('Bookmark must have a title.'));
throw new ClientException(_m('Bookmark must have a title.'));
}
if (empty($this->url)) {
throw new ClientException(_('Bookmark must have an URL.'));
throw new ClientException(_m('Bookmark must have an URL.'));
}
......@@ -156,7 +156,7 @@ class NewbookmarkAction extends Action
$this->elementStart('html');
$this->elementStart('head');
// TRANS: Page title after sending a notice.
$this->element('title', null, _('Notice posted'));
$this->element('title', null, _m('Notice posted'));
$this->elementEnd('head');
$this->elementStart('body');
$this->showNotice($saved);
......
......@@ -67,7 +67,7 @@ class NoticebyurlAction extends Action
$this->file = File::staticGet('id', $this->trimmed('id'));
if (empty($this->file)) {
throw new ClientException(_('Unknown URL'));
throw new ClientException(_m('Unknown URL'));
}
$pageArg = $this->trimmed('page');
......@@ -89,9 +89,9 @@ class NoticebyurlAction extends Action
function title()
{
if ($this->page == 1) {
return sprintf(_("Notices linking to %s"), $this->file->url);
return sprintf(_m("Notices linking to %s"), $this->file->url);
} else {
return sprintf(_("Notices linking to %s, page %d"),
return sprintf(_m("Notices linking to %1$s, page %2$d"),
$this->file->url,
$this->page);
}
......
......@@ -82,7 +82,7 @@ class ShowbookmarkAction extends ShownoticeAction
{
// TRANS: Title for bookmark.
// TRANS: %1$s is a user nickname, %2$s is a bookmark title.
return sprintf(_('%1$s\'s bookmark for "%2$s"'),
return sprintf(_m('%1$s\'s bookmark for "%2$s"'),
$this->user->nickname,
$this->bookmark->title);
}
......
......@@ -165,8 +165,8 @@ class DirectoryPlugin extends Plugin
$nav->out->menuItem(
common_local_url('userdirectory'),
_('Directory'),
_('User Directory'),
_m('Directory'),
_m('User Directory'),
$actionName == 'userdirectory',
'nav_directory'
);
......
......@@ -116,7 +116,7 @@ class UserdirectoryAction extends Action
function getInstructions()
{
// TRANS: %%site.name%% is the name of the StatusNet site.
return _(
return _m(
'Search for people on %%site.name%% by their name, '
. 'location, or interests. Separate the terms by spaces; '
. ' they must be 3 characters or more.'
......@@ -256,11 +256,11 @@ class UserdirectoryAction extends Action
$this->elementStart('fieldset');
$this->element('legend', null, _('Search site'));
$this->element('legend', null, _m('Search site'));
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->input('q', _('Keyword(s)'), $this->q);
$this->input('q', _m('Keyword(s)'), $this->q);
$this->submit('search', _m('BUTTON','Search'));
$this->elementEnd('li');
......@@ -372,7 +372,7 @@ class UserdirectoryAction extends Action
)
);
} else {
$this->element('p', 'error', _('No results.'));
$this->element('p', 'error', _m('No results.'));
$message = _m(<<<E_O_T
* Make sure all words are spelled correctly.
* Try different keywords.
......
......@@ -151,7 +151,7 @@ class EmailSummaryPlugin extends Plugin
$action->elementStart('li');
$action->checkbox('emailsummary',
// TRANS: Checkbox label in e-mail preferences form.
_('Send me a periodic summary of updates from my network.'),
_m('Send me a periodic summary of updates from my network.'),
Email_summary_status::getSendSummary($user->id));
$action->elementEnd('li');
return true;
......
......@@ -128,7 +128,7 @@ class UserEmailSummaryHandler extends QueueHandler
'style' => 'background-color: #ffffff; border: 4px solid #4c609a; padding: 10px;'));
$out->elementStart('div', array('style' => 'color: #ffffff; background-color: #4c609a; font-weight: bold; margin-bottom: 10px; padding: 4px;'));
$out->raw(sprintf(_('Recent updates from %1s for %2s:'),
$out->raw(sprintf(_m('Recent updates from %1s for %2s:'),
common_config('site', 'name'),
$profile->getBestName()));
$out->elementEnd('div');
......@@ -184,7 +184,7 @@ class UserEmailSummaryHandler extends QueueHandler
$out->text(' ');
$out->element('a',
array('href' => $convurl.'#notice-'.$notice->id),
_('in context'));
_m('in context'));
}
}
$out->elementEnd('div');
......@@ -194,7 +194,7 @@ class UserEmailSummaryHandler extends QueueHandler
$out->elementEnd('table');
$out->raw(sprintf(_('<p><a href="%1s">change your email settings for %2s</a></p>'),
$out->raw(sprintf(_m('<p><a href="%1s">change your email settings for %2s</a></p>'),
common_local_url('emailsettings'),
common_config('site', 'name')));
......@@ -204,7 +204,7 @@ class UserEmailSummaryHandler extends QueueHandler
// FIXME: do something for people who don't like HTML email
mail_to_user($user, _('Updates from your network'), $body,
mail_to_user($user, _m('Updates from your network'), $body,
array('Content-Type' => 'text/html; charset=UTF-8'));
if (empty($ess)) {
......
......@@ -365,7 +365,7 @@ class EventPlugin extends MicroappPlugin
$out->elementStart('div', 'event-times'); // VEVENT/EVENT-TIMES IN
$out->element('strong', null, _('Time:'));
$out->element('strong', null, _m('Time:'));
$out->element('abbr', array('class' => 'dtstart',
'title' => common_date_iso8601($event->start_time)),
......@@ -385,14 +385,14 @@ class EventPlugin extends MicroappPlugin
if (!empty($event->location)) {
$out->elementStart('div', 'event-location');
$out->element('strong', null, _('Location: '));
$out->element('strong', null, _m('Location:'));
$out->element('span', 'location', $event->location);
$out->elementEnd('div');
}
if (!empty($event->description)) {
$out->elementStart('div', 'event-description');
$out->element('strong', null, _('Description: '));
$out->element('strong', null, _m('Description:'));
$out->element('span', 'description', $event->description);
$out->elementEnd('div');
}
......@@ -400,9 +400,11 @@ class EventPlugin extends MicroappPlugin
$rsvps = $event->getRSVPs();
$out->elementStart('div', 'event-rsvps');
$out->element('strong', null, _('Attending: '));
$out->element('strong', null, _m('Attending:'));
$out->element('span', 'event-rsvps',
sprintf(_('Yes: %d No: %d Maybe: %d'),
// TRANS: RSVP counts.
// TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
sprintf(_m('Yes: %1$d No: %2$d Maybe: %3$d'),
count($rsvps[RSVP::POSITIVE]),
count($rsvps[RSVP::NEGATIVE]),
count($rsvps[RSVP::POSSIBLE])));
......
......@@ -122,7 +122,7 @@ class Happening extends Managed_DataObject
if (array_key_exists('uri', $options)) {
$other = Happening::staticGet('uri', $options['uri']);
if (!empty($other)) {
throw new ClientException(_('Event already exists.'));
throw new ClientException(_m('Event already exists.'));
}
}
......@@ -154,19 +154,21 @@ class Happening extends Managed_DataObject
// XXX: does this get truncated?
$content = sprintf(_('"%s" %s - %s (%s): %s'),
// TRANS: Event description. %1$s is a title, %2$s is start time, %3$s is end time,
// TRANS: %4$s is location, %5$s is a description.
$content = sprintf(_m('"%1$s" %2$s - %3$s (%4$s): %5$s'),
$title,
common_exact_date($ev->start_time),
common_exact_date($ev->end_time),
$location,
$description);
$rendered = sprintf(_('<span class="vevent">'.
'<span class="summary">%s</span> '.
'<abbr class="dtstart" title="%s">%s</a> - '.
'<abbr class="dtend" title="%s">%s</a> '.
'(<span class="location">%s</span>): '.
'<span class="description">%s</span> '.
$rendered = sprintf(_m('<span class="vevent">'.
'<span class="summary">%1$s</span> '.
'<abbr class="dtstart" title="%2$s">%3$s</a> - '.
'<abbr class="dtend" title="%4$s">%5$s</a> '.
'(<span class="location">%6$s</span>): '.
'<span class="description">%7$s</span> '.
'</span>'),
htmlspecialchars($title),
htmlspecialchars(common_date_iso8601($ev->start_time)),
......
......@@ -143,7 +143,7 @@ class RSVP extends Managed_DataObject
if (array_key_exists('uri', $options)) {
$other = RSVP::staticGet('uri', $options['uri']);
if (!empty($other)) {
throw new ClientException(_('RSVP already exists.'));
throw new ClientException(_m('RSVP already exists.'));
}
}
......@@ -151,7 +151,7 @@ class RSVP extends Managed_DataObject
'event_id' => $event->id));
if (!empty($other)) {
throw new ClientException(_('RSVP already exists.'));
throw new ClientException(_m('RSVP already exists.'));
}
$rsvp = new RSVP();
......@@ -316,13 +316,13 @@ class RSVP extends Managed_DataObject
switch ($response) {
case 'Y':
$fmt = _("<span class='automatic event-rsvp'><a href='%1s'>%2s</a> is attending <a href='%3s'>%4s</a>.</span>");
$fmt = _m("<span class='automatic event-rsvp'><a href='%1s'>%2s</a> is attending <a href='%3s'>%4s</a>.</span>");
break;
case 'N':
$fmt = _("<span class='automatic event-rsvp'><a href='%1s'>%2s</a> is not attending <a href='%3s'>%4s</a>.</span>");
$fmt = _m("<span class='automatic event-rsvp'><a href='%1s'>%2s</a> is not attending <a href='%3s'>%4s</a>.</span>");
break;
case '?':
$fmt = _("<span class='automatic event-rsvp'><a href='%1s'>%2s</a> might attend <a href='%3s'>%4s</a>.</span>");
$fmt = _m("<span class='automatic event-rsvp'><a href='%1s'>%2s</a> might attend <a href='%3s'>%4s</a>.</span>");
break;
default:
throw new Exception("Unknown response code {$response}");
......@@ -331,7 +331,7 @@ class RSVP extends Managed_DataObject
if (empty($event)) {
$eventUrl = '#';
$eventTitle = _('an unknown event');
$eventTitle = _m('an unknown event');
} else {
$notice = $event->getNotice();
$eventUrl = $notice->bestUrl();
......@@ -351,13 +351,13 @@ class RSVP extends Managed_DataObject
switch ($response) {
case 'Y':
$fmt = _("%1s is attending %2s.");
$fmt = _m("%1s is attending %2s.");
break;
case 'N':
$fmt = _("%1s is not attending %2s.");
$fmt = _m("%1s is not attending %2s.");
break;
case '?':
$fmt = _("%1s might attend %2s.>");
$fmt = _m("%1s might attend %2s.>");
break;
default:
throw new Exception("Unknown response code {$response}");
......@@ -365,7 +365,7 @@ class RSVP extends Managed_DataObject
}
if (empty($event)) {
$eventTitle = _('an unknown event');
$eventTitle = _m('an unknown event');
} else {
$notice = $event->getNotice();
$eventTitle = $event->title;
......
......@@ -58,7 +58,7 @@ class CancelrsvpAction extends Action
function title()
{
return _('Cancel RSVP');
return _m('Cancel RSVP');
}
/**
......@@ -79,25 +79,25 @@ class CancelrsvpAction extends Action
$rsvpId = $this->trimmed('rsvp');
if (empty($rsvpId)) {
throw new ClientException(_('No such rsvp.'));
throw new ClientException(_m('No such RSVP.'));
}
$this->rsvp = RSVP::staticGet('id', $rsvpId);
if (empty($this->rsvp)) {
throw new ClientException(_('No such rsvp.'));
throw new ClientException(_m('No such RSVP.'));
}
$this->event = Happening::staticGet('id', $this->rsvp->event_id);
if (empty($this->event)) {
throw new ClientException(_('No such event.'));
throw new ClientException(_m('No such event.'));
}
$this->user = common_current_user();
if (empty($this->user)) {
throw new ClientException(_('You must be logged in to RSVP for an event.'));
throw new ClientException(_m('You must be logged in to RSVP for an event.'));
}
return true;
......@@ -154,7 +154,7 @@ class CancelrsvpAction extends Action
$this->elementStart('html');
$this->elementStart('head');
// TRANS: Page title after sending a notice.
$this->element('title', null, _('Event saved'));
$this->element('title', null, _m('Event saved'));
$this->elementEnd('head');
$this->elementStart('body');
$this->elementStart('body');
......
......@@ -102,13 +102,13 @@ class CancelRSVPForm extends Form
switch (RSVP::verbFor($this->rsvp->response)) {
case RSVP::POSITIVE:
$this->out->text(_('You will attend this event.'));
$this->out->text(_m('You will attend this event.'));
break;
case RSVP::NEGATIVE:
$this->out->text(_('You will not attend this event.'));
$this->out->text(_m('You will not attend this event.'));
break;
case RSVP::POSSIBLE:
$this->out->text(_('You might attend this event.'));
$this->out->text(_m('You might attend this event.'));
break;
}
......
......@@ -93,58 +93,58 @@ class EventForm extends Form
$this->li();
$this->out->input('title',
_('Title'),
_m('LABEL','Title'),
null,
_('Title of the event'));
_m('Title of the event'));
$this->unli();
$this->li();
$this->out->input('startdate',
_('Start date'),
_m('LABEL','Start date'),
null,
_('Date the event starts'));
_m('Date the event starts'));