Use 'language' instead of 'locale_string'. Closes: #544579

diff --git a/debian/changelog b/debian/changelog
index 4c5b876ae1526303d4ab3a1c94877d6c51a2d257..219cc98815e9e2a69291e36daa1cd691d9b95bff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ roundcube (0.2.2-2) UNRELEASED; urgency=low
   * Update debconf translations:
       + Italian, thanks to Luca Monducci. Closes: #544199.
       + Czech, thanks to Miroslav Kure. Closes: #546413.
+  * Roundcube configuration now uses 'language' instead of 'locale_string'
+    to specify the default language. Update postinst to reflect this
+    change. Thanks to Richard van den Berg for noticing this. Closes:
+    #544579.
 
  -- Vincent Bernat <bernat@debian.org>  Wed, 16 Sep 2009 22:32:29 +0200
 

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index 5db3c4b328da05b4862d0fe4cf9f1edd4760b7da..b41830dda73d51a0745cbc04013ae682217bfc96 100644 (file)
--- a/debian/roundcube-core.postinst
+++ b/debian/roundcube-core.postinst
@@ -71,7 +71,7 @@ case "$1" in
        cat /usr/share/roundcube/main.inc.php.dist | \
            sed -e "s+^\(\$rcmail_config\['default_host'\] = \)''\(;\)\$+\1${hosts}\2+" \
                -e "s+^\(\$rcmail_config\['des_key'\] = '\).*\(';\)\$+\1$deskey\2+" \
-               -e "s+^\(\$rcmail_config\['locale_string'\] = '\).*\(';\)\$+\1${language}\2+" >> $CONFFILE.ucftmp
+               -e "s+^\(\$rcmail_config\['language'\] = '\).*\(';\)\$+\1${language}\2+" >> $CONFFILE.ucftmp
 
        ucf --debconf-ok $CONFFILE.ucftmp $CONFFILE
        chown root:www-data $CONFFILE