Commit 88f42b61 authored by Andrew Janke's avatar Andrew Janke
Browse files

Add support for variant "utf8" locale suffix spelling. Fix dumb bug in iconv...

Add support for variant "utf8" locale suffix spelling. Fix dumb bug in iconv call that would cause it to hang.
parent cb37c934
...@@ -64,12 +64,12 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then ...@@ -64,12 +64,12 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
# Returns nonzero if encoding failed # Returns nonzero if encoding failed
function _omz_urlencode() { function _omz_urlencode() {
local str=$1 local str=$1
local url_str='' local url_str=""
# URLs must use UTF-8 encoding; convert if required # URLs must use UTF-8 encoding; convert if required
local encoding=${LC_CTYPE/*./} local encoding=${LC_CTYPE/*./}
if [[ -n $encoding && $encoding != UTF-8 ]]; then if [[ -n $encoding && $encoding != UTF-8 && $encoding != utf8 ]]; then
str=$(iconv -f $encoding -t UTF-8) str=$(echo $str | iconv -f $encoding -t UTF-8)
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
echo "Error converting string from $encoding to UTF-8" >&2 echo "Error converting string from $encoding to UTF-8" >&2
return 1 return 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment