diff --git a/src/install.sh b/src/install.sh index e1bce80..93a225c 100644 --- a/src/install.sh +++ b/src/install.sh @@ -453,16 +453,27 @@ detectVersion() { detectLanguage() { local xml="$1" - local lang="${xml#*LANGUAGE>}" + local lang="" - lang="${lang%%<*}" - [ -z "$lang" ] && return 0 + if [[ "$xml" == *"LANGUAGE>"* ]]; then + lang="${xml#*LANGUAGE>}" + lang="${lang%%<*}" + else + if [[ "$xml" == *"FALLBACK>"* ]]; then + lang="${xml#*FALLBACK>}" + lang="${lang%%<*}" + fi + fi + + if [ -z "$lang" ]; then + warn "Language could not be detected from ISO!" && return 0 + fi local culture culture=$(getLanguage "$lang" "culture") [ -n "$culture" ] && LANGUAGE="$lang" && return 0 - warn "Invalid language detected: $lang" + warn "Invalid language detected: \"$lang\"" return 0 } @@ -550,7 +561,7 @@ detectImage() { if [[ "${LANGUAGE,,}" != "en" ]] && [[ "${LANGUAGE,,}" != "en-"* ]]; then language=$(getLanguage "$LANGUAGE" "desc") - desc="$desc in $language" + desc="$desc ($language)" fi info "Detected: $desc"