Rename _() for translation to _t() for Java 9 compatibility (ticket #1456)

This commit is contained in:
dg2-new
2015-09-25 19:55:36 +00:00
parent 04690bed9f
commit 22b9876b68
227 changed files with 2930 additions and 2927 deletions

View File

@@ -63,13 +63,13 @@ do
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")
# _t("foo")
# _x("foo")
# To start a new translation, copy the header from an old translation to the new .po file,
# then ant distclean poupdate.
find $JPATHS -name *.java > $TMPFILE
xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\
--keyword=_ --keyword=_x \
--keyword=_t --keyword=_x \
-o ${i}t
if [ $? -ne 0 ]
then

View File

@@ -124,7 +124,7 @@ public class I2PSocketException extends SocketException {
default:
// Translate this one here, can't do it later
return _("Failure code") + ": " + _status;
return _t("Failure code") + ": " + _status;
}
}
@@ -136,13 +136,13 @@ public class I2PSocketException extends SocketException {
String s = getMessage();
if (s == null)
return null;
return _(s);
return _t(s);
}
/**
* Translate
*/
private static String _(String s) {
private static String _t(String s) {
return Translate.getString(s, I2PAppContext.getGlobalContext(), BUNDLE_NAME);
}