Fix bustage from checkin of Bug 374331--defaultlanguage parameter no longer exists, use $languages[0] instead. r=LpSolit

3 files changed, 7 insertions, 6 deletions

diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm
index 36254a9c1..c488ab314 100644
--- a/Bugzilla/Install.pm
+++ b/Bugzilla/Install.pm
@@ -36,6 +36,7 @@ use Bugzilla::Util qw(get_text);
 use Bugzilla::Version;
 
 sub SETTINGS {
+    my @languages = split(/[\s,]+/, Bugzilla->params->{'languages'});
     return {
     # 2005-03-03 travis@sedsystems.ca -- Bug 41972
     display_quips      => { options => ["on", "off"], default => "on" },
@@ -58,8 +59,8 @@ sub SETTINGS {
     # 2006-08-04 wurblzap@gmail.com -- Bug 322693
     skin               => { subclass => 'Skin', default => 'standard' },
     # 2006-12-10 LpSolit@gmail.com -- Bug 297186
-    lang               => { options => [split(/[\s,]+/, Bugzilla->params->{'languages'})],
-                            default => Bugzilla->params->{'defaultlanguage'} }
+    lang               => { options => \@languages,
+                            default => $languages[0] }
     }
 };
 
diff --git a/docs/xml/customization.xml b/docs/xml/customization.xml
index 5b9e99dee..a513610be 100644
--- a/docs/xml/customization.xml
+++ b/docs/xml/customization.xml
@@ -438,9 +438,9 @@
       <para>After untarring the localizations (or creating your own) in the 
       <filename class="directory">BUGZILLA_ROOT/template</filename> directory,
       you must update the <option>languages</option> parameter to contain any
-      localizations you'd like to permit. You may also wish to set the
-      <option>defaultlanguage</option> parameter to something other than
-      <quote>en</quote> if you don't want English to be the default language.
+      localizations you'd like to permit. You may also wish to re-order
+      the <option>languages</option> parameter so that <quote>en</quote> 
+      doesn't come first, if you don't want English to be the default language.
       </para>
     </section>
       
diff --git a/editparams.cgi b/editparams.cgi
index ca74df685..7d280474b 100755
--- a/editparams.cgi
+++ b/editparams.cgi
@@ -145,7 +145,7 @@ if ($action eq 'save' && $current_module) {
         # then we delete it (the user pref is reset to the default one).
         my @languages = split(/[\s,]+/, Bugzilla->params->{'languages'});
         map {trick_taint($_)} @languages;
-        add_setting('lang', \@languages, Bugzilla->params->{'defaultlanguage'}, undef, 1);
+        add_setting('lang', \@languages, $languages[0], undef, 1);
     }
 
     $vars->{'message'} = 'parameters_updated';