stop duplicating, use "source bundle-messages.sh"

apps/routerconsole/java/bmsg.sh

@@ -14,92 +14,4 @@ echo $PWD
 ## except this everything is the same with bundle-message.sh
 ## walking - public domain :-D
 
-
+source bundle-messages.sh
-CLASS=net.i2p.router.web.messages
-TMPFILE=build/javafiles.txt
-export TZ=UTC
-
-#
-# generate strings/Countries.java from ../../../installer/resources/countries.txt
-#
-CFILE=../../../installer/resources/countries.txt
-JFILE=build/Countries.java
-if [ $CFILE -nt $JFILE -o ! -s $JFILE ]
-then
-	mkdir -p build
-        echo '// Automatically generated pseudo-java for xgettext - do not edit' > $JFILE
-	echo '// Translators may wish to translate a few of these, do not bother to translate all of them!!' >> $JFILE
-	sed 's/..,\(..*\)/_("\1");/' $CFILE >> $JFILE
-fi
-
-# list specific files in router/ here, so we don't scan the whole tree
-ROUTERFILES="\
-   ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java \
-   ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java \
-   ../../../router/java/src/net/i2p/router/transport/TransportManager.java \
-   ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java \
-   ../../../router/java/src/net/i2p/router/Blocklist.java \
-   ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java"
-for i in ../locale/messages_*.po
-do
-	# get language
-	LG=${i#../locale/messages_}
-	LG=${LG%.po}
-
-	# make list of java files newer than the .po file
-	find $JPATHS -name *.java -newer $i > $TMPFILE
-	if [ -s build/obj/net/i2p/router/web/messages_$LG.class -a \
-	     build/obj/net/i2p/router/web/messages_$LG.class -nt $i -a \
-	     ! -s $TMPFILE ]
-	then
-		continue
-	fi
-
-	echo "Generating ${CLASS}_$LG ResourceBundle..."
-
-	# extract strings from java and jsp files, and update messages.po files
-	# translate calls must be one of the forms:
-	# _("foo")
-	# _x("foo")
-	# intl._("foo")
-	# intl.title("foo")
-	# handler._("foo")
-	# formhandler._("foo")
-	# net.i2p.router.web.Messages.getString("foo")
-	# In a jsp, you must use a helper or handler that has the context set.
-	# To start a new translation, copy the header from an old translation to the new .po file,
-	# then ant distclean updater.
-	find $JPATHS -name *.java > $TMPFILE
-	xgettext -f $TMPFILE -F -L java --from-code=UTF-8 \
-                 --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \
-                 --keyword=handler._ --keyword=formhandler._ \
-                 --keyword=net.i2p.router.web.Messages.getString \
-	         -o ${i}t
-	if [ $? -ne 0 ]
-	then
-		echo 'Warning - xgettext failed, not updating translations'
-		rm -f ${i}t
-		break
-	fi
-	msgmerge -U --backup=none $i ${i}t
-	if [ $? -ne 0 ]
-	then
-		echo 'Warning - msgmerge failed, not updating translations'
-		rm -f ${i}t
-		break
-	fi
-	rm -f ${i}t
-	# so we don't do this again
-	touch $i
-
-	# convert to class files in build/obj
-	msgfmt --java -r $CLASS -l $LG -d build/obj $i
-	if [ $? -ne 0 ]
-	then
-		echo 'Warning - msgfmt failed, not updating translations'
-		break
-	fi
-done
-rm -f $TMPFILE
-# todo: return failure
-exit 0