* Build: Don't update the po files by default, add new

target "poupdate" to do that.

apps/routerconsole/java/bundle-messages.sh

@@ -2,12 +2,22 @@
 # Update messages_xx.po and messages_xx.class files,
 # from both java and jsp sources.
 # Requires installed programs xgettext, msgfmt, msgmerge, and find.
+#
+# usage:
+#    bundle-messages.sh (generates the resource bundle from the .po file)
+#    bundle-messages.sh -p (updates the .po file from the source tags, then generates the resource bundle)
+#
 # zzz - public domain
 #
 CLASS=net.i2p.router.web.messages
 TMPFILE=build/javafiles.txt
 export TZ=UTC
 
+if [ "$1" = "-p" ]
+then
+	POUPDATE=1
+fi
+
 #
 # generate strings/Countries.java from ../../../installer/resources/countries.txt
 #
@@ -37,8 +47,12 @@ do
 	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 [ "$POUPDATE" = "1" ]
+	then
+		# make list of java files newer than the .po file
+		find $JPATHS -name *.java -newer $i > $TMPFILE
+	fi
+
 	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 ]
@@ -46,42 +60,46 @@ do
 		continue
 	fi
 
-	echo "Generating ${CLASS}_$LG ResourceBundle..."
+	if [ "$POUPDATE" = "1" ]
+	then
+	 	echo "Updating the $i file from the tags..."
+		# 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
+	fi
 
-	# 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
+	echo "Generating ${CLASS}_$LG ResourceBundle..."
 
 	# convert to class files in build/obj
 	msgfmt --java -r $CLASS -l $LG -d build/obj $i