Adding last modifications in order to have localization fully working in live-helper. This commit goes with some pt_BR translations just for testing. Thanks to Antonio Terceiro for helping and coding in some shell stuff.

12 files changed, 16 insertions, 16 deletions

diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index 9691bcc82..0d596b244 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -102,7 +102,7 @@ then
 			# Run "rm" inside the chroot so it cannot possibly remove host files.
 			Chroot "rm -r chroot/${EXCLUDE}"
 		else
-			Echo_warning "Excluded path does not exist: ${EXCLUDE}"
+			Echo_warning "Excluded path does not exist: %s" "${EXCLUDE}"
 		fi
 	done
 fi
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index d72155967..6d6cab90e 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -48,7 +48,7 @@ case "${LH_DEBIAN_INSTALLER}" in
 		;;
 
 	*)
-		Echo_error "debian-installer flavour ${LH_DEBIAN_INSTALLER} not supported."
+		Echo_error "debian-installer flavour %s not supported." "${LH_DEBIAN_INSTALLER}"
 		exit 1
 		;;
 esac
@@ -217,7 +217,7 @@ Download_file () {
 		then
 			rm -f "${_LH_CACHE_FILE}"
 
-			Echo_error "Could not download file: ${_LH_URL}"
+			Echo_error "Could not download file: %s" "${_LH_URL}"
 			exit 1
 		fi
 	fi
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index 22db1df9b..b362ec0fe 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -35,7 +35,7 @@ case "${LH_ENCRYPTION}" in
 		exit 0
 		;;
 	*)
-		Echo_error "Encryption type \"${LH_ENCRYPTION}\" not supported."
+		Echo_error "Encryption type %s not supported." "${LH_ENCRYPTION}"
 		exit 1
 		;;
 esac
@@ -45,7 +45,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		;;
 
 	*)
-		Echo_error "Encryption not yet supported on ${LH_CHROOT_FILESYSTEM} filesystems."
+		Echo_error "Encryption not yet supported on %s filesystems." "${LH_CHROOT_FILESYSTEM}"
 		exit 1
 		;;
 esac
@@ -84,7 +84,7 @@ Restore_cache cache/packages_binary
 # Installing depends
 Install_package
 
-Echo_message "Encrypting binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} with ${LH_ENCRYPTION}..."
+Echo_message "Encrypting binary/%s/filesystem.%s with %s..." "${INITFS}" "${LH_CHROOT_FILESYSTEM}" "${LH_ENCRYPTION}"
 
 if [ "${LH_CHROOT_BUILD}" = "enabled" ]
 then
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index d2086b818..6954377c0 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -54,7 +54,7 @@ then
 	then
 		LH_INCLUDES="../${LH_INCLUDES}"
 	else
-		Echo_error "user specified includes not accessible in ${LH_INCLUDES}"
+		Echo_error "user specified includes not accessible in %s" "${LH_INCLUDES}"
 		exit 1
 	fi
 fi
diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 43c1dc669..903766226 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -95,7 +95,7 @@ then
 			piggyback64 ${DESTDIR}/boot.img ${DEFAULT_MAP} ${ORIGDIR}/${DEFAULT_INITRD}
 			;;
 		*)
-			Echo_error "Invalid default kernel flavour for sparc \"${DEFAULT_FLAVOUR}\""
+			Echo_error "Invalid default kernel flavour for sparc \"%s\"" "${DEFAULT_FLAVOUR}"
 			exit 1;
 			;;
 	esac
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index f0338ae5f..f3abff319 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -245,7 +245,7 @@ Copy_syslinux_templates ()
 		then
 			if [ ! -e "${LH_SYSLINUX_SPLASH}" ]
 			then
-				Echo_error "${LH_SYSLINUX_SPLASH} doen't exist"
+				Echo_error "%s doen't exist" "${LH_SYSLINUX_SPLASH}"
 				exit 1
 			else
 				rm -f ${SCREEN_PATH}/splash.rle
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 4f5e6162f..71a992778 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -124,7 +124,7 @@ case "${LH_BINARY_FILESYSTEM}" in
 		;;
 
 	*)
-		Echo_error "Unsupported binary filesystem ${LH_BINARY_FILESYSTEM}"
+		Echo_error "Unsupported binary filesystem %s" "${LH_BINARY_FILESYSTEM}"
 		exit 1
 		;;
 esac
diff --git a/helpers/lh_chroot_local-patches b/helpers/lh_chroot_local-patches
index ead253ffc..7f77675d3 100755
--- a/helpers/lh_chroot_local-patches
+++ b/helpers/lh_chroot_local-patches
@@ -55,7 +55,7 @@ then
 
 	for PATCH in config/chroot_local-patches/*
 	do
-		Echo_message "Applying patch ${PATCH}..."
+		Echo_message "Applying patch %s..." "${PATCH}"
 		Chroot "patch -p1" < ${PATCH}
 	done
 
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index 4a4331ead..866be3ef4 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -161,7 +161,7 @@ case "${1}" in
 								# operation was ultimately successful.
 								;;
 							*)
-								Echo_error "GPG exited with error status ${_LH_RET}"
+								Echo_error "GPG exited with error status %s" "${_LH_RET}"
 								exit ${_LH_RET}
 								;;
 						esac
diff --git a/helpers/lh_clean b/helpers/lh_clean
index e14bfc70a..574b9614f 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -31,7 +31,7 @@ Set_defaults
 # Avoid cases were users accidentally nuke their config/binary
 if [ ! -d config ] || [ "$(basename ${PWD})" = "config" ]
 then
-	Echo_error "${PWD} is not a good Debian Live working directory to clean."
+	Echo_error "%s is not a good Debian Live working directory to clean." "${PWD}"
 	exit 1
 fi
 
diff --git a/helpers/lh_config b/helpers/lh_config
index 6e1c1afbe..39d7d074d 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -651,7 +651,7 @@ Local_arguments ()
 				;;
 
 			*)
-				Echo_error "internal error ${0}"
+				Echo_error "internal error %s" "${0}"
 				exit 1
 				;;
 		esac
@@ -661,7 +661,7 @@ Local_arguments ()
 # Reading system configuration
 if [ -f "${SYSTEM_LH_CONFFILE}" ] && ! In_list "--ignore-system-defaults" "${@}"
 then
-	Echo_message "Considering defaults defined in ${SYSTEM_LH_CONFFILE}"
+	Echo_message "Considering defaults defined in %s" "${SYSTEM_LH_CONFFILE}"
 	Read_conffile "${SYSTEM_LH_CONFFILE}"
 fi
 
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index 8df36ddbe..71c5eac74 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -88,7 +88,7 @@ case "${LH_BINARY_FILESYSTEM}" in
 		;;
 
 	*)
-		Echo_error "Unsupported binary filesystem ${LH_BINARY_FILESYSTEM}"
+		Echo_error "Unsupported binary filesystem %s" "${LH_BINARY_FILESYSTEM}"
 		exit 1
 		;;
 esac