From: Vincent Bernat <bernat@debian.org>
Date: Fri, 25 Sep 2009 20:53:04 +0000 (+0000)
Subject: Use 'language' instead of 'locale_string'. Closes: #544579
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=226fd121404ca13bbc7e212dcd6ad6cb5daf9c57;p=roundcube.git

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

diff --git a/debian/changelog b/debian/changelog
index 4c5b876..219cc98 100644
--- 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 5db3c4b..b41830d 100644
--- 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