diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-12 00:08:48 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-12 00:08:48 (EDT) |
| commit | 71125c6f8e6c55e38a1b4be70c9d181de9ad358d (patch) | |
| tree | 2f860d1e1f8523dfcd661cacebff21a8593a91ef /lib | |
| parent | f0c37c2b1e6ac6b3373b62e484bd4e6f8f8d441c (diff) | |
_ob_parse_control_error(): Use _ob_warn_msg()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/control.sh | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/control.sh b/lib/control.sh index 727fafa..9e8bb71 100644 --- a/lib/control.sh +++ b/lib/control.sh @@ -25,7 +25,6 @@ _ob_parse_control_error() local line_nr= local msg_id= local file_info= - local orig_text_domain= file="${1}" line_nr="${2}" @@ -33,20 +32,12 @@ _ob_parse_control_error() shift 3 if [ ${line_nr} -eq 0 ]; then - file_info="$(printf '%20s:' "${file}")" + file_info="$(printf '%20s' "${file}")" else - file_info="$(printf '%20s(l%d):' "${file}" "${line_nr}")" + file_info="$(printf '%20s(l%d)' "${file}" "${line_nr}")" fi - # TODO: Use _ob_warn_msg(), add "%s: " prefix to locale messages, and - # drop ":" from file_info above. - - orig_text_domain="$(ob_get_text_domain)" - ob_set_text_domain "${_OB_INTERNAL_TEXT_DOMAIN}" - - ob_warn "${file_info} $(ob_get_msg "${msg_id}")" "${@}" - - ob_set_text_domain "${orig_text_domain}" + _ob_warn_msg "${msg_id}" "${file_info}" "${@}" return 0 } |