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 c0fa5014ed507a1b728d30edc2b48e0c0a94e9b3..f85d9f887b98e3b5d1ecb7d1650d002f5ff70cd1 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -25,9 +25,7 @@ require_once(INSTALLDIR.'/lib/jabber.php');
 class ImsettingsAction extends SettingsAction {
 
        function get_instructions() {
-               return _('You can send and receive notices through '.
-                               'Jabber/GTalk [instant messages](%%doc.im%%). Configure '.
-                               'your address and settings below.');
+               return _('You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below.');
        }
 
        function show_form($msg=NULL, $success=false) {
@@ -54,19 +52,15 @@ 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'));
                        } else {
                                common_input('jabber', _('IM Address'),
                                                        ($this->arg('jabber')) ? $this->arg('jabber') : NULL,
-                                                sprintf(_('Jabber or GTalk address, like "UserName@example.org". ' .
-                                                   'First, make sure to add %s' .
-                              ' to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
+                                                sprintf(_('Jabber or GTalk address, like "UserName@example.org". First, make sure to add %s to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
                                common_submit('add', _('Add'));
                        }
                }
@@ -132,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;
                }
 
@@ -181,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;
                }
 
@@ -191,11 +185,7 @@ class ImsettingsAction extends SettingsAction {
                                                                   $jabber);
                }
 
-               # XXX: I18N
-
-               $msg = 'A confirmation code was sent to the IM address you added. ' .
-                       ' You must approve ' . jabber_daemon_address() .
-                       ' for sending messages to you.';
+               $msg = sprintf(_('A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you.'), jabber_daemon_address());
 
                $this->show_form($msg, TRUE);
        }
@@ -241,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');