[interchange-cvs] interchange - racke modified 3 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Sat Dec 28 19:14:00 2002


User:      racke
Date:      2002-12-29 00:13:07 GMT
Modified:  debian   interchange-cat-foundation.config
Modified:           interchange-cat-foundation.postinst
Modified:           interchange-cat-foundation.templates
Log:
introduced selection of locales
reordered logic for configuration questions

Revision  Changes    Path
2.6       +17 -8     interchange/debian/interchange-cat-foundation.config


rev 2.6, prev_rev 2.5
Index: interchange-cat-foundation.config
===================================================================
RCS file: /var/cvs/interchange/debian/interchange-cat-foundation.config,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -r2.5 -r2.6
--- interchange-cat-foundation.config	18 Oct 2002 15:29:02 -0000	2.5
+++ interchange-cat-foundation.config	29 Dec 2002 00:13:06 -0000	2.6
@@ -25,14 +25,7 @@
 db_go
 
 db_get interchange-cat-foundation/install
-if [ "$RET" = "true" ]; then
-	db_input medium interchange-cat-foundation/purge  || [ $? -eq 30 ]
-	db_go
-	db_input high interchange-cat-foundation/username || [ $? -eq 30 ]
-	db_go
-	db_input high interchange-cat-foundation/password || [ $? -eq 30 ]
-	db_go
-else 
+if [ "$RET" == "false" ]; then
 	exit 0
 fi
 
@@ -40,11 +33,27 @@
 db_input high interchange-cat-foundation/replace || [ $? -eq 30 ]
 db_go
 
+GOAHEAD=false
 if [ -d /var/lib/interchange/catalogs/foundation ]; then
 	db_get interchange-cat-foundation/replace
 	if [ "$RET" = "ask" ]; then
 		db_fset interchange-cat-foundation/confirm isdefault true
 		db_input critical interchange-cat-foundation/confirm 
 		db_go
+		db_get interchange-cat-foundation/confirm
+		GOAHEAD="$RET"
+	elif [ "$RET" == "always" ]; then
+		GOAHEAD=true
 	fi
+else 
+	GOAHEAD=true
 fi
+
+db_input medium interchange-cat-foundation/purge  || [ $? -eq 30 ]
+db_go
+db_input high interchange-cat-foundation/username || [ $? -eq 30 ]
+db_go
+db_input high interchange-cat-foundation/password || [ $? -eq 30 ]
+db_go
+db_input medium interchange-cat-foundation/locales || [ $? -eq 30 ]
+db_go



2.10      +3 -1      interchange/debian/interchange-cat-foundation.postinst


rev 2.10, prev_rev 2.9
Index: interchange-cat-foundation.postinst
===================================================================
RCS file: /var/cvs/interchange/debian/interchange-cat-foundation.postinst,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -r2.9 -r2.10
--- interchange-cat-foundation.postinst	31 Jan 2002 15:40:07 -0000	2.9
+++ interchange-cat-foundation.postinst	29 Dec 2002 00:13:07 -0000	2.10
@@ -72,8 +72,10 @@
 	UI_SUPERUSER=$RET
 	db_get interchange-cat-foundation/password
 	UI_PASSWORD=$RET
+    db_get interchange-cat-foundation/locales
+    LOCALES=`echo "$RET" | sed -e 's/, /,/'`
 	SERVERNAME=`hostname --fqdn`
-	MVC_ENABLESECURE=1 MVC_UISECURE=1 MVC_SUPERUSER="$UI_SUPERUSER" MVC_CRYPTPW="$UI_PASSWORD" /usr/bin/makecat \
+	MVC_ENABLESECURE=1 MVC_UISECURE=1 MVC_SUPERUSER="$UI_SUPERUSER" MVC_CRYPTPW="$UI_PASSWORD" MVC_LOCALES="$LOCALES" /usr/bin/makecat \
 		-F \
 		-l /var/log/interchange/makecat.log \
 		--demotype=$CATALOG \



2.8       +10 -0     interchange/debian/interchange-cat-foundation.templates


rev 2.8, prev_rev 2.7
Index: interchange-cat-foundation.templates
===================================================================
RCS file: /var/cvs/interchange/debian/interchange-cat-foundation.templates,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- interchange-cat-foundation.templates	7 Nov 2002 09:55:31 -0000	2.7
+++ interchange-cat-foundation.templates	29 Dec 2002 00:13:07 -0000	2.8
@@ -72,3 +72,13 @@
 Type: boolean
 Default: yes
 Description: Enable demo mode ?
+
+Template: interchange-cat-foundation/locales
+Type: multiselect
+Choices: de_DE, nl_NL
+Description: Select additional locales for the storefront of the demo catalog
+ The Interchange demo catalog is able to display the storefront in a number of 
+ different languages. Each selected locale will increase the memory footprint
+ of the Interchange server processes, so it is recommended to choose only 
+ locales which are really needed.
+