i18n: notes-merge: mark die messages for translation
Update test to reflect changes. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Sep 19, 2016 at 13:08 UTC
c041c6d06a7fce3aa563d7b0c4a47feccc541400
2 files changed
+5
-5
notes-merge.c
+4
-4
@@ -269,15 +269,15 @@ static void check_notes_merge_worktree(struct notes_merge_options *o)
269
if (file_exists(git_path(NOTES_MERGE_WORKTREE)) &&
270
!is_empty_dir(git_path(NOTES_MERGE_WORKTREE))) {
271
if (advice_resolve_conflict)
272
- die("You have not concluded your previous "
272
+ die(_("You have not concluded your previous "
273
"notes merge (%s exists).\nPlease, use "
274
"'git notes merge --commit' or 'git notes "
275
"merge --abort' to commit/abort the "
276
"previous merge before you start a new "
277
- "notes merge.", git_path("NOTES_MERGE_*"));
277
+ "notes merge."), git_path("NOTES_MERGE_*"));
278
else
279
- die("You have not concluded your notes merge "
280
- "(%s exists).", git_path("NOTES_MERGE_*"));
279
+ die(_("You have not concluded your notes merge "
280
+ "(%s exists)."), git_path("NOTES_MERGE_*"));
281
}
282
283
if (safe_create_leading_directories_const(git_path(
t/t3310-notes-merge-manual-resolve.sh
+1
-1
@@ -225,7 +225,7 @@ test_expect_success 'cannot do merge w/conflicts when previous merge is unfinish
225
test -d .git/NOTES_MERGE_WORKTREE &&
226
test_must_fail git notes merge z >output 2>&1 &&
227
# Output should indicate what is wrong
228
- grep -q "\\.git/NOTES_MERGE_\\* exists" output
228
+ test_i18ngrep -q "\\.git/NOTES_MERGE_\\* exists" output
229
'
230
231
# Setup non-conflicting merge between x and new notes ref w