[PATCH 05/72] gettextize: git-init "Initialized [...] repository" message
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 19, 2011, 19:23 UTC
- Message-ID
- <1298143495-3681-6-git-send-email-avarab@gmail.com>
- In-Reply-To
- <1298143495-3681-1-git-send-email-avarab@gmail.com>
Change the git-init "Initialized empty Git repository" message and its variants to use gettext.
This is one of the messages that could do with splitting up, I had a WIP patch to do that that began like this:
const char *reinit_shared = _("Reinitialized existing shared Git repository in %s\n");
const char *init_shared = _("Initialized empty shared Git repository in %s\n");
const char *reinit_noshared = _("Reinitialized existing Git repository in %s\n");
const char *init_noshared = _("Initialized empty Git repository in %s\n");But in the first round of gettextization I'm aiming to keep code changes to a minimum for ease of review.
We can solicit input from translators about which messages that use too much sprintf-ing are troublesome, and change those later.
Note that the TRANSLATORS comment doesn't use the usual Git style. This is because everything from "/* TRANSLATORS: " to "*/" will extracted as-is xgettext(1) and presented to translators, including newlines and leading "*"'s. There seems to be no way to change that, short of patching xgettext itself.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/init-db.c | 10 +++++++--- t/t0001-init.sh | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c index 35f9f13..67462ad 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -354,9 +354,13 @@ int init_db(const char *template_dir, unsigned int flags) if (!(flags & INIT_DB_QUIET)) { const char *git_dir = get_git_dir(); int len = strlen(git_dir); - printf("%s%s Git repository in %s%s\n", - reinit ? "Reinitialized existing" : "Initialized empty", - shared_repository ? " shared" : "", + + /* TRANSLATORS: The first '%s' is either "Reinitialized + existing" or "Initialized empty", the second " shared" or + "", and the last '%s%s' is the verbatim directory name. */ + printf(_("%s%s Git repository in %s%s\n"), + reinit ? _("Reinitialized existing") : _("Initialized empty"), + shared_repository ? _(" shared") : "", git_dir, len && git_dir[len-1] != '/' ? "/" : ""); } diff --git a/t/t0001-init.sh b/t/t0001-init.sh index f684993..4235ad4 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -180,7 +180,7 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' ' fi ' -test_expect_success 'reinit' ' +test_expect_success NO_GETTEXT_POISON 'reinit' ' ( sane_unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG &&
-- 1.7.2.3