summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-01-01 17:50:13 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:32 +0100
commit383519bff306569c09dfb08b40434a9dea4bc7e1 (patch)
tree981ce6e1c63aa6c18e9c62e61212e9fbd598b672 /functions
parent339a910c82d8a580199fbafabec60aa4232c68df (diff)
downloadvyos-live-build-383519bff306569c09dfb08b40434a9dea4bc7e1.tar.gz
vyos-live-build-383519bff306569c09dfb08b40434a9dea4bc7e1.zip
Removing l10n support for 2.0 branch.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/echo.sh63
-rwxr-xr-xfunctions/l10n.sh27
2 files changed, 9 insertions, 81 deletions
diff --git a/functions/echo.sh b/functions/echo.sh
index 555bc42bb..336a92886 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -13,12 +13,7 @@ Echo ()
STRING="${1}"
shift
- if [ "${_L10N}" = "false" ]
- then
- printf "${STRING}\n" "${@}"
- else
- printf "$(eval_gettext "${STRING}")" "${@}"; echo;
- fi
+ printf "${STRING}\n" "${@}"
}
Echo_debug ()
@@ -28,12 +23,7 @@ Echo_debug ()
STRING="${1}"
shift
- if [ "${_L10N}" = "false" ]
- then
- printf "D: ${STRING}\n" "${@}"
- else
- printf "D: $(eval_gettext "${STRING}")" "${@}"; echo;
- fi
+ printf "D: ${STRING}\n" "${@}"
fi
}
@@ -44,12 +34,7 @@ Echo_debug_running ()
STRING="${1}"
shift
- if [ "${_L10N}" = "false" ]
- then
- printf "D: ${STRING}" "${@}"
- else
- printf "D: $(eval_gettext "${STRING}")" "${@}"
- fi
+ printf "D: ${STRING}" "${@}"
if [ "${_COLOR}" = "false" ]
then
@@ -72,12 +57,7 @@ Echo_error ()
printf "${RED}E${NO_COLOR}:"
fi
- if [ "${_L10N}" = "false" ]
- then
- printf " ${STRING}\n" "${@}" >&2
- else
- (printf " $(eval_gettext "${STRING}")" "${@}"; echo;) >&2
- fi
+ printf " ${STRING}\n" "${@}" >&2
}
Echo_message ()
@@ -94,12 +74,7 @@ Echo_message ()
printf "${WHITE}P${NO_COLOR}:"
fi
- if [ "${_L10N}" = "false" ]
- then
- printf " ${STRING}\n" "${@}"
- else
- printf " $(eval_gettext "${STRING}")" "${@}"; echo;
- fi
+ printf " ${STRING}\n" "${@}"
fi
}
@@ -117,12 +92,7 @@ Echo_message_running ()
printf "${WHITE}P${NO_COLOR}:"
fi
- if [ "${_L10N}" = "false" ]
- then
- printf " ${STRING}" "${@}"
- else
- printf " $(eval_gettext "${STRING}")" "${@}";
- fi
+ printf " ${STRING}" "${@}"
if [ "${_COLOR}" = "false" ]
then
@@ -140,12 +110,7 @@ Echo_verbose ()
STRING="${1}"
shift
- if [ "${_L10N}" = "false" ]
- then
- printf "I: ${STRING}\n" "${@}"
- else
- printf "I: $(eval_gettext "${STRING}")" "${@}"; echo;
- fi
+ printf "I: ${STRING}\n" "${@}"
fi
}
@@ -156,12 +121,7 @@ Echo_verbose_running ()
STRING="${1}"
shift
- if [ "${_L10N}" = "false" ]
- then
- printf "I: ${STRING}" "${@}"
- else
- printf "I: $(eval_gettext "${STRING}")" "${@}";
- fi
+ printf "I: ${STRING}" "${@}"
if [ "${_COLOR}" = "false" ]
then
@@ -184,12 +144,7 @@ Echo_warning ()
printf "${YELLOW}W${NO_COLOR}:"
fi
- if [ "${_L10N}" = "false" ]
- then
- printf " ${STRING}\n" "${@}"
- else
- printf " $(eval_gettext "${STRING}")" "${@}"; echo;
- fi
+ printf " ${STRING}\n" "${@}"
}
Echo_status ()
diff --git a/functions/l10n.sh b/functions/l10n.sh
deleted file mode 100755
index d32106b69..000000000
--- a/functions/l10n.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-##
-## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-if [ -x "$(which gettext.sh 2>/dev/null)" ] && Find_files /usr/share/locale/*/LC_MESSAGES/${PACKAGE}.mo
-then
- _L10N="true"
-
- # gettext domain (.mo file name)
- TEXTDOMAIN="${PACKAGE}"
- export TEXTDOMAIN
-
- # locale dir for gettext codes
- TEXTDOMAINDIR="/usr/share/locale"
- export TEXTDOMAINDIR
-
- # load gettext functions
- . gettext.sh
-else
- _L10N="false"
-fi