Merge branch 'master' into testing

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

diff --git a/actions/editpeopletag.php b/actions/editpeopletag.php
index db34e485cc214b2c8f50abfcb57ba040e7f190c5..b2dedc890f6c6429d25e7a9b0f9232a012990ea3 100644 (file)
--- a/actions/editpeopletag.php
+++ b/actions/editpeopletag.php
@@ -40,19 +40,19 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @link     http://status.net/
  */
 
-class EditpeopletagAction extends OwnerDesignAction
+class EditpeopletagAction extends Action
 {
     var $msg, $confirm, $confirm_args=array();
 
     function title()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'POST' && $this->boolean('delete')) {
-            // TRANS: Title for edit people tag page after deleting a tag.
-            // TRANS: %s is a tag.
+            // TRANS: Title for edit list page after deleting a tag.
+            // TRANS: %s is a list.
             return sprintf(_('Delete %s list'), $this->peopletag->tag);
         }
-        // TRANS: Title for edit people tag page.
-        // TRANS: %s is a tag.
+        // TRANS: Title for edit list page.
+        // TRANS: %s is a list.
         return sprintf(_('Edit list %s'), $this->peopletag->tag);
     }
 
@@ -105,7 +105,7 @@ class EditpeopletagAction extends OwnerDesignAction
         }
 
         if (!$this->peopletag) {
-            // TRANS: Client error displayed when referring to a non-exsting people tag.
+            // TRANS: Client error displayed when referring to a non-existing list.
             $this->clientError(_('No such list.'), 404);
             return false;
         }
@@ -215,7 +215,7 @@ class EditpeopletagAction extends OwnerDesignAction
             $this->element('p', 'instructions', $this->confirm);
         } else {
             $this->element('p', 'instructions',
-                           // TRANS: Form instruction for edit people tag form.
+                           // TRANS: Form instruction for edit list form.
                            _('Use this form to edit the list.'));
         }
     }
@@ -260,7 +260,7 @@ class EditpeopletagAction extends OwnerDesignAction
             return;
         } else if (Profile_list::descriptionTooLong($description)) {
             $this->showForm(sprintf(
-                    // TRANS: Client error shown when providing too long a description when editing a people tag.
+                    // TRANS: Client error shown when providing too long a description when editing a list.
                     // TRANS: %d is the maximum number of allowed characters.
                     _m('Description is too long (maximum %d character).',
                       'Description is too long (maximum %d characters).',
@@ -293,7 +293,7 @@ class EditpeopletagAction extends OwnerDesignAction
 
         if (!$result) {
             common_log_db_error($this->group, 'UPDATE', __FILE__);
-            // TRANS: TRANS: Server error displayed when updating a people tag fails.
+            // TRANS: Server error displayed when updating a list fails.
             $this->serverError(_('Could not update list.'));
         }
 
@@ -318,7 +318,7 @@ class EditpeopletagAction extends OwnerDesignAction
                                                    'tag'    => $tag)),
                             303);
         } else {
-            // TRANS: Edit people tag form success message.
+            // TRANS: Edit list form success message.
             $this->showForm(_('Options saved.'));
         }
     }