From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 12/23] dir.c: mark more strings for translation
Date: Sat, 30 Jun 2018 11:08:07 +0200 [thread overview]
Message-ID: <20180630090818.28937-13-pclouds@gmail.com> (raw)
In-Reply-To: <20180630090818.28937-1-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
dir.c | 6 +++---
t/t3005-ls-files-relative.sh | 4 ++--
t/t7400-submodule-basic.sh | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dir.c b/dir.c
index e1a2e1cffb..7c6e7a0a37 100644
--- a/dir.c
+++ b/dir.c
@@ -560,7 +560,7 @@ int report_path_error(const char *ps_matched,
if (found_dup)
continue;
- error("pathspec '%s' did not match any file(s) known to git",
+ error(_("pathspec '%s' did not match any file(s) known to git"),
pathspec->items[num].original);
errors++;
}
@@ -949,7 +949,7 @@ static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname,
dir->unmanaged_exclude_files++;
el = add_exclude_list(dir, EXC_FILE, fname);
if (add_excludes(fname, "", 0, el, NULL, oid_stat) < 0)
- die("cannot use %s as an exclude file", fname);
+ die(_("cannot use %s as an exclude file"), fname);
}
void add_excludes_from_file(struct dir_struct *dir, const char *fname)
@@ -3028,7 +3028,7 @@ static void connect_wt_gitdir_in_nested(const char *sub_worktree,
return;
if (repo_read_index(&subrepo) < 0)
- die("index file corrupt in repo %s", subrepo.gitdir);
+ die(_("index file corrupt in repo %s"), subrepo.gitdir);
for (i = 0; i < subrepo.index->cache_nr; i++) {
const struct cache_entry *ce = subrepo.index->cache[i];
diff --git a/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh
index 341fad54ce..209b4c7cd8 100755
--- a/t/t3005-ls-files-relative.sh
+++ b/t/t3005-ls-files-relative.sh
@@ -50,7 +50,7 @@ test_expect_success 'ls-files -c' '
ls ../x* >expect.out &&
test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
test_cmp expect.out actual.out &&
- test_cmp expect.err actual.err
+ test_i18ncmp expect.err actual.err
)
'
@@ -65,7 +65,7 @@ test_expect_success 'ls-files -o' '
ls ../y* >expect.out &&
test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
test_cmp expect.out actual.out &&
- test_cmp expect.err actual.err
+ test_i18ncmp expect.err actual.err
)
'
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 812db137b8..d6853e94be 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -377,7 +377,7 @@ test_expect_success 'init should register submodule url in .git/config' '
test_failure_with_unknown_submodule () {
test_must_fail git submodule $1 no-such-submodule 2>output.err &&
- grep "^error: .*no-such-submodule" output.err
+ test_i18ngrep "^error: .*no-such-submodule" output.err
}
test_expect_success 'init should fail with unknown submodule' '
--
2.18.0.rc2.476.g39500d3211
next prev parent reply other threads:[~2018-06-30 9:09 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-30 9:07 [PATCH 00/23] Mark strings for translation Nguyễn Thái Ngọc Duy
2018-06-30 9:07 ` [PATCH 01/23] Update messages in preparation for i18n Nguyễn Thái Ngọc Duy
2018-06-30 9:07 ` [PATCH 02/23] archive-tar.c: mark more strings for translation Nguyễn Thái Ngọc Duy
2018-06-30 9:07 ` [PATCH 03/23] archive-zip.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:07 ` [PATCH 04/23] builtin/config.c: " Nguyễn Thái Ngọc Duy
2018-07-01 5:18 ` Elijah Newren
2018-06-30 9:08 ` [PATCH 05/23] builtin/grep.c: mark strings for translation and no full stops Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 06/23] builtin/pack-objects.c: mark more strings for translation Nguyễn Thái Ngọc Duy
2018-07-01 5:28 ` Elijah Newren
2018-06-30 9:08 ` [PATCH 07/23] builtin/replace.c: " Nguyễn Thái Ngọc Duy
2018-07-01 5:34 ` Elijah Newren
2018-06-30 9:08 ` [PATCH 08/23] commit-graph.c: " Nguyễn Thái Ngọc Duy
2018-07-02 20:32 ` Derrick Stolee
2018-06-30 9:08 ` [PATCH 09/23] config.c: " Nguyễn Thái Ngọc Duy
2018-07-01 5:38 ` Elijah Newren
2018-06-30 9:08 ` [PATCH 10/23] connect.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 11/23] convert.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` Nguyễn Thái Ngọc Duy [this message]
2018-06-30 9:08 ` [PATCH 13/23] environment.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 14/23] exec-cmd.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 15/23] object.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 16/23] pkt-line.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 17/23] refs.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 18/23] refspec.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 19/23] replace-object.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 20/23] sequencer.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 21/23] sha1-file.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 22/23] transport.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 23/23] transport-helper.c: " Nguyễn Thái Ngọc Duy
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=20180630090818.28937-13-pclouds@gmail.com \
--to=pclouds@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.