PERFORCE change 98058 for review

[soc-andrew]

http://perforce.freebsd.org/chv.cgi?CH=98058

Change 98058 by soc-andrew at soc-andrew_serv on 2006/05/29 10:47:35

	Build gettext strings during release
	Use the new gettext to change "partition" -> "slice" and "subpartition" -> "partition"

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/main.lua#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile#5 edit
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/Makefile#1 add
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/en.po#1 add
.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#49 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/main.lua#3 (text+ko) ====

@@ -38,6 +38,8 @@
 --
 local arg = arg
 
+local POSIX = require("posix")
+
 --
 -- Load the application framework.
 --
@@ -51,7 +53,7 @@
 	GetText = require("gettext")
 	GetText.set_package("dfuibe_lua")
 	-- XXX use App.conf.dir.root here:
-	GetText.set_locale_dir("/usr/local/share/locale")
+	GetText.set_locale_dir("/usr/libexec/bsdinstaller/locale")
 	GetText.init()
 else
 	GetText = nil
@@ -150,6 +152,11 @@
 App.state.resolv_conf = ConfigVars.new()
 
 --
+-- Change the strings to be correct for the FreeBSD system installer
+-- 
+POSIX.putenv("LANG=en")
+
+--
 -- First let the user configure the important user-interface aspects
 -- of their system (language, keyboard/screenmap if on console,
 -- internet connection for logging to remote machine over net, etc.)

==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile#5 (text+ko) ====

@@ -1,3 +1,3 @@
-SUBDIR=	base conf configure configure.menu inst lib pit
+SUBDIR=	base conf configure configure.menu inst lib pit po
 
 .include <bsd.subdir.mk>

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#49 (text+ko) ====

@@ -857,6 +857,13 @@
 	@cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-gettext \
 		ROOT=${RD}/bsdinstaller/root
 
+	cd /usr/ports/devel/gettext && \
+	    env -i FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} && \
+	    make all install clean BATCH=yes FORCE_PKG_REGISTER=yes
+
+	# Install the BSDInstaller translations
+	@cd ${.CURDIR}/../libexec/bsdinstaller/po && make all-nls install-nls DESTDIR=${RD}/bsdinstaller/root
+
 	@touch ${RD}/bsdinstaller/root/etc/fstab
 	@echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf
 	@echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf