@matheusbsbs / matheus-bagliano / commits / 6578483036
Fork 0

i18n: add no-op _() and N_() wrappers

The _ function is for translating strings into the user's chosen language. The N_ macro just marks translatable strings for the xgettext(1) tool without translating them; it is intended for use in contexts where a function call cannot be used. So, for example: fprintf(stderr, _("Expansion of alias '%s' failed; " "'%s' is not a git command\n"), cmd, argv[0]); and const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { /* ERROR_WOULD_OVERWRITE */ N_("Entry '%s' would be overwritten by merge. Cannot merge."), [...] Define such _ and N_ in a new gettext.h and include it in cache.h, so they can be used everywhere. Each just returns its argument for now. _ is a function rather than a macro like N_ to avoid the temptation to use _("foo") as a string literal (which would be a compile-time error once _(s) expands to an expression for the translation of s). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Feb 22, 2011 at 23:41 UTC 6578483036695820d05aa7cf482a38169ad321bf
3 files changed +28
Makefile
+1
@@ -515,6 +515,7 @@ LIB_H += diff.h
515 LIB_H += dir.h
516 LIB_H += exec_cmd.h
517 LIB_H += fsck.h
518 +LIB_H += gettext.h
519 LIB_H += git-compat-util.h
520 LIB_H += graph.h
521 LIB_H += grep.h
cache.h
+1
@@ -5,6 +5,7 @@
5 #include "strbuf.h"
6 #include "hash.h"
7 #include "advice.h"
8 +#include "gettext.h"
9
10 #include SHA1_HEADER
11 #ifndef git_SHA_CTX
gettext.h new
+26
@@ -0,0 +1,26 @@
1 +/*
2 + * Copyright (c) 2010-2011 Ævar Arnfjörð Bjarmason
3 + *
4 + * This is a skeleton no-op implementation of gettext for Git.
5 + * You can replace it with something that uses libintl.h and wraps
6 + * gettext() to try out the translations.
7 + */
8 +
9 +#ifndef GETTEXT_H
10 +#define GETTEXT_H
11 +
12 +#ifdef _
13 +#error "namespace conflict: '_' is pre-defined?"
14 +#endif
15 +
16 +#define FORMAT_PRESERVING(n) __attribute__((format_arg(n)))
17 +
18 +static inline FORMAT_PRESERVING(1) const char *_(const char *msgid)
19 +{
20 + return msgid;
21 +}
22 +
23 +/* Mark msgid for translation but do not translate it. */
24 +#define N_(msgid) (msgid)
25 +
26 +#endif