We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit b104da04 authored by Mike Cochrane's avatar Mike Cochrane

Colapse a lot of strings to make like easier for translators and more consisitant for users

darcs-hash:20080713053748-533db-1cdb0cf3a9e4102eb139b74a7a9d4f97dadb20b8.gz
parent 834c21b2
......@@ -31,14 +31,14 @@ class AllAction extends StreamAction {
$user = User::staticGet('nickname', $nickname);
if (!$user) {
$this->client_error(sprintf(_('No such user: %s'), $nickname));
$this->client_error(_('No such user.'));
return;
}
$profile = $user->getProfile();
if (!$profile) {
common_server_error(_('User record exists without profile.'));
common_server_error(_('User has no profile.'));
return;
}
......
......@@ -32,7 +32,7 @@ class AllrssAction extends Rss10Action {
$this->user = User::staticGet('nickname', $nickname);
if (!$this->user) {
common_user_error(_('No such nickname.'));
common_user_error(_('No such user.'));
return false;
} else {
return true;
......
......@@ -37,7 +37,7 @@ class AvatarbynicknameAction extends Action {
$this->client_error(_('Invalid size.'));
return;
}
$user = User::staticGet('nickname', $nickname);
if (!$user) {
$this->client_error(_('No such user.'));
......@@ -45,7 +45,7 @@ class AvatarbynicknameAction extends Action {
}
$profile = $user->getProfile();
if (!$profile) {
$this->client_error(_('No such profile.'));
$this->client_error(_('User has no profile.'));
return;
}
if ($size == 'original') {
......@@ -53,7 +53,7 @@ class AvatarbynicknameAction extends Action {
} else {
$avatar = $profile->getAvatar($size+0);
}
if ($avatar) {
$url = $avatar->url;
} else {
......
......@@ -162,7 +162,7 @@ class FinishopenidloginAction extends Action {
if (!Validate::string($nickname, array('min_length' => 1,
'max_length' => 64,
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
$this->show_form(_('Nickname must have only letters and numbers and no spaces.'));
$this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.'));
return;
}
......
......@@ -33,14 +33,14 @@ class FoafAction extends Action {
$user = User::staticGet('nickname', $nickname);
if (!$user) {
common_user_error(_('No such user'), 404);
common_user_error(_('No such user.'), 404);
return;
}
$profile = $user->getProfile();
if (!$profile) {
common_server_error(_('User has no profile'), 500);
common_server_error(_('User has no profile.'), 500);
return;
}
......
......@@ -128,7 +128,7 @@ class ImsettingsAction extends SettingsAction {
if ($result === FALSE) {
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_('Couldnt update user.'));
common_server_error(_('Couldn\'t update user.'));
return;
}
......@@ -177,7 +177,7 @@ class ImsettingsAction extends SettingsAction {
if ($result === FALSE) {
common_log_db_error($confirm, 'INSERT', __FILE__);
common_server_error(_('Couldnt insert confirmation code.'));
common_server_error(_('Couldn\'t insert confirmation code.'));
return;
}
......@@ -233,7 +233,7 @@ class ImsettingsAction extends SettingsAction {
$result = $user->updateKeys($original);
if (!$result) {
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_('Couldnt update user.'));
common_server_error(_('Couldn\'t update user.'));
return;
}
$user->query('COMMIT');
......
......@@ -58,7 +58,7 @@ class PasswordAction extends SettingsAction {
$confirm = $this->arg('confirm');
if (0 != strcmp($newpassword, $confirm)) {
$this->show_form(_('Passwords don\'t match'));
$this->show_form(_('Passwords don\'t match.'));
return;
}
......@@ -86,6 +86,6 @@ class PasswordAction extends SettingsAction {
return;
}
$this->show_form(_('Password saved'), true);
$this->show_form(_('Password saved.'), true);
}
}
......@@ -77,7 +77,7 @@ class ProfilesettingsAction extends SettingsAction {
} else if (!Validate::string($nickname, array('min_length' => 1,
'max_length' => 64,
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
$this->show_form(_('Nickname must have only letters and numbers and no spaces.'));
$this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.'));
return;
} else if (!User::allowed_nickname($nickname)) {
$this->show_form(_('Not a valid nickname.'));
......@@ -87,7 +87,7 @@ class ProfilesettingsAction extends SettingsAction {
$this->show_form(_('Homepage is not a valid URL.'));
return;
} else if (!is_null($fullname) && strlen($fullname) > 255) {
$this->show_form(_('Fullname is too long (max 255 chars).'));
$this->show_form(_('Full name is too long (max 255 chars).'));
return;
} else if (!is_null($bio) && strlen($bio) > 140) {
$this->show_form(_('Bio is too long (max 140 chars).'));
......@@ -96,7 +96,7 @@ class ProfilesettingsAction extends SettingsAction {
$this->show_form(_('Location is too long (max 255 chars).'));
return;
} else if ($this->nickname_exists($nickname)) {
$this->show_form(_('Nickname already exists.'));
$this->show_form(_('Nickname already in use. Try another one.'));
return;
} else if ($this->email_exists($email)) {
$this->show_form(_('Email address already exists.'));
......@@ -120,7 +120,7 @@ class ProfilesettingsAction extends SettingsAction {
if ($result === FALSE) {
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_('Couldnt update user.'));
common_server_error(_('Couldn\'t update user.'));
return;
}
}
......@@ -143,7 +143,7 @@ class ProfilesettingsAction extends SettingsAction {
if (!$result) {
common_log_db_error($confirm, 'INSERT', __FILE__);
common_server_error(_('Couldnt confirm email.'));
common_server_error(_('Couldn\'t confirm email.'));
return FALSE;
}
......@@ -172,7 +172,7 @@ class ProfilesettingsAction extends SettingsAction {
if (!$result) {
common_log_db_error($profile, 'UPDATE', __FILE__);
common_server_error(_('Couldnt save profile.'));
common_server_error(_('Couldn\'t save profile.'));
return;
}
......
......@@ -36,7 +36,7 @@ class RecoverpasswordAction extends Action {
} else if ($this->arg('reset')) {
$this->reset_password();
} else {
$this->client_error(_('Unexpected form.'));
$this->client_error(_('Unexpected form submission.'));
}
} else {
if ($this->trimmed('code')) {
......
......@@ -56,7 +56,7 @@ class RegisterAction extends Action {
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
$this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.'));
} else if ($this->nickname_exists($nickname)) {
$this->show_form(_('Nickname already exists.'));
$this->show_form(_('Nickname already in use. Try another one.'));
} else if (!User::allowed_nickname($nickname)) {
$this->show_form(_('Not a valid nickname.'));
} else if ($this->email_exists($email)) {
......
......@@ -81,14 +81,14 @@ class RemotesubscribeAction extends Action {
$user = $this->get_user();
if (!$user) {
$this->show_form(_('No such user!'));
$this->show_form(_('No such user.'));
return;
}
$profile = $this->trimmed('profile_url');
if (!$profile) {
$this->show_form(_('No such user!'));
$this->show_form(_('No such user.'));
return;
}
......
......@@ -38,7 +38,7 @@ class RepliesAction extends StreamAction {
$profile = $user->getProfile();
if (!$profile) {
common_server_error(_('User record exists without profile.'));
common_server_error(_('User has no profile.'));
return;
}
......
......@@ -32,7 +32,7 @@ class RepliesrssAction extends Rss10Action {
$this->user = User::staticGet('nickname', $nickname);
if (!$this->user) {
common_user_error(_('No such nickname.'));
common_user_error(_('No such user.'));
return false;
} else {
return true;
......
......@@ -41,7 +41,7 @@ class ShowstreamAction extends StreamAction {
$profile = $user->getProfile();
if (!$profile) {
common_server_error(_('User record exists without profile.'));
common_server_error(_('User has no profile.'));
return;
}
......
......@@ -73,7 +73,7 @@ class UpdateprofileAction extends Action {
if ($nickname && !Validate::string($nickname, array('min_length' => 1,
'max_length' => 64,
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
$this->client_error(_('Nickname must have only letters and numbers and no spaces.'));
$this->client_error(_('Nickname must have only lowercase letters and numbers and no spaces.'));
return false;
}
$license = $req->get_parameter('omb_listenee_license');
......@@ -89,7 +89,7 @@ class UpdateprofileAction extends Action {
# optional stuff
$fullname = $req->get_parameter('omb_listenee_fullname');
if ($fullname && strlen($fullname) > 255) {
$this->client_error(sprintf(_("Full name '%s' too long."), $fullname));
$this->client_error(_("Full name is too long (max 255 chars)."));
return false;
}
$homepage = $req->get_parameter('omb_listenee_homepage');
......@@ -99,12 +99,12 @@ class UpdateprofileAction extends Action {
}
$bio = $req->get_parameter('omb_listenee_bio');
if ($bio && strlen($bio) > 140) {
$this->client_error(sprintf(_("Bio too long '%s'"), $bio));
$this->client_error(_("Bio is too long (max 140 chars)."));
return false;
}
$location = $req->get_parameter('omb_listenee_location');
if ($location && strlen($location) > 255) {
$this->client_error(sprintf(_("Location too long '%s'"), $location));
$this->client_error(_("Location is too long (max 255 chars)."));
return false;
}
$avatar = $req->get_parameter('omb_listenee_avatar');
......
......@@ -32,7 +32,7 @@ class UserrssAction extends Rss10Action {
$this->user = User::staticGet('nickname', $nickname);
if (!$this->user) {
common_user_error(_('No such nickname.'));
common_user_error(_('No such user.'));
return false;
} else {
return true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment