* Set default disabled values for DjVu render options

* Added Xml::option() for generating <option>s easily
* Localized page numbers in drop-down for DjVu page selection
* Fixed linktrail for vi

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b5045bc..99d511c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -181,6 +181,10 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add a quickie script dumpSisterSites.php for generating a page list in the
   format for WSR-1 SisterSites support
 * (bug 7223) Monobook.js is used for site content, should not be localized
+* Set default disabled values for DjVu render options
+* Added Xml::option() for generating <option>s easily
+* Localized page numbers in drop-down for DjVu page selection
+* Fixed linktrail for vi
 
 
 == Languages updated ==

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index df153be..e035dfe 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2199,12 +2199,14 @@ $wgMaxShellMemory = 102400;
  * Enable this and $wgDjvuRenderer to enable djvu rendering
  */
 # $wgDjvuToXML = 'djvutoxml';
+$wgDjvuToXML = null;
 
 /**
  * Path of the ddjvu DJVU renderer
  * Enable this and $wgDjvuToXML to enable djvu rendering
  */
 # $wgDjvuRenderer = 'ddjvu';
+$wgDjvuRenderer = null;
 
 /**
  * Path of the DJVU post processor

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 440caea..ecd5d31 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -276,11 +276,8 @@ class ImagePage extends Article {
                                        $select .= $wgOut->parse( wfMsg( 'imgmultigotopre' ), false ) .
                                                ' <select id="pageselector" name="page">';
                                        for ( $i=1; $i <= $count; $i++ ) {
-                                               if ( $i == $page ) {
-                                                       $select .= "<option value=\"$i\" selected=\"selected\">$i</option>";
-                                               } else {
-                                                       $select .= "<option value=\"$i\" >$i</option>\n";
-                                               }
+                                               $select .= Xml::option( $wgLang->formatNum( $i ), $i,
+                                                       $i == $page );
                                        }
                                        $select .= '</select>' . $wgOut->parse( wfMsg( 'imgmultigotopost' ), false ) .
                                                '<input type="submit" value="' .

diff --git a/includes/Xml.php b/includes/Xml.php
index dc91fa5..3457445 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -207,6 +207,25 @@ class Xml {
                        'type' => 'hidden',
                        'value' => $value ) + $attribs );
        }
+       
+       /**
+        * Convenience function to build an HTML drop-down list item.
+        * @param $text String: text for this item
+        * @param $value String: form submission value; if empty, use text
+        * @param $selected boolean: if true, will be the default selected item
+        * @param $attribs array: optional additional HTML attributes
+        * @return string HTML
+        */
+       public static function option( $text, $value=null, $selected=false,
+                       $attribs=array() ) {
+               if( !is_null( $value ) ) {
+                       $attribs['value'] = $value;
+               }
+               if( $selected ) {
+                       $attribs['selected'] = 'selected';
+               }
+               return self::element( 'option', $attribs, $text );
+       }
 
        /**
         * Returns an escaped string suitable for inclusion in a string literal

diff --git a/languages/MessagesVi.php b/languages/MessagesVi.php
index 78e0a94..02dcb27 100644 (file)
--- a/languages/MessagesVi.php
+++ b/languages/MessagesVi.php
@@ -97,7 +97,7 @@ $dateFormats = array(
     MW_DATE_ISO => '2001-01-15 16:12:34'
 );
 
-$linkTrail = "/^([a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙ]+)(.*)$/sD";
+$linkTrail = "/^([a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙ]+)(.*)$/sDu";
 $separatorTransformTable = array(',' => '.', '.' => ',' );