[PATCH 16/20] gettextize: git-am cannot_fallback messages
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2016-06-15 22:49:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
Translate messages with gettext(1) before they're passed to the cannot_fallback function, just like we handle the die function. Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- git-am.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 4bee325..8e894e5 100755
--- a/git-am.sh
+++ b/git-am.sh@@ -108,7 +108,7 @@ fall_back_3way () { "$dotest/patch" && GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ git write-tree >"$dotest/patch-merge-base+" || - cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge." + cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")" say Using index info to reconstruct a base tree... if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
@@ -117,8 +117,8 @@ fall_back_3way () { mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base" mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index" else - cannot_fallback "Did you hand edit your patch? -It does not apply to blobs recorded in its index." + cannot_fallback "$(gettext "Did you hand edit your patch? +It does not apply to blobs recorded in its index.")" fi test -f "$dotest/patch-merge-index" &&
--
1.7.2.3.313.gcd15