diff options
Diffstat (limited to 'actions')
72 files changed, 126 insertions, 126 deletions
diff --git a/actions/all.php b/actions/all.php index 452803d8a..efa4521e2 100644 --- a/actions/all.php +++ b/actions/all.php @@ -81,7 +81,7 @@ class AllAction extends ProfileAction function title() { if ($this->page > 1) { - return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page); + return sprintf(_("%1$s and friends, page %2$d"), $this->user->nickname, $this->page); } else { return sprintf(_("%s and friends"), $this->user->nickname); } @@ -131,7 +131,7 @@ class AllAction extends ProfileAction if ($this->user->id === $current_user->id) { $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.'); } else { - $message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); + $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); } } else { $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname); diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php index 5b3f412ad..5fbc46518 100644 --- a/actions/apidirectmessage.php +++ b/actions/apidirectmessage.php @@ -153,7 +153,7 @@ class ApiDirectMessageAction extends ApiAuthAction $this->showJsonDirectMessages(); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php index 436739770..3618f9401 100644 --- a/actions/apifavoritecreate.php +++ b/actions/apifavoritecreate.php @@ -96,7 +96,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); @@ -116,7 +116,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction if ($this->user->hasFave($this->notice)) { $this->clientError( - _('This status is already a favorite!'), + _('This status is already a favorite.'), 403, $this->format ); diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php index f131d1c7f..c4daf480e 100644 --- a/actions/apifavoritedestroy.php +++ b/actions/apifavoritedestroy.php @@ -97,7 +97,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); @@ -119,7 +119,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction if (!$fave->find(true)) { $this->clientError( - _('That status is not a favorite!'), + _('That status is not a favorite.'), 403, $this->favorite ); diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php index a824e734b..1de2cc32e 100644 --- a/actions/apifriendshipscreate.php +++ b/actions/apifriendshipscreate.php @@ -97,7 +97,7 @@ class ApiFriendshipsCreateAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php index 3d9b7e001..91c6fd032 100644 --- a/actions/apifriendshipsdestroy.php +++ b/actions/apifriendshipsdestroy.php @@ -97,7 +97,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); @@ -117,7 +117,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction if ($this->user->id == $this->other->id) { $this->clientError( - _("You cannot unfollow yourself!"), + _("You cannot unfollow yourself."), 403, $this->format ); diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php index 8fc436738..73ecc9249 100644 --- a/actions/apifriendshipsshow.php +++ b/actions/apifriendshipsshow.php @@ -126,7 +126,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction parent::handle($args); if (!in_array($this->format, array('xml', 'json'))) { - $this->clientError(_('API method not found!'), 404); + $this->clientError(_('API method not found.'), 404); return; } diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php index 8827d1c5c..028d76a78 100644 --- a/actions/apigroupcreate.php +++ b/actions/apigroupcreate.php @@ -133,7 +133,7 @@ class ApiGroupCreateAction extends ApiAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php index 08348e97b..69ead0b53 100644 --- a/actions/apigroupismember.php +++ b/actions/apigroupismember.php @@ -111,7 +111,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 400, $this->format ); diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php index b531d9501..3309d63e7 100644 --- a/actions/apigroupjoin.php +++ b/actions/apigroupjoin.php @@ -135,7 +135,7 @@ class ApiGroupJoinAction extends ApiAuthAction common_log_db_error($member, 'INSERT', __FILE__); $this->serverError( sprintf( - _('Could not join user %s to group %s.'), + _('Could not join user %1$s to group %2$s.'), $this->user->nickname, $this->group->nickname ) @@ -152,7 +152,7 @@ class ApiGroupJoinAction extends ApiAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php index 5627bfc14..6f8d40527 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.php @@ -121,7 +121,7 @@ class ApiGroupLeaveAction extends ApiAuthAction common_log_db_error($member, 'DELETE', __FILE__); $this->serverError( sprintf( - _('Could not remove user %s from group %s.'), + _('Could not remove user %1$s from group %2$s.'), $this->user->nickname, $this->group->nickname ) @@ -138,7 +138,7 @@ class ApiGroupLeaveAction extends ApiAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php index 7b05f8a96..66b67a030 100644 --- a/actions/apigrouplist.php +++ b/actions/apigrouplist.php @@ -100,7 +100,7 @@ class ApiGroupListAction extends ApiBareAuthAction array('nickname' => $this->user->nickname) ); $subtitle = sprintf( - _("Groups %s is a member of on %s."), + _("Groups %1$s is a member of on %2$s."), $this->user->nickname, $sitename ); @@ -129,7 +129,7 @@ class ApiGroupListAction extends ApiBareAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php index c597839a8..1921c1f19 100644 --- a/actions/apigrouplistall.php +++ b/actions/apigrouplistall.php @@ -117,7 +117,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php index dd2843161..3c7c8e883 100644 --- a/actions/apigroupmembership.php +++ b/actions/apigroupmembership.php @@ -103,7 +103,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php index aae4d249c..7aa49b1bf 100644 --- a/actions/apigroupshow.php +++ b/actions/apigroupshow.php @@ -102,7 +102,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction $this->showSingleJsonGroup($this->group); break; default: - $this->clientError(_('API method not found!'), 404, $this->format); + $this->clientError(_('API method not found.'), 404, $this->format); break; } diff --git a/actions/apihelptest.php b/actions/apihelptest.php index f2c459e6f..7b4017531 100644 --- a/actions/apihelptest.php +++ b/actions/apihelptest.php @@ -85,7 +85,7 @@ class ApiHelpTestAction extends ApiPrivateAuthAction $this->endDocument('json'); } else { $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php index 8dc8793b5..f7d52f020 100644 --- a/actions/apistatusesdestroy.php +++ b/actions/apistatusesdestroy.php @@ -99,7 +99,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction parent::handle($args); if (!in_array($this->format, array('xml', 'json'))) { - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); return; } diff --git a/actions/apistatusesretweets.php b/actions/apistatusesretweets.php index 2efd59b37..f7a3dd60a 100644 --- a/actions/apistatusesretweets.php +++ b/actions/apistatusesretweets.php @@ -109,7 +109,7 @@ class ApiStatusesRetweetsAction extends ApiAuthAction $this->showJsonTimeline($strm); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php index e26c009c4..0315d2953 100644 --- a/actions/apistatusesshow.php +++ b/actions/apistatusesshow.php @@ -105,7 +105,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction parent::handle($args); if (!in_array($this->format, array('xml', 'json'))) { - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); return; } diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php index ed1d151bf..ab96f2e5f 100644 --- a/actions/apistatusnetconfig.php +++ b/actions/apistatusnetconfig.php @@ -130,7 +130,7 @@ class ApiStatusnetConfigAction extends ApiAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php index bbf891a89..5109cd806 100644 --- a/actions/apistatusnetversion.php +++ b/actions/apistatusnetversion.php @@ -90,7 +90,7 @@ class ApiStatusnetVersionAction extends ApiPrivateAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php index 2c691bb84..0ba324057 100644 --- a/actions/apisubscriptions.php +++ b/actions/apisubscriptions.php @@ -108,7 +108,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction parent::handle($args); if (!in_array($this->format, array('xml', 'json'))) { - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); return; } diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index 008e04212..1027d97d4 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -105,7 +105,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction $sitename = common_config('site', 'name'); $title = sprintf( - _('%s / Favorites from %s'), + _('%1$s / Favorites from %2$s'), $sitename, $this->user->nickname ); @@ -117,7 +117,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction array('nickname' => $this->user->nickname) ); $subtitle = sprintf( - _('%s updates favorited by %s / %s.'), + _('%1$s updates favorited by %2$s / %2$s.'), $sitename, $profile->getBestName(), $this->user->nickname @@ -143,7 +143,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index 9ec7447e6..ef58b103c 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -153,7 +153,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index 22c577f39..af414c680 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -147,7 +147,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php index 5f5ea37b1..828eae6cf 100644 --- a/actions/apitimelinehome.php +++ b/actions/apitimelinehome.php @@ -153,7 +153,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php index 19f40aebc..9dc2162cc 100644 --- a/actions/apitimelinementions.php +++ b/actions/apitimelinementions.php @@ -148,7 +148,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php index 633f3c36e..3f4a46c0f 100644 --- a/actions/apitimelinepublic.php +++ b/actions/apitimelinepublic.php @@ -128,7 +128,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelineretweetedbyme.php b/actions/apitimelineretweetedbyme.php index 1e65678ad..88652c3fd 100644 --- a/actions/apitimelineretweetedbyme.php +++ b/actions/apitimelineretweetedbyme.php @@ -119,7 +119,7 @@ class ApiTimelineRetweetedByMeAction extends ApiAuthAction break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php index 681b0b9e9..113ab96d2 100644 --- a/actions/apitimelineretweetedtome.php +++ b/actions/apitimelineretweetedtome.php @@ -118,7 +118,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php index 479bff431..6ca2c779c 100644 --- a/actions/apitimelineretweetsofme.php +++ b/actions/apitimelineretweetsofme.php @@ -119,7 +119,7 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php index 1a50520f4..1427d23b6 100644 --- a/actions/apitimelinetag.php +++ b/actions/apitimelinetag.php @@ -138,7 +138,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 14c62a52e..830b16941 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -162,7 +162,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } diff --git a/actions/apiusershow.php b/actions/apiusershow.php index aa7aec5a4..a7fe0dcc1 100644 --- a/actions/apiusershow.php +++ b/actions/apiusershow.php @@ -98,7 +98,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction } if (!in_array($this->format, array('xml', 'json'))) { - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); return; } diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php index ca4a711cb..0b4caf5bf 100644 --- a/actions/blockedfromgroup.php +++ b/actions/blockedfromgroup.php @@ -70,14 +70,14 @@ class BlockedfromgroupAction extends GroupDesignAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } $this->group = User_group::staticGet('nickname', $nickname); if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } @@ -90,7 +90,7 @@ class BlockedfromgroupAction extends GroupDesignAction return sprintf(_('%s blocked profiles'), $this->group->nickname); } else { - return sprintf(_('%s blocked profiles, page %d'), + return sprintf(_('%1$s blocked profiles, page %2$d'), $this->group->nickname, $this->page); } diff --git a/actions/deletenotice.php b/actions/deletenotice.php index ba8e86d0f..69cb1ebe8 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -155,7 +155,7 @@ class DeletenoticeAction extends Action if (!$token || $token != common_session_token()) { $this->showForm(_('There was a problem with your session token. ' . - ' Try again, please.')); + 'Try again, please.')); return; } diff --git a/actions/editgroup.php b/actions/editgroup.php index cf1608035..ad0b6e185 100644 --- a/actions/editgroup.php +++ b/actions/editgroup.php @@ -81,7 +81,7 @@ class EditgroupAction extends GroupDesignAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } @@ -93,14 +93,14 @@ class EditgroupAction extends GroupDesignAction } if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } $cur = common_current_user(); if (!$cur->isAdmin($this->group)) { - $this->clientError(_('You must be an admin to edit the group'), 403); + $this->clientError(_('You must be an admin to edit the group.'), 403); return false; } @@ -165,7 +165,7 @@ class EditgroupAction extends GroupDesignAction { $cur = common_current_user(); if (!$cur->isAdmin($this->group)) { - $this->clientError(_('You must be an admin to edit the group'), 403); + $this->clientError(_('You must be an admin to edit the group.'), 403); return; } diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 761aaa8f3..bfef2970d 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -57,7 +57,7 @@ class EmailsettingsAction extends AccountSettingsAction function title() { - return _('Email Settings'); + return _('Email settings'); } /** @@ -118,7 +118,7 @@ class EmailsettingsAction extends AccountSettingsAction } else { $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('email', _('Email Address'), + $this->input('email', _('Email address'), ($this->arg('email')) ? $this->arg('email') : null, _('Email address, like "UserName@example.org"')); $this->elementEnd('li'); @@ -328,7 +328,7 @@ class EmailsettingsAction extends AccountSettingsAction return; } if (!Validate::email($email, common_config('email', 'check_domain'))) { - $this->showForm(_('Not a valid email address')); + $this->showForm(_('Not a valid email address.')); return; } else if ($user->email == $email) { $this->showForm(_('That is already your email address.')); diff --git a/actions/groupblock.php b/actions/groupblock.php index faf18c6ad..ec673358e 100644 --- a/actions/groupblock.php +++ b/actions/groupblock.php @@ -159,7 +159,7 @@ class GroupblockAction extends Action $this->hidden('token', common_session_token()); $this->element('legend', _('Block user')); $this->element('p', null, - sprintf(_('Are you sure you want to block user "%s" from the group "%s"? '. + sprintf(_('Are you sure you want to block user "%1$s" from the group "%2$s"? '. 'They will be removed from the group, unable to post, and '. 'unable to subscribe to the group in the future.'), $this->profile->getBestName(), diff --git a/actions/groupbyid.php b/actions/groupbyid.php index f65bf511a..5af7109cb 100644 --- a/actions/groupbyid.php +++ b/actions/groupbyid.php @@ -71,7 +71,7 @@ class GroupbyidAction extends Action $id = $this->arg('id'); if (!$id) { - $this->clientError(_('No ID')); + $this->clientError(_('No ID.')); return false; } @@ -80,7 +80,7 @@ class GroupbyidAction extends Action $this->group = User_group::staticGet('id', $id); if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php index 1c998efe1..e290ba514 100644 --- a/actions/groupdesignsettings.php +++ b/actions/groupdesignsettings.php @@ -81,7 +81,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } @@ -94,14 +94,14 @@ class GroupDesignSettingsAction extends DesignSettingsAction } if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } $cur = common_current_user(); if (!$cur->isAdmin($this->group)) { - $this->clientError(_('You must be an admin to edit the group'), 403); + $this->clientError(_('You must be an admin to edit the group.'), 403); return false; } @@ -284,7 +284,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction if (empty($id)) { common_log_db_error($id, 'INSERT', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); return; } @@ -294,7 +294,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction if (empty($result)) { common_log_db_error($original, 'UPDATE', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); $this->group->query('ROLLBACK'); return; } diff --git a/actions/grouplogo.php b/actions/grouplogo.php index a9dc7eb1d..f197aef33 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -83,7 +83,7 @@ class GrouplogoAction extends GroupDesignAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } @@ -96,14 +96,14 @@ class GrouplogoAction extends GroupDesignAction } if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } $cur = common_current_user(); if (!$cur->isAdmin($this->group)) { - $this->clientError(_('You must be an admin to edit the group'), 403); + $this->clientError(_('You must be an admin to edit the group.'), 403); return false; } @@ -175,7 +175,7 @@ class GrouplogoAction extends GroupDesignAction if (!$profile) { common_log_db_error($user, 'SELECT', __FILE__); - $this->serverError(_('User without matching profile')); + $this->serverError(_('User without matching profile.')); return; } diff --git a/actions/groupmembers.php b/actions/groupmembers.php index b326a0df7..0f47c268d 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -73,14 +73,14 @@ class GroupmembersAction extends GroupDesignAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } $this->group = User_group::staticGet('nickname', $nickname); if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } @@ -93,7 +93,7 @@ class GroupmembersAction extends GroupDesignAction return sprintf(_('%s group members'), $this->group->nickname); } else { - return sprintf(_('%s group members, page %d'), + return sprintf(_('%1$s group members, page %2$d'), $this->group->nickname, $this->page); } diff --git a/actions/imsettings.php b/actions/imsettings.php index f57933b43..751c6117c 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -56,7 +56,7 @@ class ImsettingsAction extends ConnectSettingsAction function title() { - return _('IM Settings'); + return _('IM settings'); } /** @@ -121,7 +121,7 @@ class ImsettingsAction extends ConnectSettingsAction } else { $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('jabber', _('IM Address'), + $this->input('jabber', _('IM address'), ($this->arg('jabber')) ? $this->arg('jabber') : null, sprintf(_('Jabber or GTalk address, '. 'like "UserName@example.org". '. diff --git a/actions/inbox.php b/actions/inbox.php index 6cb7f9e15..f605cc9e8 100644 --- a/actions/inbox.php +++ b/actions/inbox.php @@ -56,7 +56,7 @@ class InboxAction extends MailboxAction function title() { if ($this->page > 1) { - return sprintf(_("Inbox for %s - page %d"), $this->user->nickname, + return sprintf(_("Inbox for %1$s - page %2$d"), $this->user->nickname, $this->page); } else { return sprintf(_("Inbox for %s"), $this->user->nickname); diff --git a/actions/invite.php b/actions/invite.php index 3015202e9..d0ed64ec9 100644 --- a/actions/invite.php +++ b/actions/invite.php @@ -128,7 +128,7 @@ class InviteAction extends CurrentUserDesignAction $this->element('p', null, _('You are already subscribed to these users:')); $this->elementStart('ul'); foreach ($this->already as $other) { - $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email)); + $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email)); } $this->elementEnd('ul'); } @@ -136,7 +136,7 @@ class InviteAction extends CurrentUserDesignAction $this->element('p', null, _('These people are already users and you were automatically subscribed to them:')); $this->elementStart('ul'); foreach ($this->subbed as $other) { - $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email)); + $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email)); } $this->elementEnd('ul'); } diff --git a/actions/joingroup.php b/actions/joingroup.php index bf69b2ad1..05e33e7cb 100644 --- a/actions/joingroup.php +++ b/actions/joingroup.php @@ -73,21 +73,21 @@ class JoingroupAction extends Action } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } $this->group = User_group::staticGet('nickname', $nickname); if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } $cur = common_current_user(); if ($cur->isMember($this->group)) { - $this->clientError(_('You are already a member of that group'), 403); + $this->clientError(_('You are already a member of that group.'), 403); return false; } @@ -125,14 +125,14 @@ class JoingroupAction extends Action if (!$result) { common_log_db_error($member, 'INSERT', __FILE__); - $this->serverError(sprintf(_('Could not join user %s to group %s'), + $this->serverError(sprintf(_('Could not join user %1$s to group %2$s.'), $cur->nickname, $this->group->nickname)); } if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); - $this->element('title', null, sprintf(_('%s joined group %s'), + $this->element('title', null, sprintf(_('%1$s joined group %2$s'), $cur->nickname, $this->group->nickname)); $this->elementEnd('head'); diff --git a/actions/leavegroup.php b/actions/leavegroup.php index 90c85e1a4..b0f973e1a 100644 --- a/actions/leavegroup.php +++ b/actions/leavegroup.php @@ -124,14 +124,14 @@ class LeavegroupAction extends Action if (!$result) { common_log_db_error($member, 'DELETE', __FILE__); - $this->serverError(sprintf(_('Could not remove user %s from group %s'), + $this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'), $cur->nickname, $this->group->nickname)); } if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); - $this->element('title', null, sprintf(_('%s left group %s'), + $this->element('title', null, sprintf(_('%1$s left group %2$s'), $cur->nickname, $this->group->nickname)); $this->elementEnd('head'); diff --git a/actions/makeadmin.php b/actions/makeadmin.php index 2dfddebc2..9ad7d6e7c 100644 --- a/actions/makeadmin.php +++ b/actions/makeadmin.php @@ -92,7 +92,7 @@ class MakeadminAction extends Action return false; } if ($this->profile->isAdmin($this->group)) { - $this->clientError(sprintf(_('%s is already an admin for group "%s".'), + $this->clientError(sprintf(_('%1$s is already an admin for group "%2$s".'), $this->profile->getBestName(), $this->group->getBestName()), 401); @@ -129,7 +129,7 @@ class MakeadminAction extends Action 'profile_id' => $this->profile->id)); if (empty($member)) { - $this->serverError(_('Can\'t get membership record for %s in group %s'), + $this->serverError(_('Can\'t get membership record for %1$s in group %2$s.'), $this->profile->getBestName(), $this->group->getBestName()); } @@ -142,7 +142,7 @@ class MakeadminAction extends Action if (!$result) { common_log_db_error($member, 'UPDATE', __FILE__); - $this->serverError(_('Can\'t make %s an admin for group %s'), + $this->serverError(_('Can\'t make %1$s an admin for group %2$s.'), $this->profile->getBestName(), $this->group->getBestName()); } diff --git a/actions/newmessage.php b/actions/newmessage.php index 350452091..25e58feab 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -182,7 +182,7 @@ class NewmessageAction extends Action $this->elementEnd('head'); $this->elementStart('body'); $this->element('p', array('id' => 'command_result'), - sprintf(_('Direct message to %s sent'), + sprintf(_('Direct message to %s sent.'), $this->other->nickname)); $this->elementEnd('body'); $this->elementEnd('html'); diff --git a/actions/noticesearch.php b/actions/noticesearch.php index 76c877ff2..d0673420d 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -88,7 +88,7 @@ class NoticesearchAction extends SearchAction return array(new Feed(Feed::RSS1, common_local_url('noticesearchrss', array('q' => $q)), - sprintf(_('Search results for "%s" on %s'), + sprintf(_('Search results for "%1$s" on %2$s'), $q, common_config('site', 'name')))); } diff --git a/actions/outbox.php b/actions/outbox.php index 537fad3ef..de30de018 100644 --- a/actions/outbox.php +++ b/actions/outbox.php @@ -55,7 +55,7 @@ class OutboxAction extends MailboxAction function title() { if ($this->page > 1) { - return sprintf(_("Outbox for %s - page %d"), + return sprintf(_("Outbox for %1$s - page %2$d"), $this->user->nickname, $page); } else { return sprintf(_("Outbox for %s"), $this->user->nickname); diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php index d39c7c449..3779fcfaa 100644 --- a/actions/pathsadminpanel.php +++ b/actions/pathsadminpanel.php @@ -305,7 +305,7 @@ class PathsAdminPanelForm extends AdminForm $this->unli(); $this->li(); - $this->input('sslserver', _('SSL Server'), + $this->input('sslserver', _('SSL server'), _('Server to direct SSL requests to'), 'site'); $this->unli(); $this->out->elementEnd('ul'); diff --git a/actions/peopletag.php b/actions/peopletag.php index 6dbbc9261..4ba1dc0f1 100644 --- a/actions/peopletag.php +++ b/actions/peopletag.php @@ -141,7 +141,7 @@ class PeopletagAction extends Action */ function title() { - return sprintf(_('Users self-tagged with %s - page %d'), + return sprintf(_('Users self-tagged with %1$s - page %2$d'), $this->tag, $this->page); } diff --git a/actions/postnotice.php b/actions/postnotice.php index c2e1c44ca..fb0670376 100644 --- a/actions/postnotice.php +++ b/actions/postnotice.php @@ -87,8 +87,8 @@ class PostnoticeAction extends Action $license = $_POST['omb_notice_license']; $site_license = common_config('license', 'url'); if ($license && !common_compatible_license($license, $site_license)) { - throw new Exception(sprintf(_('Notice license ‘%s’ is not ' . - 'compatible with site license ‘%s’.'), + throw new Exception(sprintf(_('Notice license ‘%1$s’ is not ' . + 'compatible with site license ‘%2$s’.'), $license, $site_license)); } } diff --git a/actions/register.php b/actions/register.php index 6339ea117..698137346 100644 --- a/actions/register.php +++ b/actions/register.php @@ -535,9 +535,9 @@ class RegisterAction extends Action array('nickname' => $nickname)); $this->elementStart('div', 'success'); - $instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. '. + $instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '. 'From here, you may want to...'. "\n\n" . - '* Go to [your profile](%s) '. + '* Go to [your profile](%2$s) '. 'and post your first message.' . "\n" . '* Add a [Jabber/GTalk address]'. '(%%%%action.imsettings%%%%) '. diff --git a/actions/replies.php b/actions/replies.php index a13b5a227..2e50f1c3c 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -124,7 +124,7 @@ class RepliesAction extends OwnerDesignAction if ($this->page == 1) { return sprintf(_("Replies to %s"), $this->user->nickname); } else { - return sprintf(_("Replies to %s, page %d"), + return sprintf(_("Replies to %1$s, page %2$d"), $this->user->nickname, $this->page); } @@ -195,14 +195,14 @@ class RepliesAction extends OwnerDesignAction function showEmptyListMessage() { - $message = sprintf(_('This is the timeline showing replies to %s but %s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' '; + $message = sprintf(_('This is the timeline showing replies to %1$s but %2$s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' '; if (common_logged_in()) { $current_user = common_current_user(); if ($this->user->id === $current_user->id) { $message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).'); } else { - $message .= sprintf(_('You can try to [nudge %s](../%s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); + $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); } } else { diff --git a/actions/showfavorites.php b/actions/showfavorites.php index b12fcdd9a..6023f0156 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -76,7 +76,7 @@ class ShowfavoritesAction extends OwnerDesignAction if ($this->page == 1) { return sprintf(_("%s's favorite notices"), $this->user->nickname); } else { - return sprintf(_("%s's favorite notices, page %d"), + return sprintf(_("%1$s's favorite notices, page %2$d"), $this->user->nickname, $this->page); } diff --git a/actions/showgroup.php b/actions/showgroup.php index a4af29391..06ae572e8 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -81,7 +81,7 @@ class ShowgroupAction extends GroupDesignAction if ($this->page == 1) { return sprintf(_("%s group"), $base); } else { - return sprintf(_("%s group, page %d"), + return sprintf(_("%1$s group, page %2$d"), $base, $this->page); } @@ -118,7 +118,7 @@ class ShowgroupAction extends GroupDesignAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } @@ -134,7 +134,7 @@ class ShowgroupAction extends GroupDesignAction common_redirect(common_local_url('groupbyid', $args), 301); return false; } else { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } } diff --git a/actions/showstream.php b/actions/showstream.php index 74b46cc95..75e10858d 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -76,7 +76,7 @@ class ShowstreamAction extends ProfileAction if ($this->page == 1) { return $base; } else { - return sprintf(_("%s, page %d"), + return sprintf(_("%1$s, page %2$d"), $base, $this->page); } @@ -119,7 +119,7 @@ class ShowstreamAction extends ProfileAction common_local_url('userrss', array('nickname' => $this->user->nickname, 'tag' => $this->tag)), - sprintf(_('Notice feed for %s tagged %s (RSS 1.0)'), + sprintf(_('Notice feed for %1$s tagged %2$s (RSS 1.0)'), $this->user->nickname, $this->tag))); } @@ -188,14 +188,14 @@ class ShowstreamAction extends ProfileAction function showEmptyListMessage() { - $message = sprintf(_('This is the timeline for %s but %s hasn\'t posted anything yet.'), $this->user->nickname, $this->user->nickname) . ' '; + $message = sprintf(_('This is the timeline for %1$s but %2$s hasn\'t posted anything yet.'), $this->user->nickname, $this->user->nickname) . ' '; if (common_logged_in()) { $current_user = common_current_user(); if ($this->user->id === $current_user->id) { $message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)'); } else { - $message .= sprintf(_('You can try to nudge %s or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, '@' . $this->user->nickname); + $message .= sprintf(_('You can try to nudge %1$s or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->user->nickname, '@' . $this->user->nickname); } } else { diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php index 5e29f4c19..dd388a18a 100644 --- a/actions/siteadminpanel.php +++ b/actions/siteadminpanel.php @@ -151,10 +151,10 @@ class SiteadminpanelAction extends AdminPanelAction $values['site']['email'] = common_canonical_email($values['site']['email']); if (empty($values['site']['email'])) { - $this->clientError(_('You must have a valid contact email address')); + $this->clientError(_('You must have a valid contact email address.')); } if (!Validate::email($values['site']['email'], common_config('email', 'check_domain'))) { - $this->clientError(_('Not a valid email address')); + $this->clientError(_('Not a valid email address.')); } // Validate timezone @@ -169,7 +169,7 @@ class SiteadminpanelAction extends AdminPanelAction if (!is_null($values['site']['language']) && !in_array($values['site']['language'], array_keys(get_nice_language_list()))) { - $this->clientError(sprintf(_('Unknown language "%s"'), $values['site']['language'])); + $this->clientError(sprintf(_('Unknown language "%s".'), $values['site']['language'])); } // Validate report URL diff --git a/actions/smssettings.php b/actions/smssettings.php index 672abcef8..751495d57 100644 --- a/actions/smssettings.php +++ b/actions/smssettings.php @@ -55,7 +55,7 @@ class SmssettingsAction extends ConnectSettingsAction function title() { - return _('SMS Settings'); + return _('SMS settings'); } /** @@ -135,7 +135,7 @@ class SmssettingsAction extends ConnectSettingsAction } else { $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('sms', _('SMS Phone number'), + $this->input('sms', _('SMS phone number'), ($this->arg('sms')) ? $this->arg('sms') : null, _('Phone number, no punctuation or spaces, '. 'with area code')); diff --git a/actions/subscribers.php b/actions/subscribers.php index cc9452820..cd3e2ee5b 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -49,7 +49,7 @@ class SubscribersAction extends GalleryAction if ($this->page == 1) { return sprintf(_('%s subscribers'), $this->user->nickname); } else { - return sprintf(_('%s subscribers, page %d'), + return sprintf(_('%1$s subscribers, page %2$d'), $this->user->nickname, $this->page); } diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 0dc5ee762..0ef31aa9f 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -51,7 +51,7 @@ class SubscriptionsAction extends GalleryAction if ($this->page == 1) { return sprintf(_('%s subscriptions'), $this->user->nickname); } else { - return sprintf(_('%s subscriptions, page %d'), + return sprintf(_('%1$s subscriptions, page %2$d'), $this->user->nickname, $this->page); } diff --git a/actions/tag.php b/actions/tag.php index 3a88c1229..12857236e 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -65,7 +65,7 @@ class TagAction extends Action if ($this->page == 1) { return sprintf(_("Notices tagged with %s"), $this->tag); } else { - return sprintf(_("Notices tagged with %s, page %d"), + return sprintf(_("Notices tagged with %1$s, page %2$d"), $this->tag, $this->page); } diff --git a/actions/tagother.php b/actions/tagother.php index e9e13b939..735d876da 100644 --- a/actions/tagother.php +++ b/actions/tagother.php @@ -163,8 +163,8 @@ class TagotherAction extends Action $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token.'. - ' Try again, please.')); + $this->showForm(_('There was a problem with your session token. '. + 'Try again, please.')); return; } diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php index 4a5863489..dbb4e4153 100644 --- a/actions/unsubscribe.php +++ b/actions/unsubscribe.php @@ -81,7 +81,7 @@ class UnsubscribeAction extends Action $other = Profile::staticGet('id', $other_id); if (!$other) { - $this->clientError(_('No profile with that id.')); + $this->clientError(_('No profile with that ID.')); return; } diff --git a/actions/updateprofile.php b/actions/updateprofile.php index 3cec9523c..e416a6fa9 100644 --- a/actions/updateprofile.php +++ b/actions/updateprofile.php @@ -59,8 +59,8 @@ class UpdateprofileAction extends Action $license = $_POST['omb_listenee_license']; $site_license = common_config('license', 'url'); if (!common_compatible_license($license, $site_license)) { - $this->clientError(sprintf(_('Listenee stream license ‘%s’ is not '. - 'compatible with site license ‘%s’.'), + $this->clientError(sprintf(_('Listenee stream license ‘%1$s’ is not '. + 'compatible with site license ‘%2$s’.'), $license, $site_license)); return false; } diff --git a/actions/userauthorization.php b/actions/userauthorization.php index dc59e6c94..4321f1302 100644 --- a/actions/userauthorization.php +++ b/actions/userauthorization.php @@ -293,7 +293,7 @@ class UserauthorizationAction extends Action $user = User::staticGet('uri', $listener); if (!$user) { - throw new Exception(sprintf(_('Listener URI ‘%s’ not found here'), + throw new Exception(sprintf(_('Listener URI ‘%s’ not found here.'), $listener)); } @@ -327,8 +327,8 @@ class UserauthorizationAction extends Action $license = $_GET['omb_listenee_license']; $site_license = common_config('license', 'url'); if (!common_compatible_license($license, $site_license)) { - throw new Exception(sprintf(_('Listenee stream license ‘%s’ is not ' . - 'compatible with site license ‘%s’.'), + throw new Exception(sprintf(_('Listenee stream license ‘%1$s’ is not ' . + 'compatible with site license ‘%2$s’.'), $license, $site_license)); } diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php index 31a097970..1cf878000 100644 --- a/actions/userdesignsettings.php +++ b/actions/userdesignsettings.php @@ -207,7 +207,7 @@ class UserDesignSettingsAction extends DesignSettingsAction if (empty($id)) { common_log_db_error($id, 'INSERT', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); return; } @@ -217,7 +217,7 @@ class UserDesignSettingsAction extends DesignSettingsAction if (empty($result)) { common_log_db_error($original, 'UPDATE', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); $user->query('ROLLBACK'); return; } @@ -260,7 +260,7 @@ class UserDesignSettingsAction extends DesignSettingsAction if (empty($id)) { common_log_db_error($id, 'INSERT', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); return; } @@ -270,7 +270,7 @@ class UserDesignSettingsAction extends DesignSettingsAction if (empty($result)) { common_log_db_error($original, 'UPDATE', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); $user->query('ROLLBACK'); return; } diff --git a/actions/usergroups.php b/actions/usergroups.php index 84e105153..504226143 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -61,7 +61,7 @@ class UsergroupsAction extends OwnerDesignAction if ($this->page == 1) { return sprintf(_("%s groups"), $this->user->nickname); } else { - return sprintf(_("%s groups, page %d"), + return sprintf(_("%1$s groups, page %2$d"), $this->user->nickname, $this->page); } diff --git a/actions/version.php b/actions/version.php index 2cf914296..c1f673c45 100644 --- a/actions/version.php +++ b/actions/version.php @@ -150,7 +150,7 @@ class VersionAction extends Action { $this->elementStart('p'); - $this->raw(sprintf(_('This site is powered by %s version %s, '. + $this->raw(sprintf(_('This site is powered by %1$s version %2$s, '. 'Copyright 2008-2010 StatusNet, Inc. '. 'and contributors.'), XMLStringer::estring('a', array('href' => 'http://status.net/'), |