Merge branch 'fixes/private_scope_on_tags' into social-master

[quix0rs-gnu-social.git] / lib / peopletageditform.php

diff --git a/lib/peopletageditform.php b/lib/peopletageditform.php
index 9fb824bdbc41e34d020f8b0a1d1b64b7539e135e..c984880e2ac41aa878c0204cf2bf960543ba6124 100644 (file)
--- a/lib/peopletageditform.php
+++ b/lib/peopletageditform.php
@@ -64,7 +64,7 @@ class PeopletagEditForm extends Form
         parent::__construct($out);
 
         $this->peopletag = $peopletag;
-        $this->tagger    = Profile::staticGet('id', $peopletag->tagger);
+        $this->tagger    = Profile::getKV('id', $peopletag->tagger);
     }
 
     /**
@@ -105,8 +105,8 @@ class PeopletagEditForm extends Form
      */
     function formLegend()
     {
-        // TRANS: Form legend for people tag edit form.
-        // TRANS: %s is a people tag.
+        // TRANS: Form legend for list edit form.
+        // TRANS: %s is a list.
         $this->out->element('legend', null, sprintf(_('Edit list %s'), $this->peopletag->tag));
     }
 
@@ -127,31 +127,31 @@ class PeopletagEditForm extends Form
         $this->out->elementStart('li');
         $this->out->hidden('id', $id);
 
-        // TRANS: Field label for people tag.
-        $this->out->input('tag', _m('LABEL','Tag'),
+        // TRANS: Field label for list.
+        $this->out->input('tag', _m('LABEL','List'),
                           ($this->out->arg('tag')) ? $this->out->arg('tag') : $tag,
-                          // TRANS: Field title for people tag.
-                          _('Change the tag (letters, numbers, -, ., and _ are allowed).'));
+                          // TRANS: Field title for list.
+                          _('Change the list (letters, numbers, -, ., and _ are allowed).'));
         $this->out->elementEnd('li');
 
         $this->out->elementStart('li');
         $desclimit = Profile_list::maxDescription();
         if ($desclimit == 0) {
-            // TRANS: Field title for description of people tag.
+            // TRANS: Field title for description of list.
             $descinstr = _('Describe the list or topic.');
         } else {
-            // TRANS: Field title for description of people tag.
+            // TRANS: Field title for description of list.
             // TRANS: %d is the maximum number of characters for the description.
             $descinstr = sprintf(_m('Describe the list or topic in %d character.',
                                     'Describe the list or topic in %d characters.',
                                     $desclimit),
                                  $desclimit);
         }
-        // TRANS: Field label for description of people tag.
+        // TRANS: Field label for description of list.
         $this->out->textarea('description', _('Description'),
                              ($this->out->arg('description')) ? $this->out->arg('description') : $description,
                              $descinstr);
-        // TRANS: Checkbox label to mark a people tag private.
+        // TRANS: Checkbox label to mark a list private.
         $this->out->checkbox('private', _('Private'), $private);
         $this->out->elementEnd('li');
         $this->out->elementEnd('ul');
@@ -164,25 +164,25 @@ class PeopletagEditForm extends Form
      */
     function formActions()
     {
-        // TRANS: Button text to save a people tag.
+        // TRANS: Button text to save a list.
         $this->out->submit('submit', _('Save'));
         $this->out->submit('form_action-yes',
-                      // TRANS: Button text to delete a people tag.
+                      // TRANS: Button text to delete a list.
                       _m('BUTTON','Delete'),
                       'submit',
                       'delete',
-                      // TRANS: Button title to delete a people tag.
+                      // TRANS: Button title to delete a list.
                       _('Delete this list.'));
     }
 
     function showProfileList()
     {
         $tagged = $this->peopletag->getTagged();
-        // TRANS: Header in people tag edit form.
+        // TRANS: Header in list edit form.
         $this->out->element('h2', null, _('Add or remove people'));
 
         $this->out->elementStart('div', 'profile_search_wrap');
-        // TRANS: Header in people tag edit form.
+        // TRANS: Header in list edit form.
         $this->out->element('h3', null, _m('HEADER','Search'));
         $search = new SearchProfileForm($this->out, $this->peopletag);
         $search->show();