From 522007bdb26b737cb4a7066618a2e877211be9d0 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 12 Aug 2008 09:05:07 +0000
Subject: Switch installer from obsolete locale_string to language config
 option

---
 config/main.inc.php.dist | 2 +-
 installer/config.php     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 935ddceac..e79e3f382 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -119,7 +119,7 @@ $rcmail_config['double_auth'] = false;
 $rcmail_config['des_key'] = 'rcmail-!24ByteDESkey*Str';
 
 // the default locale setting
-$rcmail_config['language'] = 'en';
+$rcmail_config['language'] = 'en_US';
 
 // use this format for short date display
 $rcmail_config['date_short'] = 'D H:i';
diff --git a/installer/config.php b/installer/config.php
index d75b02333..f1829b4bb 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -434,16 +434,16 @@ echo $check_smtplog->show(intval($RCI->getprop('smtp_log')), array('value' => 1)
 <legend>Display settings &amp; user prefs</legend>
 <dl class="configblock" id="cgfblockdisplay">
 
-<dt class="propname">locale_string</dt>
+<dt class="propname">language</dt>
 <dd>
 <?php
 
-$input_locale = new html_inputfield(array('name' => '_locale_string', 'size' => 6, 'id' => "cfglocale"));
-echo $input_locale->show($RCI->getprop('locale_string'));
+$input_locale = new html_inputfield(array('name' => '_language', 'size' => 6, 'id' => "cfglocale"));
+echo $input_locale->show($RCI->getprop('language'));
 
 ?>
 <div>The default locale setting. This also defines the language of the login screen.</div>
-<p class="hint">Enter a <a href="http://www.faqs.org/rfcs/rfc1766">RFC1766</a> formatted locale name. Examples: en_US, de, de_CH, fr, pt_BR</p>
+<p class="hint">Enter a <a href="http://www.faqs.org/rfcs/rfc1766">RFC1766</a> formatted language name. Examples: en_US, de_DE, de_CH, fr_FR, pt_BR</p>
 </dd>
 
 <dt class="propname">pagesize <span class="userconf">*</span></dt>
-- 
cgit v1.2.3