From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 1/2] i18n: add stub ngettext implementation
Date: Wed, 9 Mar 2011 04:46:23 -0600 [thread overview]
Message-ID: <20110309104623.GB30980@elie> (raw)
In-Reply-To: <20110309103104.GA30980@elie>
From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 6 Mar 2011 14:40:05 -0800
The ngettext function translates a string representing some pharse
with an alternative plural form and uses the 'count' argument to
choose which form to return. Use of ngettext solves the "%d noun(s)"
problem in a way that is portable to languages outside the Germanic
and Romance families.
In English, the semantics of ngettext(sing, plur, count) are roughly
equivalent to
count == 1 ? _(sing) : _(plur)
while in other languages there can be more variants (count == 0; more
random-looking rules based on the historical pronunciation of the
number). Behind the scenes, the singular form is used to look up a
family of translations and the plural form is ignored unless no
translation is available.
Add a simple wrapper with the English semantics so C code can start
using it to mark phrases with a count for translation.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
This is based against a version of gettext.h with the fixup
(s/# GETTEXT POISON #/ GETTEXT POISON /) from
http://thread.gmane.org/gmane.comp.version-control.git/167661/focus=167878
Applying that substitution to the patch should be enough for it to
apply to a gettext.h without that change.
gettext.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/gettext.h b/gettext.h
index 73831aa..03fb340 100644
--- a/gettext.h
+++ b/gettext.h
@@ -26,6 +26,14 @@ static inline FORMAT_PRESERVING(1) const char *_(const char *msgid)
return use_gettext_poison() ? " GETTEXT POISON " : msgid;
}
+static inline FORMAT_PRESERVING(1) FORMAT_PRESERVING(2)
+const char *ngettext(const char *msgid, const char *plu, unsigned long n)
+{
+ if (use_gettext_poison())
+ return " GETTEXT POISON ";
+ return n == 1 ? msgid : plu;
+}
+
/* Mark msgid for translation but do not translate it. */
#define N_(msgid) (msgid)
--
1.7.4.1
next prev parent reply other threads:[~2011-03-09 10:46 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-04 13:40 [BUG] git-am silently applying patches incorrectly Colin Guthrie
2011-03-04 16:17 ` Drew Northup
2011-03-04 16:41 ` Colin Guthrie
2011-03-04 17:27 ` Junio C Hamano
2011-03-04 17:49 ` Junio C Hamano
2011-03-04 18:37 ` Junio C Hamano
2011-03-04 19:05 ` Junio C Hamano
2011-03-04 19:18 ` Linus Torvalds
2011-03-04 19:31 ` Junio C Hamano
2011-03-04 20:14 ` Alexander Miseler
2011-03-04 21:33 ` Junio C Hamano
2011-03-04 22:20 ` Colin Guthrie
2011-03-04 22:34 ` Junio C Hamano
2011-03-04 22:42 ` Junio C Hamano
2011-03-05 11:51 ` Colin Guthrie
2011-03-06 22:15 ` Junio C Hamano
2011-03-06 22:40 ` Junio C Hamano
2011-03-06 22:56 ` Jonathan Nieder
[not found] ` <AANLkTikctSrfqKCdeYUyvUmAZjr=i7kaFhPeB-LfwgUz@mail.gmail.com>
2011-03-09 10:31 ` [RFC/PATCH 0/2] i18n: add ngettext stub Jonathan Nieder
2011-03-09 10:46 ` Jonathan Nieder [this message]
2011-03-09 10:52 ` [PATCH 2/2] i18n: avoid conflict with ngettext from libintl Jonathan Nieder
2011-03-09 20:43 ` Junio C Hamano
2011-03-09 20:51 ` Jonathan Nieder
2011-03-09 20:55 ` Junio C Hamano
2011-03-10 3:17 ` [PATCH v2] i18n: add stub Q_() wrapper for ngettext Jonathan Nieder
2011-03-10 7:59 ` Junio C Hamano
2011-03-10 9:24 ` Ævar Arnfjörð Bjarmason
2011-03-10 9:21 ` [PATCH 2/2] i18n: avoid conflict with ngettext from libintl Ævar Arnfjörð Bjarmason
2011-03-06 22:15 ` [BUG] git-am silently applying patches incorrectly Junio C Hamano
2011-03-07 9:37 ` Colin Guthrie
2011-03-04 23:09 ` Alexander Miseler
2011-03-05 0:05 ` Junio C Hamano
2011-03-04 22:58 ` Junio C Hamano
2011-03-04 21:49 ` Drew Northup
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110309104623.GB30980@elie \
--to=jrnieder@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).