[freenet-cvs] r17008 - in trunk/apps/new_installer: . res/unix/bin

[nextgens at freenetproject.org]

Author: nextgens
Date: 2008-01-11 14:05:05 +0000 (Fri, 11 Jan 2008)
New Revision: 17008

Modified:
   trunk/apps/new_installer/install.xml
   trunk/apps/new_installer/res/unix/bin/1run.sh
Log:
new_installer: implement #1983: l10n the welcome.html

Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml	2008-01-11 09:39:08 UTC (rev 17007)
+++ trunk/apps/new_installer/install.xml	2008-01-11 14:05:05 UTC (rev 17008)
@@ -118,6 +118,7 @@
 				<include name="bin/**/*"/>
 				<include name="wrapper.conf"/>
 				<include name="welcome.html"/>
+				<include name="welcome.*.html"/>
 			</fileset>
 		</pack>
 

Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh	2008-01-11 09:39:08 UTC (rev 17007)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh	2008-01-11 14:05:05 UTC (rev 17008)
@@ -10,4 +10,10 @@
 ./run.sh start
 
 echo "Starting up a browser"
-java -cp bin/browser.jar BareBonesBrowserLaunch "file://$INSTALL_PATH/welcome.html"
+if test -e welcome.$ISO3_LANG.html
+then
+	HTMLFILE="file://$INSTALL_PATH/welcome.$ISO3_LANG.html"
+else
+	HTMLFILE="file://$INSTALL_PATH/welcome.html"
+fi
+java -cp bin/browser.jar BareBonesBrowserLaunch "$HTMLFILE"