From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.24]) by sourceware.org (Postfix) with ESMTPS id C58F23858D33 for ; Sun, 10 Sep 2023 19:18:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C58F23858D33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=clisp.org Authentication-Results: sourceware.org; spf=none smtp.mailfrom=clisp.org ARC-Seal: i=1; a=rsa-sha256; t=1694373485; cv=none; d=strato.com; s=strato-dkim-0002; b=YXrg7bpjIEdxNbgsLhO3CSkuMNL0ZtjNH8iGYz5jJPYRmbkOvqPW1t1EtuTKVo3DxM v8hzwSpFTGbN3PFjIFvz/xrEBmSrpRRchrX2yEWMUHRp7Qrlapfi2U5inlb1r5uW9SCK u3Wk8VV1x4uFNOUUJtt7t+4uqeBXVaT+1k0Yv2igdsHHzUOTi6KqYlHtC9w/x6uM43TW iD3OCO+Cc5hrJZ2oH82v3PmO17V9sgRvsypqKMPH5Iyd+96N2UjUfjqg4aOPY/HtcbGn Z8+XDA/7y4fVGK85itpYZfod7Z/y1aHmFsmwJKAbsFPf9iXbdxRFJ0rEe/Qjdc6VDRFP V8Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1694373485; s=strato-dkim-0002; d=strato.com; h=Message-Id:Date:Subject:Cc:To:From:Cc:Date:From:Subject:Sender; bh=+EEFWqGwwJg/q5GMagWXyuXy329stUqShMYRvKb3gIo=; b=FBpXXIfWhYEjgavD3N0ZOTyHrjhFv427vpDWMm0Ji/uP5ztjLf28+vHeS1kRTy5TTe ApvyuaHbEK5WNDOMplPHtr6LMRt9bOUaprYSaxmfCTi2ToZq6QIUbtFZIlYDjmCO3jdW CUQ8BSWVJjJghNZxotliTx9OwWIhgsS4Sjpamrg/FAA8NP017OG6/YDCskQ75teRWuy2 GPOVcnHm1st/SMFGHrfKYskjGrwLhBFh/HB0+Va4n+u/JAf9gJLsgUYSTuMloeCegEJf acYVy10SbOpT0ctPDDZxj+PTRTGY/FD5sVqgKzmEt8+JMAG4Y5md7QsOAQApSX5CBObC GryA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1694373485; s=strato-dkim-0002; d=clisp.org; h=Message-Id:Date:Subject:Cc:To:From:Cc:Date:From:Subject:Sender; bh=+EEFWqGwwJg/q5GMagWXyuXy329stUqShMYRvKb3gIo=; b=CG55R8uux2irfvUr061I64xAu0+zXyafq1LWqObj0PORtMhm47GIIWlJ63l7EuAD2n qOqn8I64YiosPY7FzR7ybV6KR+ttTAuOrMbkha4nLUEAmwuXzT26mvo2sqFZf0SvcQe9 YLLD+2HPGWhtIf8eivwc54ABxcdPLJ1A1dOuljf0iZOyfKOOzBwA2RWcVkyF4Jlr9QZJ VgmWZw98vPoZxAjq6GZS9JWZWkQP/8BWGvM6DCU2mTEfc0iQGI9aaYBIqYIZvcCD8U3t ZfrOzJrf6+57oMeilxQLnCjppMUJslMySZ2PDx4pZr6S2A5HZCbKW2QM+5Pwn849rl6O 2LFg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1694373485; s=strato-dkim-0003; d=clisp.org; h=Message-Id:Date:Subject:Cc:To:From:Cc:Date:From:Subject:Sender; bh=+EEFWqGwwJg/q5GMagWXyuXy329stUqShMYRvKb3gIo=; b=nk+kGkLOX3n6HEYaLwkuUlAuHbUDjCruKflr8r/uIqwspQgYNHrkMCViQuFp/U2xro i1kLk1+SL/KMtas3uVDQ== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH0WWb0LN8XZoH94zq68+3cfpPE1fFDydxvePvb+kdfVk9V4cJT" Received: from nimes.fritz.box by smtp.strato.de (RZmta 49.8.2 AUTH) with ESMTPSA id z9213ez8AJI5wzc (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Sun, 10 Sep 2023 21:18:05 +0200 (CEST) From: Bruno Haible To: libc-alpha@sourceware.org Cc: Bruno Haible Subject: [PATCH] intl: Treat C.UTF-8 locale like C locale, part 2 (BZ# 16621) Date: Sun, 10 Sep 2023 21:17:39 +0200 Message-Id: <20230910191739.1083016-1-bruno@clisp.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="us-ascii" X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The previous commit was incomplete: gettext() still returns a translation if the file /usr/share/locale/C/LC_MESSAGES/.mo exists. This patch prohibits the translation also in this case. * gettext-runtime/intl/dcigettext.c (DCIGETTEXT): Treat C. locale like the C locale. --- 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." 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; -- 2.34.1