public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] intl: Treat C.UTF-8 locale like C locale, part 2 (BZ# 16621)
@ 2023-12-12 9:08 Florian Weimer
0 siblings, 0 replies; only message in thread
From: Florian Weimer @ 2023-12-12 9:08 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d0aefec49941cf6d97e2244d6aa20bafc26d5942
commit d0aefec49941cf6d97e2244d6aa20bafc26d5942
Author: Bruno Haible <bruno@clisp.org>
Date: Tue Dec 12 09:45:16 2023 +0100
intl: Treat C.UTF-8 locale like C locale, part 2 (BZ# 16621)
The previous commit was incomplete: gettext() still returns a translation
if the file /usr/share/locale/C/LC_MESSAGES/<domain>.mo exists. This patch
prohibits the translation also in this case.
* gettext-runtime/intl/dcigettext.c (DCIGETTEXT): Treat C.<encoding> locale
like the C locale.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diff:
---
intl/dcigettext.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 27063886d2..fb69bbf94b 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -691,9 +691,10 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
continue;
}
- /* If the current locale value is C (or POSIX) we don't load a
- domain. Return the MSGID. */
- if (strcmp (single_locale, "C") == 0
+ /* If the current locale value is "C" or "C.<encoding>" or "POSIX",
+ we don't load a domain. Return the MSGID. */
+ if ((single_locale[0] == 'C'
+ && (single_locale[1] == '\0' || single_locale[1] == '.'))
|| strcmp (single_locale, "POSIX") == 0)
break;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-12-12 9:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-12 9:08 [glibc] intl: Treat C.UTF-8 locale like C locale, part 2 (BZ# 16621) Florian Weimer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).