summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorVasco Almeida <vascomalmeida@sapo.pt>2016-06-17 20:21:02 +0000
committerJunio C Hamano <gitster@pobox.com>2016-06-17 15:45:48 -0700
commitd323c6b6410dee0a8a2471b4dbf6d631cd3c3d4d (patch)
treeb5f14560f64709fb35d03e34faeeb80d9ffa9819 /git-merge-octopus.sh
parentc9e6ce41daffb707b33f05dc133bb0dd0493f77b (diff)
downloadgit-d323c6b6410dee0a8a2471b4dbf6d631cd3c3d4d.tar.gz
i18n: git-sh-setup.sh: mark strings for translation
Positional arguments, such as $0, $1, etc, need to be stored on shell variables for use in translatable strings, according to gettext manual [1]. Add git-sh-setup.sh to LOCALIZED_SH variable in Makefile to enable extraction of string marked for translation by xgettext. Source git-sh-i18n in git-sh-setup.sh for gettext support. git-sh-setup.sh is a shell library to be sourced by other shell scripts. In order to avoid other scripts from sourcing git-sh-i18n twice, remove line that sources it from them. Not sourcing git-sh-i18n in any script that uses gettext would lead to failure due to, for instance, gettextln not being found. [1] http://www.gnu.org/software/gettext/manual/html_node/Preparing-Shell-Scripts.html Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
-rwxr-xr-xgit-merge-octopus.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index d79fc84029..308eafd1d3 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -6,7 +6,6 @@
#
. git-sh-setup
-. git-sh-i18n
LF='
'