utility for getting avatar or default avatar

[quix0rs-gnu-social.git] / actions / imsettings.php

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 8b30d418cc368dbecf4297a812fbf3dc87db103d..f85d9f887b98e3b5d1ecb7d1650d002f5ff70cd1 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -52,10 +52,8 @@ class ImsettingsAction extends SettingsAction {
                                common_element_start('p');
                                common_element('span', 'address unconfirmed', $confirm->address);
                                common_element('span', 'input_instructions',
-                                             sprintf(_('Awaiting confirmation on this address. Check your ' .
-                                               'Jabber/GTalk account for a message with further ' .
-                                               'instructions. (Did you add %s to your buddy list?)',
-                                 jabber_daemon_address())));
+                                                          sprintf(_('Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)'),
+                                 jabber_daemon_address()));
                                common_hidden('jabber', $confirm->address);
                                common_element_end('p');
                                common_submit('cancel', _('Cancel'));
@@ -128,7 +126,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 +175,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 +231,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');