X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fimsettings.php;h=92fff45a7db6d27f506be1f50520afb717b685af;hb=fb4b004435403dd0d4126a0c11c9fa5c557e9dba;hp=f45848a13de4f46de024655ed9437b3cd6a5d6c5;hpb=e109b2592f86dec977922bc4474dde36aed109cb;p=quix0rs-gnu-social.git

diff --git a/actions/imsettings.php b/actions/imsettings.php
index f45848a13d..92fff45a7d 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -67,7 +67,7 @@ class ImsettingsAction extends SettingsAction
         // TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
         // TRANS: the order and formatting of link text and link should remain unchanged.
         return _('You can send and receive notices through '.
-                 'instant messaging [instant messages](%%doc.im%%). '.
+                 '[instant messaging](%%doc.im%%). '.
                  'Configure your addresses and settings below.');
     }
 
@@ -111,8 +111,8 @@ class ImsettingsAction extends SettingsAction
             if ($user_im_prefs = User_im_prefs::pkeyGet( array('transport' => $transport, 'user_id' => $user->id) )) {
                 $user_im_prefs_by_transport[$transport] = $user_im_prefs;
                 $this->element('p', 'form_confirmed', $user_im_prefs->screenname);
-                // TRANS: Form note in IM settings form.
                 $this->element('p', 'form_note',
+                               // TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
                                sprintf(_('Current confirmed %s address.'),$transport_info['display']));
                 $this->hidden('screenname', $user_im_prefs->screenname);
                 // TRANS: Button label to remove a confirmed IM address.
@@ -124,11 +124,11 @@ class ImsettingsAction extends SettingsAction
                     // TRANS: Form note in IM settings form.
                     $this->element('p', 'form_note',
                                    // TRANS: Form note in IM settings form.
-                                   // TRANS: %s is the IM address set for the site.
+                                   // TRANS: %s is the IM service name, %2$s is the IM address set.
                                    sprintf(_('Awaiting confirmation on this address. '.
-                                             'Check your %s account for a '.
+                                             'Check your %1$s account for a '.
                                              'message with further instructions. '.
-                                             '(Did you add %s to your buddy list?)'),
+                                             '(Did you add %2$s to your buddy list?)'),
                                              $transport_info['display'],
                                              $transport_info['daemonScreenname']));
                     $this->hidden('screenname', $confirm->address);
@@ -137,8 +137,10 @@ class ImsettingsAction extends SettingsAction
                 } else {
                     $this->elementStart('ul', 'form_data');
                     $this->elementStart('li');
+                    // TRANS: Field label for IM address.
                     $this->input('screenname', _('IM address'),
                                  ($this->arg('screenname')) ? $this->arg('screenname') : null,
+                                 // TRANS: Field title for IM address. %s is the IM service name.
                                  sprintf(_('%s screenname.'),
                                          $transport_info['display']));
                     $this->elementEnd('li');
@@ -238,6 +240,7 @@ class ImsettingsAction extends SettingsAction
         // CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->showForm(_('There was a problem with your session token. '.
                               'Try again, please.'));
             return;
@@ -288,8 +291,7 @@ class ImsettingsAction extends SettingsAction
                 if ($result === false) {
                     common_log_db_error($user, 'UPDATE', __FILE__);
                     // TRANS: Server error thrown on database error updating IM preferences.
-                    $this->serverError(_('Couldn\'t update IM preferences.'));
-                    return;
+                    $this->serverError(_('Could not update IM preferences.'));
                 }
             }while($user_im_prefs->fetch());
         }
@@ -322,6 +324,7 @@ class ImsettingsAction extends SettingsAction
         }
 
         if (!$transport) {
+            // TRANS: Form validation error when no transport is available setting an IM address.
             $this->showForm(_('No transport.'));
             return;
         }
@@ -330,14 +333,14 @@ class ImsettingsAction extends SettingsAction
 
         if (!$screenname) {
             // TRANS: Message given saving IM address that cannot be normalised.
-            $this->showForm(_('Cannot normalize that screenname'));
+            $this->showForm(_('Cannot normalize that screenname.'));
             return;
         }
         $valid = false;
         Event::handle('ValidateImScreenname', array($transport, $screenname, &$valid));
         if (!$valid) {
             // TRANS: Message given saving IM address that not valid.
-            $this->showForm(_('Not a valid screenname'));
+            $this->showForm(_('Not a valid screenname.'));
             return;
         } else if ($this->screennameExists($transport, $screenname)) {
             // TRANS: Message given saving IM address that is already set for another user.
@@ -360,7 +363,6 @@ class ImsettingsAction extends SettingsAction
             common_log_db_error($confirm, 'INSERT', __FILE__);
             // TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
             $this->serverError(_('Could not insert confirmation code.'));
-            return;
         }
 
         Event::handle('SendImConfirmationCode', array($transport, $screenname, $confirm->code, $user));
@@ -402,8 +404,7 @@ class ImsettingsAction extends SettingsAction
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
             // TRANS: Server error thrown on database error canceling IM address confirmation.
-            $this->serverError(_('Couldn\'t delete confirmation.'));
-            return;
+            $this->serverError(_('Could not delete confirmation.'));
         }
 
         // TRANS: Message given after successfully canceling IM address confirmation.
@@ -440,9 +441,7 @@ class ImsettingsAction extends SettingsAction
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error removing a registered IM address.
-            $this->serverError(_('Couldn\'t update user im prefs.'));
-            $this->serverError(_('Couldn\'t update user.'));
-            return;
+            $this->serverError(_('Could not update user IM preferences.'));
         }
 
         // XXX: unsubscribe to the old address