Implement msgctxt for Java ResourceBundles.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index fbceab10e49eb35b8ef76fc70359991826af8a3e..0b1f6d1edf6593656d25a057970187847f939440 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-01  Bruno Haible  <bruno@clisp.org>
+
+       Implement msgctxt for Java ResourceBundles.
+       * xgettext-java-7: New file.
+       * msgunfmt-java-1: Add a few messages with context.
+       * lang-java: Likewise.
+       * Makefile.am (TESTS): Add xgettext-java-7.
+       Suggested by Felix Berger.
+
 2007-07-04  Bruno Haible  <bruno@clisp.org>
 
        * xgettext-php-3: Use string concatenation in the test.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 7eaf27860e4723b6656fe3b0d2e0bb40c8ca22b8..38e094df9c5da58b05faf99259cbf0cb75b4b277 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -78,7 +78,7 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \
        xgettext-elisp-1 xgettext-elisp-2 \
        xgettext-glade-1 xgettext-glade-2 xgettext-glade-3 \
        xgettext-java-1 xgettext-java-2 xgettext-java-3 xgettext-java-4 \
-       xgettext-java-5 xgettext-java-6 \
+       xgettext-java-5 xgettext-java-6 xgettext-java-7 \
        xgettext-librep-1 xgettext-librep-2 \
        xgettext-lisp-1 xgettext-lisp-2 \
        xgettext-objc-1 xgettext-objc-2 \

diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index 64d6d5711b6dfce1f28e71129448b8ec48fc4403..b89d8916e0acecfd0d6dbebcb3c19c282f4abab1 100755 (executable)
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -67,6 +67,8 @@ cat <<\EOF >> Program.java
     System.out.println(GettextResource.gettext(catalog,"'Your command, please?', asked the waiter."));
     System.out.println(MessageFormat.format(GettextResource.ngettext(catalog,"a piece of cake","{0,number} pieces of cake",n), new Object[] { new Integer(n) }));
     System.out.println(MessageFormat.format(GettextResource.gettext(catalog,"{0} is replaced by {1}."), new Object[] { "FF", "EUR" }));
+    System.out.println(MessageFormat.format(GettextResource.npgettext(catalog,"++","a piece of cake","{0,number} pieces of cake",n), new Object[] { new Integer(n) }));
+    System.out.println(MessageFormat.format(GettextResource.pgettext(catalog,"++","{0} is replaced by {1}."), new Object[] { "FF", "EUR" }));
   }
 }
 EOF
@@ -97,6 +99,18 @@ msgstr[1] ""
 #, java-format
 msgid "{0} is replaced by {1}."
 msgstr ""
+
+#, java-format
+msgctxt "++"
+msgid "a piece of cake"
+msgid_plural "{0,number} pieces of cake"
+msgstr[0] ""
+msgstr[1] ""
+
+#, java-format
+msgctxt "++"
+msgid "{0} is replaced by {1}."
+msgstr ""
 EOF
 
 : ${DIFF=diff}
@@ -123,6 +137,20 @@ msgstr[1] "{0,number} morceaux de gateau"
 #, java-format
 msgid "{0} is replaced by {1}."
 msgstr "{1} remplace {0}."
+
+# Euphemistic formulation.
+#, java-format
+msgctxt "++"
+msgid "a piece of cake"
+msgid_plural "{0,number} pieces of cake"
+msgstr[0] "un morceau de gateau succulent"
+msgstr[1] "{0,number} morceaux de gateau succulent"
+
+# Euphemistic formulation.
+#, java-format
+msgctxt "++"
+msgid "{0} is replaced by {1}."
+msgstr "Le nouveau {1} remplace le vieux {0}."
 EOF
 
 tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
@@ -173,11 +201,15 @@ cat <<\EOF > prog.ok
 «Votre commande, s'il vous plait», dit le garçon.
 2 morceaux de gateau
 EUR remplace FF.
+2 morceaux de gateau succulent
+Le nouveau EUR remplace le vieux FF.
 EOF
 cat <<\EOF > prog.oku
 «Votre commande, s'il vous plait», dit le garçon.
 2 morceaux de gateau
 EUR remplace FF.
+2 morceaux de gateau succulent
+Le nouveau EUR remplace le vieux FF.
 EOF
 
 : ${LOCALE_FR=fr_FR}

diff --git a/gettext-tools/tests/msgunfmt-java-1 b/gettext-tools/tests/msgunfmt-java-1
index f2158c73552e56a656b93a0d4f8ca9931d5639d7..34e133c3ad7a028b710fafc9dcabdb0e7ab2c807 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-java-1
+++ b/gettext-tools/tests/msgunfmt-java-1
@@ -43,6 +43,15 @@ msgstr[1] "{0,number} morceaux de gateau"
 #, java-format
 msgid "{0} is replaced by {1}."
 msgstr "{1} remplace {0}."
+
+# A proximity measure.
+msgid "Close"
+msgstr "Proche"
+
+# A menu entry.
+msgctxt "File"
+msgid "Close"
+msgstr "Fermer"
 EOF
 
 tmpfiles="$tmpfiles prog_fr.class"
@@ -69,6 +78,13 @@ msgstr ""
 msgid "'Your command, please?', asked the waiter."
 msgstr "«Votre commande, s'il vous plait», dit le garçon."
 
+msgid "Close"
+msgstr "Proche"
+
+msgctxt "File"
+msgid "Close"
+msgstr "Fermer"
+
 msgid "a piece of cake"
 msgid_plural "{0,number} pieces of cake"
 msgstr[0] "un morceau de gateau"