Merge remote-tracking branch 'statusnet/master'

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

diff --git a/actions/smssettings.php b/actions/smssettings.php
index 228c7878d2ada462751a8389d9452e4ac5a011fd..d151ff45d6a7b61ed8e388df9ea442eb9d9d04eb 100644 (file)
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/connectsettingsaction.php';
-
 /**
  * Settings for SMS
  *
@@ -44,7 +42,8 @@ require_once INSTALLDIR.'/lib/connectsettingsaction.php';
  *
  * @see      SettingsAction
  */
-class SmssettingsAction extends ConnectSettingsAction
+
+class SmssettingsAction extends SettingsAction
 {
     /**
      * Title of the page
@@ -247,6 +246,7 @@ class SmssettingsAction extends ConnectSettingsAction
 
         $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;
@@ -410,7 +410,7 @@ class SmssettingsAction extends ConnectSettingsAction
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
             // TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-            $this->serverError(_('Could not delete email confirmation.'));
+            $this->serverError(_('Could not delete SMS confirmation.'));
             return;
         }