bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Use the translation domain "gnulib"


From: Bruno Haible
Subject: Re: Use the translation domain "gnulib"
Date: Mon, 09 Dec 2024 09:55:07 +0100

Yesterday I did:
> diff --git a/lib/quotearg.c b/lib/quotearg.c
> index 00977f5714..28994d783c 100644
> --- a/lib/quotearg.c
> +++ b/lib/quotearg.c
> @@ -45,7 +45,7 @@
>  #include <wchar.h>
>  
>  #include "gettext.h"
> -#define _(msgid) gettext (msgid)
> +#define _(msgid) dgettext ("gnulib", msgid)
>  #define N_(msgid) msgid
>  
>  #ifndef SIZE_MAX

This causes a test failure of the 'quotearg' tests. Caught by the CI.
This patch fixes it.


2024-12-09  Bruno Haible  <bruno@clisp.org>

        quotearg tests: Fix test failure (regression yesterday).
        * tests/testlocale/fr/LC_MESSAGES/gnulib.po: Renamed from
        tests/testlocale/fr/LC_MESSAGES/test-quotearg.po.
        * tests/testlocale/fr/LC_MESSAGES/gnulib.mo: Renamed from
        tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo.
        * tests/test-quotearg.c (main): Use bindtextdomain for the domain
        "gnulib", not "test-quotearg".
        * tests/test-quotearg.sh: Fix typo in comments.
        * modules/quotearg-tests (Files): Update.

diff --git a/modules/quotearg-tests b/modules/quotearg-tests
index d297f0b0aa..22223a9534 100644
--- a/modules/quotearg-tests
+++ b/modules/quotearg-tests
@@ -6,8 +6,8 @@ tests/test-quotearg.sh
 tests/test-quotearg.c
 tests/test-quotearg.h
 tests/macros.h
-tests/testlocale/fr/LC_MESSAGES/test-quotearg.po
-tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo
+tests/testlocale/fr/LC_MESSAGES/gnulib.po
+tests/testlocale/fr/LC_MESSAGES/gnulib.mo
 m4/locale-fr.m4
 m4/codeset.m4
 
diff --git a/tests/test-quotearg.c b/tests/test-quotearg.c
index 0283f1ca1c..84bead7402 100644
--- a/tests/test-quotearg.c
+++ b/tests/test-quotearg.c
@@ -82,8 +82,7 @@ main (_GL_UNUSED int argc, char *argv[])
         fputs ("Skipping test: no french Unicode locale is installed\n", 
stderr);
         return 77;
       }
-    textdomain ("test-quotearg");
-    bindtextdomain ("test-quotearg", getenv ("LOCALEDIR"));
+    bindtextdomain ("gnulib", getenv ("LOCALEDIR"));
 
     set_quoting_style (NULL, locale_quoting_style);
     compare_strings (use_quotearg_buffer, &locale_results[0].group1, false);
diff --git a/tests/test-quotearg.sh b/tests/test-quotearg.sh
index e11b66783a..3d895a1534 100755
--- a/tests/test-quotearg.sh
+++ b/tests/test-quotearg.sh
@@ -14,7 +14,7 @@ fi
 
 # Work around a limitation of gettext() on native Windows in gettext 0.18.1:
 # the locale identifiers in the environment variables LC_ALL etc. have to
-# be in Unix conventions, not in native Window conventions.
+# be in Unix conventions, not in native Windows conventions.
 if test $locale = French_France.65001; then
   locale=fr_FR.UTF-8
 fi
diff --git a/tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo 
b/tests/testlocale/fr/LC_MESSAGES/gnulib.mo
similarity index 100%
rename from tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo
rename to tests/testlocale/fr/LC_MESSAGES/gnulib.mo
diff --git a/tests/testlocale/fr/LC_MESSAGES/test-quotearg.po 
b/tests/testlocale/fr/LC_MESSAGES/gnulib.po
similarity index 100%
rename from tests/testlocale/fr/LC_MESSAGES/test-quotearg.po
rename to tests/testlocale/fr/LC_MESSAGES/gnulib.po






reply via email to

[Prev in Thread] Current Thread [Next in Thread]