From 56384e572d419a48439a90b9481a715a13a109c8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 5 Jan 2014 17:09:11 -0500
Subject: src/lib/: set TEXTDOMAIN differently for internal messages

This allows us to fix the long-standing bug that libremessages forces
TEXTDOMAIN=libretools
---
 src/lib/librelib | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'src/lib/librelib')

diff --git a/src/lib/librelib b/src/lib/librelib
index a58f5d3..3b05e37 100755
--- a/src/lib/librelib
+++ b/src/lib/librelib
@@ -16,18 +16,31 @@
 
 default_libdir=/usr/lib/libretools
 
-if ! type gettext &>/dev/null; then
-	gettext() { echo "$@"; }
+if type gettext &>/dev/null; then
+	_() { gettext "$@"; }
+else
+	_() { echo "$@"; }
 fi
 
+_l() {
+	TEXTDOMAIN='librelib' TEXTDOMAINDIR='/usr/share/locale' "$@"
+}
+
 print() {
-	mesg=$1
+	local mesg="$(_ "$1")"
 	shift
-	printf -- "$(gettext "$mesg")\n" "$@"
+	printf -- "$mesg\n" "$@"
+}
+
+_html_whitespace_collapse() {
+	[[ $# == 0 ]] || panic
+	tr '\n' ' ' | sed -r -e 's/\t/ /g' -e 's/  +/ /g'
 }
 
 prose() {
-	print "$@" | fmt -su
+	[[ $# -ge 1 ]] || panic
+	local mesg="$(_ "$(_html_whitespace_collapse <<<"$1")")"; shift
+	printf -- "$mesg" "$@" | fmt -u
 }
 
 cmd=${0##*/}
@@ -54,11 +67,11 @@ usage() {
 
 main() {
 	if [[ $# != 1 ]]; then
-		usage >&2
+		_l usage >&2
 		return 2
 	fi
 	if [[ $1 == '-h' ]]; then
-		usage
+		_l usage
 		return 0;
 	fi
 
@@ -76,7 +89,7 @@ main() {
 			return 0;
 		fi
 	done
-	print '%s: could not find library: %s' "$cmd" "$lib" >> /dev/stderr
+	_l print '%s: could not find library: %s' "$cmd" "$lib" >> /dev/stderr
 	return 1
 }
 
-- 
cgit v1.2.2