From ef1e2b02de6fc5993b393220b34e8d8ad5f63d94 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 26 Nov 2021 11:13:41 -0500 Subject: [PATCH] Build: Fix the tagged string with '75%' which causes gettext to add a java-printf-format directive, then the testscript fails if the translated string doesn't have a '%' in it; strip out the directive Bump for review --- apps/routerconsole/java/bundle-messages.sh | 8 +++++--- router/java/src/net/i2p/router/RouterVersion.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh index ba08c7f1e..6ff85e468 100755 --- a/apps/routerconsole/java/bundle-messages.sh +++ b/apps/routerconsole/java/bundle-messages.sh @@ -115,9 +115,11 @@ do RC=1 break fi - rm -f ${i}t - # so we don't do this again - touch $i + # the string with '75%' causes it to add a java-printf-format directive, + # and then the testscript fails if the translated + # string doesn't have a '%' in it; strip out the directive + grep -v java-printf-format $i > ${i}t + mv ${i}t ${i} fi if [ "$LG" != "en" ] diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index e83c76c34..011810b47 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Git"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 7; + public final static long BUILD = 8; /** for example "-test" */ public final static String EXTRA = "-rc";