mirror of
https://github.com/git/git.git
synced 2024-12-15 21:04:10 +08:00
d162b25f95
This removes the ability to inject "poison" gettext() messages via the GIT_TEST_GETTEXT_POISON special test setup. I initially added this as a compile-time option inbb946bba76(i18n: add GETTEXT_POISON to simulate unfriendly translator, 2011-02-22), and most recently modified to be toggleable at runtime in6cdccfce1e(i18n: make GETTEXT_POISON a runtime option, 2018-11-08).. The reason for its removal is that the trade-off of maintaining it v.s. what it's getting us has long since flipped. When gettext was integrated in5e9637c629(i18n: add infrastructure for translating Git with gettext, 2011-11-18) there was understandable concern on the Git ML that in marking messages for translation en-masse we'd inadvertently mark plumbing messages. The GETTEXT_POISON facility was a way to smoke those out via our test suite. Nowadays however we're done (or almost entirely done) with any marking of messages for translation. New messages are usually marked by their authors, who'll know whether it makes sense to translate them or not. If not any errors in marking the messages are much more likely to be spotted in review than in the the initial deluge of i18n patches in the 2011-2012 era. So let's just remove this. This leaves the test suite in a state where we still have a lot of test_i18n, C_LOCALE_OUTPUT etc. uses. Subsequent commits will remove those too. The change to t/lib-rebase.sh is a selective revert of the relevant part off2d17068fd(i18n: rebase-interactive: mark comments of squash for translation, 2016-06-17), and the comment in t/t3406-rebase-message.sh is fromc7108bf9ed(i18n: rebase: mark messages for translation, 2012-07-25). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
88 lines
2.0 KiB
C
88 lines
2.0 KiB
C
/*
|
|
* Copyright (c) 2010-2011 Ævar Arnfjörð Bjarmason
|
|
*
|
|
* This is a skeleton no-op implementation of gettext for Git.
|
|
* You can replace it with something that uses libintl.h and wraps
|
|
* gettext() to try out the translations.
|
|
*/
|
|
|
|
#ifndef GETTEXT_H
|
|
#define GETTEXT_H
|
|
|
|
#if defined(_) || defined(Q_)
|
|
#error "namespace conflict: '_' or 'Q_' is pre-defined?"
|
|
#endif
|
|
|
|
#ifndef NO_GETTEXT
|
|
# include <libintl.h>
|
|
#else
|
|
# ifdef gettext
|
|
# undef gettext
|
|
# endif
|
|
# define gettext(s) (s)
|
|
# ifdef ngettext
|
|
# undef ngettext
|
|
# endif
|
|
# define ngettext(s, p, n) ((n == 1) ? (s) : (p))
|
|
#endif
|
|
|
|
#define FORMAT_PRESERVING(n) __attribute__((format_arg(n)))
|
|
|
|
#ifndef NO_GETTEXT
|
|
void git_setup_gettext(void);
|
|
int gettext_width(const char *s);
|
|
#else
|
|
static inline void git_setup_gettext(void)
|
|
{
|
|
}
|
|
static inline int gettext_width(const char *s)
|
|
{
|
|
return strlen(s);
|
|
}
|
|
#endif
|
|
|
|
static inline FORMAT_PRESERVING(1) const char *_(const char *msgid)
|
|
{
|
|
if (!*msgid)
|
|
return "";
|
|
return gettext(msgid);
|
|
}
|
|
|
|
static inline FORMAT_PRESERVING(1) FORMAT_PRESERVING(2)
|
|
const char *Q_(const char *msgid, const char *plu, unsigned long n)
|
|
{
|
|
return ngettext(msgid, plu, n);
|
|
}
|
|
|
|
/* Mark msgid for translation but do not translate it. */
|
|
#if !USE_PARENS_AROUND_GETTEXT_N
|
|
#define N_(msgid) msgid
|
|
#else
|
|
/*
|
|
* Strictly speaking, this will lead to invalid C when
|
|
* used this way:
|
|
* static const char s[] = N_("FOO");
|
|
* which will expand to
|
|
* static const char s[] = ("FOO");
|
|
* and in valid C, the initializer on the right hand side must
|
|
* be without the parentheses. But many compilers do accept it
|
|
* as a language extension and it will allow us to catch mistakes
|
|
* like:
|
|
* static const char *msgs[] = {
|
|
* N_("one")
|
|
* N_("two"),
|
|
* N_("three"),
|
|
* NULL
|
|
* };
|
|
* (notice the missing comma on one of the lines) by forcing
|
|
* a compilation error, because parenthesised ("one") ("two")
|
|
* will not get silently turned into ("onetwo").
|
|
*/
|
|
#define N_(msgid) (msgid)
|
|
#endif
|
|
|
|
const char *get_preferred_languages(void);
|
|
int is_utf8_locale(void);
|
|
|
|
#endif
|