Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  Update people tag related UI messages. Update translator documentation accordingly.

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index fdb693f92cea68b8777732c4a59a0d29261e41eb..3b3c1913a1dc0e427ab4f684a3fde9476a6bbff6 100644 (file)
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -170,20 +170,21 @@ class HTMLOutputter extends XMLOutputter
      * @param string $label        text of label for the element
      * @param string $value        value of the element, default null
      * @param string $instructions instructions for valid input
+     * @param string $name         name of the element; if null, the id will
+     *                             be used
      *
-     * @todo add a $name parameter
      * @todo add a $maxLength parameter
      * @todo add a $size parameter
      *
      * @return void
      */
 
-    function input($id, $label, $value=null, $instructions=null)
+    function input($id, $label, $value=null, $instructions=null, $name=null)
     {
         $this->element('label', array('for' => $id), $label);
-        $attrs = array('name' => $id,
-                       'type' => 'text',
-                       'id' => $id);
+        $attrs = array('type' => 'text',
+                       'id'   => $id);
+        $attrs['name'] = is_null($name) ? $id : $name;
         if (!is_null($value)) { // value can be 0 or ''
             $attrs['value'] = $value;
         }
@@ -516,28 +517,48 @@ class HTMLOutputter extends XMLOutputter
      * @param string $label        text of label for the element
      * @param string $content      content of the textarea, default none
      * @param string $instructions instructions for valid input
+     * @param string $name         name of textarea; if null, $id will be used
+     * @param int    $cols         number of columns
+     * @param int    $rows         number of rows
      *
      * @return void
-     *
-     * @todo add a $name parameter
-     * @todo add a $cols parameter
-     * @todo add a $rows parameter
      */
 
-    function textarea($id, $label, $content=null, $instructions=null)
-    {
+    function textarea(
+        $id,
+        $label,
+        $content      = null,
+        $instructions = null,
+        $name         = null,
+        $cols         = null,
+        $rows         = null
+    ) {
         $this->element('label', array('for' => $id), $label);
-        $this->element('textarea', array('rows' => 3,
-                                         'cols' => 40,
-                                         'name' => $id,
-                                         'id' => $id),
-                       ($content) ? $content : '');
+        $attrs = array(
+            'rows' => 3,
+            'cols' => 40,
+            'id' => $id
+        );
+        $attrs['name'] = is_null($name) ? $id : $name;
+
+        if ($cols != null) {
+            $attrs['cols'] = $cols;
+
+        }
+        if ($rows != null) {
+            $attrs['rows'] = $rows;
+        }
+        $this->element(
+            'textarea',
+            $attrs,
+            is_null($content) ? '' : $content
+        );
         if ($instructions) {
             $this->element('p', 'form_guide', $instructions);
         }
     }
 
-    /**
+   /**
     * Internal script to autofocus the given element on page onload.
     *
     * @param string $id element ID, must refer to an existing element

diff --git a/plugins/Bookmark/bookmarkform.php b/plugins/Bookmark/bookmarkform.php
index f6341a0a7223771d67d3ab6019570b555efb1d9a..5f355cdb2f117fc335e0edcc5410a5426ee6694c 100644 (file)
--- a/plugins/Bookmark/bookmarkform.php
+++ b/plugins/Bookmark/bookmarkform.php
@@ -116,10 +116,11 @@ class BookmarkForm extends Form
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
-        $this->out->input('url',
+        $this->out->input('bookmark-url',
                           // TRANS: Field label on form for adding a new bookmark.
                           _m('LABEL','URL'),
-                          $this->_url);
+                          $this->_url,
+                          'url');
         $this->unli();
 
         list($width, $height) = $this->scaleImage($this->_thumbnail->width,
@@ -133,26 +134,29 @@ class BookmarkForm extends Form
         }
 
         $this->li();
-        $this->out->input('title',
+        $this->out->input('bookmark-title',
                           // TRANS: Field label on form for adding a new bookmark.
                           _m('LABEL','Title'),
-                          $this->_title);
+                          $this->_title,
+                          'title');
         $this->unli();
 
         $this->li();
-        $this->out->textarea('description',
+        $this->out->textarea('bookmark-description',
                              // TRANS: Field label on form for adding a new bookmark.
                              _m('LABEL','Notes'),
-                             $this->_description);
+                             $this->_description,
+                             'description');
         $this->unli();
 
         $this->li();
-        $this->out->input('tags',
+        $this->out->input('bookmark-tags',
                           // TRANS: Field label on form for adding a new bookmark.
                           _m('LABEL','Tags'),
                           $this->_tags,
                           // TRANS: Field title on form for adding a new bookmark.
-                          _m('Comma- or space-separated list of tags.'));
+                          _m('Comma- or space-separated list of tags.'),
+                          'tags');
         $this->unli();
 
         $this->out->elementEnd('ul');

diff --git a/plugins/Bookmark/bookmarkforurl.php b/plugins/Bookmark/bookmarkforurl.php
index cff6408191f84f53e5311092a946acd8fbe5c4da..0c7a94b93731cbacc1e723ccaa2fb464c5de25c8 100644 (file)
--- a/plugins/Bookmark/bookmarkforurl.php
+++ b/plugins/Bookmark/bookmarkforurl.php
@@ -68,7 +68,7 @@ class BookmarkforurlAction extends Action
 
         $this->checkSessionToken();
 
-        $this->url = $this->trimmed('url');
+        $this->url = $this->trimmed('initial-bookmark-url');
 
         if (empty($this->url)) {
             throw new ClientException(_('URL is required.'), 400);

diff --git a/plugins/Bookmark/initialbookmarkform.php b/plugins/Bookmark/initialbookmarkform.php
index f747e05075a086aa1fc6fb44e1062e6d38a94259..c49bd67432a0faf8af2a9b11382822356d6af8dc 100644 (file)
--- a/plugins/Bookmark/initialbookmarkform.php
+++ b/plugins/Bookmark/initialbookmarkform.php
@@ -73,10 +73,9 @@ class InitialBookmarkForm extends Form
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
-        $this->out->input('url',
+        $this->out->input('initial-bookmark-url',
                           // TRANS: Field label on form for adding a new bookmark.
-                          _m('LABEL','URL'),
-                          null);
+                          _m('LABEL','URL'));
         $this->unli();
 
         $this->out->elementEnd('ul');

diff --git a/plugins/Bookmark/newbookmark.php b/plugins/Bookmark/newbookmark.php
index 92e9bc81c59a3ee77106f7a1383fb11969e378f9..8c60fc159681b9da422343aacc71e166956d62fd 100644 (file)
--- a/plugins/Bookmark/newbookmark.php
+++ b/plugins/Bookmark/newbookmark.php
@@ -87,10 +87,10 @@ class NewbookmarkAction extends Action
             $this->checkSessionToken();
         }
 
-        $this->title       = $this->trimmed('title');
-        $this->url         = $this->trimmed('url');
-        $this->tags        = $this->trimmed('tags');
-        $this->description = $this->trimmed('description');
+        $this->title       = $this->trimmed('bookmark-title');
+        $this->url         = $this->trimmed('bookmark-url');
+        $this->tags        = $this->trimmed('bookmark-tags');
+        $this->description = $this->trimmed('bookmark-description');
 
         return true;
     }