i18n: setup: mark strings for translation

Update tests that compare the strings newly marked for translation to
succeed when running under GETTEXT_POISON.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/setup.c b/setup.c
index c86bf5c9fabeab4b60b0696b9ae9b2f0f2bb720e..6d0e0c93d5f562c3c20351b76e8c93cc549c8252 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -157,8 +157,8 @@ static void NORETURN die_verify_filename(const char *prefix,
                                         int diagnose_misspelt_rev)
 {
        if (!diagnose_misspelt_rev)
                                         int diagnose_misspelt_rev)
 {
        if (!diagnose_misspelt_rev)

-               die("%s: no such path in the working tree.\n"
-                   "Use 'git <command> -- <path>...' to specify paths that do not exist locally.",
+               die(_("%s: no such path in the working tree.\n"
+                     "Use 'git <command> -- <path>...' to specify paths that do not exist locally."),

                    arg);
        /*
         * Saying "'(icase)foo' does not exist in the index" when the
                    arg);
        /*
         * Saying "'(icase)foo' does not exist in the index" when the


@@ -170,9 +170,9 @@ static void NORETURN die_verify_filename(const char *prefix,
                maybe_die_on_misspelt_object_name(arg, prefix);
 
        /* ... or fall back the most general message. */
                maybe_die_on_misspelt_object_name(arg, prefix);
 
        /* ... or fall back the most general message. */

-       die("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-           "Use '--' to separate paths from revisions, like this:\n"
-           "'git <command> [<revision>...] -- [<file>...]'", arg);
+       die(_("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+             "Use '--' to separate paths from revisions, like this:\n"
+             "'git <command> [<revision>...] -- [<file>...]'"), arg);

 
 }
 
 
 }
 


@@ -220,9 +220,9 @@ void verify_non_filename(const char *prefix, const char *arg)
                return; /* flag */
        if (!check_filename(prefix, arg))
                return;
                return; /* flag */
        if (!check_filename(prefix, arg))
                return;

-       die("ambiguous argument '%s': both revision and filename\n"
-           "Use '--' to separate paths from revisions, like this:\n"
-           "'git <command> [<revision>...] -- [<file>...]'", arg);
+       die(_("ambiguous argument '%s': both revision and filename\n"
+             "Use '--' to separate paths from revisions, like this:\n"
+             "'git <command> [<revision>...] -- [<file>...]'"), arg);

 }
 
 int get_common_dir(struct strbuf *sb, const char *gitdir)
 }
 
 int get_common_dir(struct strbuf *sb, const char *gitdir)

diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 86c2ff255d43d644caf81e6258d29dcea1db8e53..79a0251efa6e049be4fffa41004e73b9950d2bd7 100755 (executable)
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -106,7 +106,7 @@ test_expect_success 'incorrect revision id' '
        test_must_fail git rev-parse foobar:file.txt 2>error &&
        grep "Invalid object name '"'"'foobar'"'"'." error &&
        test_must_fail git rev-parse foobar 2> error &&
        test_must_fail git rev-parse foobar:file.txt 2>error &&
        grep "Invalid object name '"'"'foobar'"'"'." error &&
        test_must_fail git rev-parse foobar 2> error &&

-       grep "unknown revision or path not in the working tree." error
+       test_i18ngrep "unknown revision or path not in the working tree." error

 '
 
 test_expect_success 'incorrect file in sha1:path' '
 '
 
 test_expect_success 'incorrect file in sha1:path' '

diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index d8f23f488e00dad97eeb5d22f5f0db01bcab8021..001343e2fc2722506172e702266f5bab6278d1e8 100755 (executable)
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -18,7 +18,7 @@ test_expect_success '"git log :/" should not be ambiguous' '
 test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' '
        : >a &&
        test_must_fail git log :/a 2>error &&
 test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' '
        : >a &&
        test_must_fail git log :/a 2>error &&

-       grep ambiguous error
+       test_i18ngrep ambiguous error

 '
 
 test_expect_success '"git log :/a -- " should not be ambiguous' '
 '
 
 test_expect_success '"git log :/a -- " should not be ambiguous' '


@@ -31,7 +31,7 @@ test_expect_success '"git log -- :/a" should not be ambiguous' '
 
 test_expect_success '"git log :" should be ambiguous' '
        test_must_fail git log : 2>error &&
 
 test_expect_success '"git log :" should be ambiguous' '
        test_must_fail git log : 2>error &&

-       grep ambiguous error
+       test_i18ngrep ambiguous error

 '
 
 test_expect_success 'git log -- :' '
 '
 
 test_expect_success 'git log -- :' '