i18n: git-status "Changes to be committed" message
Gettextize the "# Changes to be committed:" messages. Several tests explicitly checked for this message. Change them to skip under GETTEXT_POISON=YesPlease. Since these tests didn't check for the rest of the git-status(1) output this change has been split up from the "git-status basic messages" patch. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:42 UTC
919a4ce0c110a22c00aa854aa16638786b143feb
2 files changed
+11
-11
t/t7502-commit.sh
+10
-10
@@ -384,66 +384,66 @@ try_commit () {
384
385
try_commit_status_combo () {
386
387
- test_expect_success 'commit' '
387
+ test_expect_success C_LOCALE_OUTPUT 'commit' '
388
clear_config commit.status &&
389
try_commit "" &&
390
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
391
'
392
393
- test_expect_success 'commit' '
393
+ test_expect_success C_LOCALE_OUTPUT 'commit' '
394
clear_config commit.status &&
395
try_commit "" &&
396
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
397
'
398
399
- test_expect_success 'commit --status' '
399
+ test_expect_success C_LOCALE_OUTPUT 'commit --status' '
400
clear_config commit.status &&
401
try_commit --status &&
402
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
403
'
404
405
- test_expect_success 'commit --no-status' '
405
+ test_expect_success C_LOCALE_OUTPUT 'commit --no-status' '
406
clear_config commit.status &&
407
try_commit --no-status &&
408
! grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
409
'
410
411
- test_expect_success 'commit with commit.status = yes' '
411
+ test_expect_success C_LOCALE_OUTPUT 'commit with commit.status = yes' '
412
clear_config commit.status &&
413
git config commit.status yes &&
414
try_commit "" &&
415
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
416
'
417
418
- test_expect_success 'commit with commit.status = no' '
418
+ test_expect_success C_LOCALE_OUTPUT 'commit with commit.status = no' '
419
clear_config commit.status &&
420
git config commit.status no &&
421
try_commit "" &&
422
! grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
423
'
424
425
- test_expect_success 'commit --status with commit.status = yes' '
425
+ test_expect_success C_LOCALE_OUTPUT 'commit --status with commit.status = yes' '
426
clear_config commit.status &&
427
git config commit.status yes &&
428
try_commit --status &&
429
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
430
'
431
432
- test_expect_success 'commit --no-status with commit.status = yes' '
432
+ test_expect_success C_LOCALE_OUTPUT 'commit --no-status with commit.status = yes' '
433
clear_config commit.status &&
434
git config commit.status yes &&
435
try_commit --no-status &&
436
! grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
437
'
438
439
- test_expect_success 'commit --status with commit.status = no' '
439
+ test_expect_success C_LOCALE_OUTPUT 'commit --status with commit.status = no' '
440
clear_config commit.status &&
441
git config commit.status no &&
442
try_commit --status &&
443
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
444
'
445
446
- test_expect_success 'commit --no-status with commit.status = no' '
446
+ test_expect_success C_LOCALE_OUTPUT 'commit --no-status with commit.status = no' '
447
clear_config commit.status &&
448
git config commit.status no &&
449
try_commit --no-status &&
wt-status.c
+1
-1
@@ -148,7 +148,7 @@ static void wt_status_print_cached_header(struct wt_status *s)
148
{
149
const char *c = color(WT_STATUS_HEADER, s);
150
151
- status_printf_ln(s, c, "Changes to be committed:");
151
+ status_printf_ln(s, c, _("Changes to be committed:"));
152
if (!advice_status_hints)
153
return;
154
if (s->in_merge)