Mark messages in git-rebase.sh for translation. While doing this Jonathan noticed that the comma usage and sentence structure of the resolvemsg was not quite right, so correct that and its cousins in git-am.sh and t/t0201-gettext-fallbacks.sh at the same time. Some tests would start to fail with GETTEXT_POISON turned on after this update. Use test_i18ncmp and test_i18ngrep where appropriate to mark strings that should only be checked in the C locale output to avoid such issues. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			68 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			68 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
#
 | 
						|
# Copyright (c) 2010 Ævar Arnfjörð Bjarmason
 | 
						|
#
 | 
						|
 | 
						|
test_description='Gettext Shell fallbacks'
 | 
						|
 | 
						|
GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease
 | 
						|
export GIT_INTERNAL_GETTEXT_TEST_FALLBACKS
 | 
						|
 | 
						|
. ./lib-gettext.sh
 | 
						|
 | 
						|
test_expect_success "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" '
 | 
						|
    test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set' '
 | 
						|
    test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success C_LOCALE_OUTPUT 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' '
 | 
						|
    echo fallthrough >expect &&
 | 
						|
    echo $GIT_INTERNAL_GETTEXT_SH_SCHEME >actual &&
 | 
						|
    test_cmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'gettext: our gettext() fallback has pass-through semantics' '
 | 
						|
    printf "test" >expect &&
 | 
						|
    gettext "test" >actual &&
 | 
						|
    test_i18ncmp expect actual &&
 | 
						|
    printf "test more words" >expect &&
 | 
						|
    gettext "test more words" >actual &&
 | 
						|
    test_i18ncmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'eval_gettext: our eval_gettext() fallback has pass-through semantics' '
 | 
						|
    printf "test" >expect &&
 | 
						|
    eval_gettext "test" >actual &&
 | 
						|
    test_i18ncmp expect actual &&
 | 
						|
    printf "test more words" >expect &&
 | 
						|
    eval_gettext "test more words" >actual &&
 | 
						|
    test_i18ncmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables' '
 | 
						|
    printf "test YesPlease" >expect &&
 | 
						|
    GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
 | 
						|
    test_i18ncmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' '
 | 
						|
    cmdline="git am" &&
 | 
						|
    export cmdline;
 | 
						|
    printf "When you have resolved this problem, run git am --resolved." >expect &&
 | 
						|
    eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual
 | 
						|
    test_i18ncmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' '
 | 
						|
    cmdline="git am" &&
 | 
						|
    export cmdline;
 | 
						|
    printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
 | 
						|
    eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual
 | 
						|
    test_i18ncmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_done
 |