From d283d62bcd67c0d3ca5a72128e87cffc68ddbe7a Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Mon, 11 Mar 2019 21:07:11 -0400 Subject: ob_set_text_domain(): Don't print warning message on error --- diff --git a/TODO b/TODO index 0af94d3..d9468a9 100644 --- a/TODO +++ b/TODO @@ -43,6 +43,8 @@ Tasks * Upload everything always. * Drop mksysconf. * Internationalize "Error:" and "Warning:" in `ob_error()` and `ob_warn()`. + * In executables, print error (using `printf`) and exit if + `ob_set_text_domain()` fails. Copyright --------- diff --git a/lib/locale.sh b/lib/locale.sh index 5197904..ae3c88c 100644 --- a/lib/locale.sh +++ b/lib/locale.sh @@ -64,7 +64,6 @@ _ob_try_load_messages() ## @operand text_domain req The message domain to load. ## @return Returns 0 on success, 1 if the message domain cannot be loaded, or ## 125 if \fItext_domain\fP is missing. -## @stderr Prints a warning to stderr if the message domain cannot be loaded. ## @pure no This function sets an internal global variable and loads a message ## catalog that sets numerous message variables. ob_set_text_domain() @@ -99,11 +98,6 @@ ob_set_text_domain() if ! _ob_try_load_messages "${LC_MESSAGES%.*}"; then if ! _ob_try_load_messages "${LC_MESSAGES%_*}"; then if ! _ob_try_load_messages "${_OB_DEFAULT_LOCALE}"; then - # TODO: Move this warning to the executables. - # TODO: And use printf, since ob_warn() will be - # internationalized. - ob_warn 'Cannot load messages in "%s" domain.' \ - "${_OB_TEXT_DOMAIN}" return 1 fi fi -- cgit v0.9.1