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

darcs-hash:20080713053748-533db-1cdb0cf3a9e4102eb139b74a7a9d4f97dadb20b8.gz

diff --git a/actions/all.php b/actions/all.php
index 6ece53528a45bad582b0852f4c66a1ced4fc7ea7..ae21b81ee68ddc4aab5136cc91be9be1a3f4f641 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -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;
                }
 

diff --git a/actions/allrss.php b/actions/allrss.php
index e9280024c4886bf09d51b660695ae9970437534f..86d98284ebdded584d0f83d636e52606a6f0bb68 100644 (file)
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -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;

diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 98e82814b1703076b37179bc6018b28358acbdef..b33cababf72072aa0ced1dd4cda4a8c703877636 100644 (file)
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -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 {

diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 2f0020cedf9c170ac1f3abc182240c9e001349dc..89f4ef0bd2305f3e1a4e66f40ccce693c1a03fe8 100644 (file)
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -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;
                }
 

diff --git a/actions/foaf.php b/actions/foaf.php
index bcdc077ca5fac33c4f80f9c430f5b1b0d770d557..8de4c75028bb1f3855383eb5112d08ea18f49f25 100644 (file)
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -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;
                }
 

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 8b30d418cc368dbecf4297a812fbf3dc87db103d..368cd8b9e6b26dd3f2dfd48460bb927b5806f647 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -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');

diff --git a/actions/password.php b/actions/password.php
index 5acfd16200fc6bbfb37b38f119cb065e66bcc988..aef1accdcc62389d5f3f99af279aceaf8b6ce6ab 100644 (file)
--- a/actions/password.php
+++ b/actions/password.php
@@ -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);
        }
 }

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index c793457c78b45ea194604000b42fec8eab082bae..51085a39f15a88a6e9714b0826ab14c9cffe3a2e 100644 (file)
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -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;
                }
 

diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index feb2001639ec471aed8598d5e0a313801bacf2b1..9c34ff3d84149ea1a28f8bdb5dddd47337fbc321 100644 (file)
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -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')) {

diff --git a/actions/register.php b/actions/register.php
index 02677d241235986f5817c62a2223b7defbbe4299..b49b77f204133f366d0f1c74004851962a78deed 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -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)) {

diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index fca8a71ea22b765abc37df2bb51be78bbc40b26d..cb672e868c73e6be52e00052f93aeb77020c18b2 100644 (file)
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -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;
                }
 

diff --git a/actions/replies.php b/actions/replies.php
index ddbbddff8ec4ae27f1f517694d162507fe0cb5df..029141937f479e93ffdce243d79a2e1f0a43ca55 100644 (file)
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -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;
                }
 

diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 3157f0e1d1d81d570f4dec290b4a764946b1b5ad..e512cf2b8a95e08528ad292b9d5e22f3083ff1ec 100644 (file)
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -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;

diff --git a/actions/showstream.php b/actions/showstream.php
index bd64a7be4af48b813363ea2789270bfe2d01222b..88a8a90ca3716118304cc2569ce3fb5a3311e46e 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -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;
                }
 

diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index 2d523b3425e6670d122cc2a512e59eb1d74848ec..0889ad08283320f16e4785181f260227953e9d53 100644 (file)
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -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');

diff --git a/actions/userrss.php b/actions/userrss.php
index 445afeca57de0c0e4949ec4e69c8898310b2f67a..89fe0efb26d474d81d2e448d105ca09388bff645 100644 (file)
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -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;