[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Tue, 1 Oct 2024 15:01:45 -0400 (EDT) |
branch: master
commit 77d61c4b50c13c913e03276e70486784688e1df1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jul 28 10:36:13 2024 +0200
Use separate po files for gnulib in info and install-info
* info/info.c (main), install-info/install-info.c (main): call
bindtextdomain for the PACKAGE "-gnulib" separate domain.
* po/POTFILES.in: remove gnulib/lib files.
* Makefile.am (po-check): ignore gnulib/lib/*.
---
ChangeLog | 11 +++++++++++
Makefile.am | 1 +
info/info.c | 3 +++
install-info/install-info.c | 3 +++
po/POTFILES.in | 4 ----
5 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5c0281800b..4108b7d479 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-07-28 Patrice Dumas <pertusus@free.fr>
+
+ Use separate po files for gnulib in info and install-info
+
+ * info/info.c (main), install-info/install-info.c (main): call
+ bindtextdomain for the PACKAGE "-gnulib" separate domain.
+
+ * po/POTFILES.in: remove gnulib/lib files.
+
+ * Makefile.am (po-check): ignore gnulib/lib/*.
+
2024-07-28 Patrice Dumas <pertusus@free.fr>
Setup separate po files directory for base directory gnulib
diff --git a/Makefile.am b/Makefile.am
index f73719f5c4..5091cb4d9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,6 +112,7 @@ po-check:
case $$file in \
contrib/* ) continue;; \
djgpp/* | man/* ) continue;; \
+ gnulib/lib/*) continue;; \
texinfo-*/*) continue;; \
tp/maintain/* ) continue;; \
tp/t/results* ) continue;; \
diff --git a/info/info.c b/info/info.c
index dd4b4c69cf..9970ebe70a 100644
--- a/info/info.c
+++ b/info/info.c
@@ -699,6 +699,9 @@ main (int argc, char *argv[])
/* Set the text message domain. */
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
+
+ /* set the gnulib text message domain. */
+ bindtextdomain (PACKAGE "-gnulib", LOCALEDIR);
#endif
init_messages ();
diff --git a/install-info/install-info.c b/install-info/install-info.c
index dff2d8ef2d..9cd909434f 100644
--- a/install-info/install-info.c
+++ b/install-info/install-info.c
@@ -1975,6 +1975,9 @@ main (int argc, char *argv[])
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
+ /* set the gnulib text message domain. */
+ bindtextdomain (PACKAGE "-gnulib", LOCALEDIR);
+
/* Make sure standard input can be freopened at will. Otherwise,
when stdin starts off closed, bad things could happen if a plain fopen
returns stdin before open_possibly_compressed_file freopens it. */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 541b14c74c..ddba1ba4a1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,10 +6,6 @@
#
# List of source files containing translatable strings.
-gnulib/lib/error.c
-gnulib/lib/getopt.c
-gnulib/lib/regcomp.c
-gnulib/lib/xalloc-die.c
info/echo-area.c
info/filesys.c
info/footnotes.c