{"thread":{"id":"25098","subject":"[PATCH/RFC 01/12] gettextize: git-submodule add git-sh-i18n","startedAt":"2010-09-13T22:09:06Z","lastAt":"2010-09-13T22:09:18Z","messageCount":13,"participants":["Ævar Arnfjörð Bjarmason"],"isPatch":true,"patchVersion":1,"patchTotal":12},"messages":[{"id":"150636","messageId":"1284415758-20931-1-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":null,"subject":"[PATCH/RFC 00/12] gettextize: git-submodule","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:06Z","receivedAt":"2010-09-13T22:09:06Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"This is an RFC on a series that makes git-submodule.sh\ntranslatable. With this git-bisect/rebase/stash are the only\nmainporcelain commands that aren't translatable.\n\nI'll be folding this into the next version of the ab/i18n series I'll\nbe sending to Junio. No need to apply it to the current one.\n\nThis is based on a master that has the \"tests: use test_cmp instead of\npiping to diff(1)\" patch applied. Untangling the two was a pain, and\nprobably unnecessary since by the time this gets merged that patch\nwill be in maint/master.\n\nÆvar Arnfjörð Bjarmason (12):\n gettextize: git-submodule add git-sh-i18n\n gettextize: git-submodule echo + eval_gettext messages\n gettextize: git-submodule say + eval_gettext messages\n gettextize: git-submodule die + eval_gettext messages\n gettextize: git-submodule $update_module say + die messages\n gettextize: git-submodule \"cached cannot be used\" message\n gettextize: git-submodule \"Submodule change[...]\" messages\n gettextize: git-submodule $errmsg messages\n gettextize: git-submodule \"Entering [...]\" message\n gettextize: git-submodule \"[...] path is ignored\" message\n gettextize: git-submodule \"path not initialized\" message\n gettextize: git-submodule \"blob\" and \"submodule\" messages\n\n git-submodule.sh | 94 +++++++++++++++++++++--------------------\n t/t7400-submodule-basic.sh | 4 +-\n t/t7401-submodule-summary.sh | 12 +++---\n t/t7407-submodule-foreach.sh | 4 +-\n 4 files changed, 58 insertions(+), 56 deletions(-)\n\n-- \n1.7.3.rc1.220.gb4d42\n"},{"id":"150635","messageId":"1284415758-20931-2-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":"1284415758-20931-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 01/12] gettextize: git-submodule add git-sh-i18n","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:07Z","receivedAt":"2010-09-13T22:09:07Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason \n---\n git-submodule.sh | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 9ebbab7..5ef3d0d 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -14,6 +14,7 @@ USAGE=\"[--quiet] add [-b branch] [-f|--force] [--reference ] [--] ...]\"\n OPTIONS_SPEC=\n . git-sh-setup\n+. git-sh-i18n\n . git-parse-remote\n require_work_tree\n \n-- \n1.7.3.rc1.220.gb4d42\n"},{"id":"150637","messageId":"1284415758-20931-3-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":"1284415758-20931-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 02/12] gettextize: git-submodule echo + eval_gettext messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:08Z","receivedAt":"2010-09-13T22:09:08Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason \n---\n git-submodule.sh | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 5ef3d0d..5a08fe6 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -219,7 +219,7 @@ cmd_add()\n \tthen\n \t\tif test -d \"$path\"/.git -o -f \"$path\"/.git\n \t\tthen\n-\t\t\techo \"Adding existing repo at '$path' to the index\"\n+\t\t\techo \"$(eval_gettext \"Adding existing repo at '\\$path' to the index\")\"\n \t\telse\n \t\t\tdie \"'$path' already exists and is not a valid git repo\"\n \t\tfi\n@@ -626,7 +626,7 @@ cmd_summary() {\n \t\t\t\t;; # removed\n \t\t\t*)\n \t\t\t\t# unexpected type\n-\t\t\t\techo >&2 \"unexpected mode $mod_dst\"\n+\t\t\t\techo >&2 \"$(eval_gettext \"unexpected mode \\$mod_dst\")\"\n \t\t\t\tcontinue ;;\n \t\t\tesac\n \t\tfi\n-- \n1.7.3.rc1.220.gb4d42\n"},{"id":"150638","messageId":"1284415758-20931-4-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":"1284415758-20931-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 03/12] gettextize: git-submodule say + eval_gettext messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:09Z","receivedAt":"2010-09-13T22:09:09Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason \n---\n git-submodule.sh | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 5a08fe6..086acdd 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -840,7 +840,7 @@ cmd_sync()\n \t\tif test -e \"$path\"/.git\n \t\tthen\n \t\t(\n-\t\t\tsay \"Synchronizing submodule url for '$name'\"\n+\t\t\tsay \"$(eval_gettext \"Synchronizing submodule url for '\\$name'\")\"\n \t\t\tgit config submodule.\"$name\".url \"$url\"\n \t\t\tclear_local_git_env\n \t\t\tcd \"$path\"\n-- \n1.7.3.rc1.220.gb4d42\n"},{"id":"150639","messageId":"1284415758-20931-5-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":"1284415758-20931-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 04/12] gettextize: git-submodule die + eval_gettext messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:10Z","receivedAt":"2010-09-13T22:09:10Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason \n---\n git-submodule.sh | 40 ++++++++++++++++++++--------------------\n 1 files changed, 20 insertions(+), 20 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 086acdd..1b3132f 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -35,7 +35,7 @@ resolve_relative_url ()\n {\n \tremote=$(get_default_remote)\n \tremoteurl=$(git config \"remote.$remote.url\") ||\n-\t\tdie \"remote ($remote) does not have a url defined in .git/config\"\n+\t\tdie \"$(eval_gettext \"remote (\\$remote) does not have a url defined in .git/config\")\"\n \turl=\"$1\"\n \tremoteurl=${remoteurl%/}\n \twhile test -n \"$url\"\n@@ -76,7 +76,7 @@ module_name()\n \tname=$( git config -f .gitmodules --get-regexp '^submodule\\..*\\.path$' |\n \t\tsed -n -e 's|^submodule\\.\\(.*\\)\\.path '\"$re\"'$|\\1|p' )\n test -z \"$name\" &&\n- die \"No submodule mapping found in .gitmodules for path '$path'\"\n+ die \"$(eval_gettext \"No submodule mapping found in .gitmodules for path '\\$path'\")\"\n echo \"$name\"\n }\n \n@@ -102,11 +102,11 @@ module_clone()\n \tif test -d \"$path\"\n \tthen\n \t\trmdir \"$path\" 2>/dev/null ||\n-\t\tdie \"Directory '$path' exists, but is neither empty nor a git repository\"\n+\t\tdie \"$(eval_gettext \"Directory '\\$path' exists, but is neither empty nor a git repository\")\"\n \tfi\n \n \ttest -e \"$path\" &&\n-\tdie \"A file already exist at path '$path'\"\n+\tdie \"$(eval_gettext \"A file already exist at path '\\$path'\")\"\n \n \tif test -n \"$reference\"\n \tthen\n@@ -114,7 +114,7 @@ module_clone()\n \telse\n \t\tgit-clone -n \"$url\" \"$path\"\n \tfi ||\n-\tdie \"Clone of '$url' into submodule path '$path' failed\"\n+\tdie \"$(eval_gettext \"Clone of '\\$url' into submodule path '\\$path' failed\")\"\n }\n \n #\n@@ -187,7 +187,7 @@ cmd_add()\n \t\trealrepo=$repo\n \t\t;;\n \t*)\n-\t\tdie \"repo URL: '$repo' must be absolute or begin with ./|../\"\n+\t\tdie \"$(eval_gettext \"repo URL: '\\$repo' must be absolute or begin with ./|../\")\"\n \t;;\n \tesac\n \n@@ -204,7 +204,7 @@ cmd_add()\n \t\t\ts|/*$||\n \t\t')\n \tgit ls-files --error-unmatch \"$path\" > /dev/null 2>&1 &&\n-\tdie \"'$path' already exists in the index\"\n+\tdie \"$(eval_gettext \"'\\$path' already exists in the index\")\"\n \n \tif test -z \"$force\" && ! git add --dry-run --ignore-missing \"$path\" > /dev/null 2>&1\n \tthen\n@@ -221,7 +221,7 @@ cmd_add()\n \t\tthen\n \t\t\techo \"$(eval_gettext \"Adding existing repo at '\\$path' to the index\")\"\n \t\telse\n-\t\t\tdie \"'$path' already exists and is not a valid git repo\"\n+\t\t\tdie \"$(eval_gettext \"'\\$path' already exists and is not a valid git repo\")\"\n \t\tfi\n \n \t\tcase \"$repo\" in\n@@ -244,16 +244,16 @@ cmd_add()\n \t\t\t'') git checkout -f -q ;;\n \t\t\t?*) git checkout -f -q -b \"$branch\" \"origin/$branch\" ;;\n \t\t\tesac\n-\t\t) || die \"Unable to checkout submodule '$path'\"\n+\t\t) || die \"$(eval_gettext \"Unable to checkout submodule '\\$path'\")\"\n \tfi\n \n \tgit add $force \"$path\" ||\n-\tdie \"Failed to add submodule '$path'\"\n+\tdie \"$(eval_gettext \"Failed to add submodule '\\$path'\")\"\n \n \tgit config -f .gitmodules submodule.\"$path\".path \"$path\" &&\n \tgit config -f .gitmodules submodule.\"$path\".url \"$repo\" &&\n \tgit add --force .gitmodules ||\n-\tdie \"Failed to register submodule '$path'\"\n+\tdie \"$(eval_gettext \"Failed to register submodule '\\$path'\")\"\n }\n \n #\n@@ -303,7 +303,7 @@ cmd_foreach()\n \t\t\t\t\tcmd_foreach \"--recursive\" \"$@\"\n \t\t\t\tfi\n \t\t\t) ||\n-\t\t\tdie \"Stopping at '$path'; script returned non-zero status.\"\n+\t\t\tdie \"$(eval_gettext \"Stopping at '\\$path'; script returned non-zero status.\")\"\n \t\tfi\n \tdone\n }\n@@ -346,7 +346,7 @@ cmd_init()\n \n \t\turl=$(git config -f .gitmodules submodule.\"$name\".url)\n \t\ttest -z \"$url\" &&\n-\t\tdie \"No url found for submodule path '$path' in .gitmodules\"\n+\t\tdie \"$(eval_gettext \"No url found for submodule path '\\$path' in .gitmodules\")\"\n \n \t\t# Possibly a url relative to parent\n \t\tcase \"$url\" in\n@@ -356,14 +356,14 @@ cmd_init()\n \t\tesac\n \n \t\tgit config submodule.\"$name\".url \"$url\" ||\n-\t\tdie \"Failed to register url for submodule path '$path'\"\n+\t\tdie \"$(eval_gettext \"Failed to register url for submodule path '\\$path'\")\"\n \n \t\tupd=\"$(git config -f .gitmodules submodule.\"$name\".update)\"\n \t\ttest -z \"$upd\" ||\n \t\tgit config submodule.\"$name\".update \"$upd\" ||\n-\t\tdie \"Failed to register update mode for submodule path '$path'\"\n+\t\tdie \"$(eval_gettext \"Failed to register update mode for submodule path '\\$path'\")\"\n \n-\t\tsay \"Submodule '$name' ($url) registered for path '$path'\"\n+\t\tsay \"$(eval_gettext \"Submodule '\\$name' (\\$url) registered for path '\\$path'\")\"\n \tdone\n }\n \n@@ -453,7 +453,7 @@ cmd_update()\n \t\telse\n \t\t\tsubsha1=$(clear_local_git_env; cd \"$path\" &&\n \t\t\t\tgit rev-parse --verify HEAD) ||\n-\t\t\tdie \"Unable to find current revision in submodule path '$path'\"\n+\t\t\tdie \"$(eval_gettext \"Unable to find current revision in submodule path '\\$path'\")\"\n \t\tfi\n \n \t\tif ! test -z \"$update\"\n@@ -473,7 +473,7 @@ cmd_update()\n \t\t\tthen\n \t\t\t\t(clear_local_git_env; cd \"$path\" &&\n \t\t\t\t\tgit-fetch) ||\n-\t\t\t\tdie \"Unable to fetch in submodule path '$path'\"\n+\t\t\t\tdie \"$(eval_gettext \"Unable to fetch in submodule path '\\$path'\")\"\n \t\t\tfi\n \n \t\t\tcase \"$update_module\" in\n@@ -502,7 +502,7 @@ cmd_update()\n \t\tif test -n \"$recursive\"\n \t\tthen\n \t\t\t(clear_local_git_env; cd \"$path\" && cmd_update $orig_args) ||\n-\t\t\tdie \"Failed to recurse into submodule path '$path'\"\n+\t\t\tdie \"$(eval_gettext \"Failed to recurse into submodule path '\\$path'\")\"\n \t\tfi\n \tdone\n }\n@@ -793,7 +793,7 @@ cmd_status()\n \t\t\t\tcd \"$path\" &&\n \t\t\t\tcmd_status $orig_args\n \t\t\t) ||\n-\t\t\tdie \"Failed to recurse into submodule path '$path'\"\n+\t\t\tdie \"$(eval_gettext \"Failed to recurse into submodule path '\\$path'\")\"\n \t\tfi\n \tdone\n }\n-- \n1.7.3.rc1.220.gb4d42\n"},{"id":"150640","messageId":"1284415758-20931-6-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":"1284415758-20931-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 05/12] gettextize: git-submodule $update_module say + die messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:11Z","receivedAt":"2010-09-13T22:09:11Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize $update_module say and die messages. These messages needed\nto be split up to make them translatable.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n git-submodule.sh | 17 ++++++++---------\n 1 files changed, 8 insertions(+), 9 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 1b3132f..2b33c5f 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -479,24 +479,23 @@ cmd_update()\n \t\t\tcase \"$update_module\" in\n \t\t\trebase)\n \t\t\t\tcommand=\"git rebase\"\n-\t\t\t\taction=\"rebase\"\n-\t\t\t\tmsg=\"rebased onto\"\n+\t\t\t\tdie_msg=\"$(eval_gettext \"Unable to rebase '\\$sha1' in submodule path '\\$path'\")\"\n+\t\t\t\tsay_msg=\"$(eval_gettext \"Submodule path '\\$path': rebased into '\\$sha1'\")\"\n \t\t\t\t;;\n \t\t\tmerge)\n \t\t\t\tcommand=\"git merge\"\n-\t\t\t\taction=\"merge\"\n-\t\t\t\tmsg=\"merged in\"\n+\t\t\t\tdie_msg=\"$(eval_gettext \"Unable to rebase '\\$sha1' in submodule path '\\$path'\")\"\n+\t\t\t\tsay_msg=\"$(eval_gettext \"Submodule path '\\$path': merged in '\\$sha1'\")\"\n \t\t\t\t;;\n \t\t\t*)\n \t\t\t\tcommand=\"git checkout $force -q\"\n-\t\t\t\taction=\"checkout\"\n-\t\t\t\tmsg=\"checked out\"\n+\t\t\t\tdie_msg=\"$(eval_gettext \"Unable to rebase '\\$sha1' in submodule path '\\$path'\")\"\n+\t\t\t\tsay_msg=\"$(eval_gettext \"Submodule path '\\$path': checked out '\\$sha1'\")\"\n \t\t\t\t;;\n \t\t\tesac\n \n-\t\t\t(clear_local_git_env; cd \"$path\" && $command \"$sha1\") ||\n-\t\t\tdie \"Unable to $action '$sha1' in submodule path '$path'\"\n-\t\t\tsay \"Submodule path '$path': $msg '$sha1'\"\n+\t\t\t(clear_local_git_env; cd \"$path\" && $command \"$sha1\") || die $die_msg\n+\t\t\tsay $say_msg\n \t\tfi\n \n \t\tif test -n \"$recursive\"\n-- \n1.7.3.rc1.220.gb4d42\n"},{"id":"150646","messageId":"1284415758-20931-7-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":"1284415758-20931-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 06/12] gettextize: git-submodule \"cached cannot be used\" message","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:12Z","receivedAt":"2010-09-13T22:09:12Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize the \"--cached cannot be used with --files\" message. Since\nthis message starts with \"--\" we have to pass \"--\" as the first\nargument. This works with both GNU gettext 0.18.1 (as expected), and\nthe gettext(1) on Solaris 10.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n git-submodule.sh | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 2b33c5f..fcb11d9 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -585,7 +585,7 @@ cmd_summary() {\n \tif [ -n \"$files\" ]\n \tthen\n \t\ttest -n \"$cached\" &&\n-\t\tdie \"--cached cannot be used with --files\"\n+\t\tdie \"$(gettext -- \"--cached cannot be used with --files\")\"\n \t\tdiff_cmd=diff-files\n \t\thead=\n \tfi\n-- \n1.7.3.rc1.220.gb4d42\n"},{"id":"150641","messageId":"1284415758-20931-8-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":"1284415758-20931-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 07/12] gettextize: git-submodule \"Submodule change[...]\" messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:13Z","receivedAt":"2010-09-13T22:09:13Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize the \"Submodules changed but not updated\" and \"Submodule\nchanges to be committed\" messages. This is explicitly tested for so we\nneed to skip some tests with NO_GETTEXT_POISON.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n git-submodule.sh | 4 ++--\n t/t7401-submodule-summary.sh | 2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex fcb11d9..065b343 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -710,9 +710,9 @@ cmd_summary() {\n \tdone |\n \tif test -n \"$for_status\"; then\n \t\tif [ -n \"$files\" ]; then\n-\t\t\techo \"# Submodules changed but not updated:\"\n+\t\t\tgettext \"# Submodules changed but not updated:\"; echo\n \t\telse\n-\t\t\techo \"# Submodule changes to be committed:\"\n+\t\t\tgettext \"# Submodule changes to be committed:\"; echo\n \t\tfi\n \t\techo \"#\"\n \t\tsed -e 's|^|# |' -e 's|^# $|#|'\ndiff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh\nindex 6a320cc..70b2fb1 100755\n--- a/t/t7401-submodule-summary.sh\n+++ b/t/t7401-submodule-summary.sh\n@@ -225,7 +225,7 @@ EOF\n test_cmp expected actual\n \"\n \n-test_expect_success '--for-status' \"\n+test_expect_success NO_GETTEXT_POISON '--for-status' \"\n git submodule summary --for-status HEAD^ >actual &&\n test_cmp actual - <\n---\n git-submodule.sh | 6 +++---\n t/t7401-submodule-summary.sh | 2 +-\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 065b343..d453fe9 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -643,13 +643,13 @@ cmd_summary() {\n \t\ttotal_commits=\n \t\tcase \"$missing_src,$missing_dst\" in\n \t\tt,)\n-\t\t\terrmsg=\" Warn: $name doesn't contain commit $sha1_src\"\n+\t\t\terrmsg=\"$(eval_gettext \" Warn: \\$name doesn't contain commit \\$sha1_src\")\"\n \t\t\t;;\n \t\t,t)\n-\t\t\terrmsg=\" Warn: $name doesn't contain commit $sha1_dst\"\n+\t\t\terrmsg=\"$(eval_gettext \" Warn: \\$name doesn't contain commit \\$sha1_dst\")\"\n \t\t\t;;\n \t\tt,t)\n-\t\t\terrmsg=\" Warn: $name doesn't contain commits $sha1_src and $sha1_dst\"\n+\t\t\terrmsg=\"$(eval_gettext \" Warn: \\$name doesn't contain commits \\$sha1_src and \\$sha1_dst\")\"\n \t\t\t;;\n \t\t*)\n \t\t\terrmsg=\ndiff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh\nindex 70b2fb1..09ef760 100755\n--- a/t/t7401-submodule-summary.sh\n+++ b/t/t7401-submodule-summary.sh\n@@ -154,7 +154,7 @@ EOF\n rm -f sm1 &&\n test_create_repo sm1 &&\n head6=$(add_file sm1 foo6 foo7)\n-test_expect_success 'nonexistent commit' \"\n+test_expect_success NO_GETTEXT_POISON 'nonexistent commit' \"\n git submodule summary >actual &&\n cat >expected <<-EOF &&\n * sm1 $head4...$head6:\n-- \n1.7.3.rc1.220.gb4d42\n"},{"id":"150642","messageId":"1284415758-20931-10-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":"1284415758-20931-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 09/12] gettextize: git-submodule \"Entering [...]\" message","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:15Z","receivedAt":"2010-09-13T22:09:15Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize the \"Entering [...]\" message. This is explicitly tested for\nso we need to skip some tests with NO_GETTEXT_POISON.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n git-submodule.sh | 2 +-\n t/t7407-submodule-foreach.sh | 4 ++--\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex d453fe9..6ec6aa5 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -291,7 +291,7 @@ cmd_foreach()\n \tdo\n \t\tif test -e \"$path\"/.git\n \t\tthen\n-\t\t\tsay \"Entering '$prefix$path'\"\n+\t\t\tsay \"$(eval_gettext \"Entering '\\$prefix\\$path'\")\"\n \t\t\tname=$(module_name \"$path\")\n \t\t\t(\n \t\t\t\tprefix=\"$prefix$path/\"\ndiff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh\nindex 905a8ba..217fe55 100755\n--- a/t/t7407-submodule-foreach.sh\n+++ b/t/t7407-submodule-foreach.sh\n@@ -68,7 +68,7 @@ Entering 'sub3'\n $pwd/clone-foo3-sub3-$sub3sha1\n EOF\n \n-test_expect_success 'test basic \"submodule foreach\" usage' '\n+test_expect_success NO_GETTEXT_POISON 'test basic \"submodule foreach\" usage' '\n \tgit clone super clone &&\n \t(\n \t\tcd clone &&\n@@ -153,7 +153,7 @@ Entering 'sub2'\n Entering 'sub3'\n EOF\n \n-test_expect_success 'test messages from \"foreach --recursive\"' '\n+test_expect_success NO_GETTEXT_POISON 'test messages from \"foreach --recursive\"' '\n \t(\n \t\tcd clone2 &&\n \t\tgit submodule foreach --recursive \"true\" > ../actual\n-- \n1.7.3.rc1.220.gb4d42\n"},{"id":"150644","messageId":"1284415758-20931-11-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":"1284415758-20931-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 10/12] gettextize: git-submodule \"[...] path is ignored\" message","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:16Z","receivedAt":"2010-09-13T22:09:16Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize the \"The following path is ignored\" message. This is\nexplicitly tested for so we need to skip some tests with\nNO_GETTEXT_POISON.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n git-submodule.sh | 6 +++---\n t/t7400-submodule-basic.sh | 2 +-\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 6ec6aa5..cd37bf7 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -208,9 +208,9 @@ cmd_add()\n \n \tif test -z \"$force\" && ! git add --dry-run --ignore-missing \"$path\" > /dev/null 2>&1\n \tthen\n-\t\techo >&2 \"The following path is ignored by one of your .gitignore files:\" &&\n-\t\techo >&2 $path &&\n-\t\techo >&2 \"Use -f if you really want to add it.\"\n+\t\techo >&2 \"$(eval_gettext \"The following path is ignored by one of your .gitignore files:\n+\\$path\n+Use -f if you really want to add it.\")\"\n \t\texit 1\n \tfi\n \ndiff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh\nindex 9bda970..0531dd1 100755\n--- a/t/t7400-submodule-basic.sh\n+++ b/t/t7400-submodule-basic.sh\n@@ -86,7 +86,7 @@ test_expect_success 'submodule add' '\n \ttest_cmp empty untracked\n '\n \n-test_expect_success 'submodule add to .gitignored path fails' '\n+test_expect_success NO_GETTEXT_POISON 'submodule add to .gitignored path fails' '\n \t(\n \t\tcd addtest-ignore &&\n \t\tcat <<-\\EOF >expect &&\n-- \n1.7.3.rc1.220.gb4d42\n"},{"id":"150647","messageId":"1284415758-20931-12-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":"1284415758-20931-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 11/12] gettextize: git-submodule \"path not initialized\" message","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:17Z","receivedAt":"2010-09-13T22:09:17Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize the \"Submodule path '$path' not initialized\" message. This\nis explicitly tested for so we need to skip some tests with\nNO_GETTEXT_POISON.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n git-submodule.sh | 4 ++--\n t/t7400-submodule-basic.sh | 2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex cd37bf7..edf8774 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -441,8 +441,8 @@ cmd_update()\n \t\t\t# Only mention uninitialized submodules when its\n \t\t\t# path have been specified\n \t\t\ttest \"$#\" != \"0\" &&\n-\t\t\tsay \"Submodule path '$path' not initialized\" &&\n-\t\t\tsay \"Maybe you want to use 'update --init'?\"\n+\t\t\tsay \"$(eval_gettext \"Submodule path '\\$path' not initialized\n+Maybe you want to use 'update --init'?\")\"\n \t\t\tcontinue\n \t\tfi\n \ndiff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh\nindex 0531dd1..b25bcb6 100755\n--- a/t/t7400-submodule-basic.sh\n+++ b/t/t7400-submodule-basic.sh\n@@ -349,7 +349,7 @@ test_expect_success 'apply submodule diff' '\n \ttest_cmp empty staged\n '\n \n-test_expect_success 'update --init' '\n+test_expect_success NO_GETTEXT_POISON 'update --init' '\n \tmv init init2 &&\n \tgit config -f .gitmodules submodule.example.url \"$(pwd)/init2\" &&\n \tgit config --remove-section submodule.example &&\n-- \n1.7.3.rc1.220.gb4d42\n"},{"id":"150645","messageId":"1284415758-20931-13-git-send-email-avarab@gmail.com","threadId":"25098","inReplyTo":"1284415758-20931-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 12/12] gettextize: git-submodule \"blob\" and \"submodule\" messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-13T22:09:18Z","receivedAt":"2010-09-13T22:09:18Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize the words \"blob\" and \"submodule\", which will be\ninterpolated in a message emitted by git-submodule. This is\nexplicitly tested for so we need to skip some tests with\nNO_GETTEXT_POISON.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n git-submodule.sh | 6 ++++--\n t/t7401-submodule-summary.sh | 8 ++++----\n 2 files changed, 8 insertions(+), 6 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex edf8774..3de519a 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -674,11 +674,13 @@ cmd_summary() {\n \t\tsha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)\n \t\tif test $status = T\n \t\tthen\n+\t\t\tblob=\"$(gettext \"blob\")\"\n+\t\t\tsubmodule=\"$(gettext \"submodule\")\"\n \t\t\tif test $mod_dst = 160000\n \t\t\tthen\n-\t\t\t\techo \"* $name $sha1_abbr_src(blob)->$sha1_abbr_dst(submodule)$total_commits:\"\n+\t\t\t\techo \"* $name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:\"\n \t\t\telse\n-\t\t\t\techo \"* $name $sha1_abbr_src(submodule)->$sha1_abbr_dst(blob)$total_commits:\"\n+\t\t\t\techo \"* $name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:\"\n \t\t\tfi\n \t\telse\n \t\t\techo \"* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:\"\ndiff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh\nindex 09ef760..a56787a 100755\n--- a/t/t7401-submodule-summary.sh\n+++ b/t/t7401-submodule-summary.sh\n@@ -120,7 +120,7 @@ git add sm1 &&\n rm -f sm1 &&\n mv sm1-bak sm1\n \n-test_expect_success 'typechanged submodule(submodule->blob), --cached' \"\n+test_expect_success NO_GETTEXT_POISON 'typechanged submodule(submodule->blob), --cached' \"\n git submodule summary --cached >actual &&\n cat >expected <<-EOF &&\n * sm1 $head4(submodule)->$head5(blob) (3):\n@@ -130,7 +130,7 @@ EOF\n test_cmp actual expected\n \"\n \n-test_expect_success 'typechanged submodule(submodule->blob), --files' \"\n+test_expect_success NO_GETTEXT_POISON 'typechanged submodule(submodule->blob), --files' \"\n git submodule summary --files >actual &&\n cat >expected <<-EOF &&\n * sm1 $head5(blob)->$head4(submodule) (3):\n@@ -142,7 +142,7 @@ EOF\n \n rm -rf sm1 &&\n git checkout-index sm1\n-test_expect_success 'typechanged submodule(submodule->blob)' \"\n+test_expect_success NO_GETTEXT_POISON 'typechanged submodule(submodule->blob)' \"\n git submodule summary >actual &&\n cat >expected <<-EOF &&\n * sm1 $head4(submodule)->$head5(blob):\n@@ -165,7 +165,7 @@ EOF\n \"\n \n commit_file\n-test_expect_success 'typechanged submodule(blob->submodule)' \"\n+test_expect_success NO_GETTEXT_POISON 'typechanged submodule(blob->submodule)' \"\n git submodule summary >actual &&\n cat >expected <<-EOF &&\n * sm1 $head5(blob)->$head6(submodule) (2):\n-- \n1.7.3.rc1.220.gb4d42\n"}]}