From fab966da90f2cd5f6b93ba3e1047e8b16f2c5f15 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 18 May 2024 14:29:31 +0200
Subject: [PATCH] Update install.sh

---
 src/install.sh | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

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><DEFAULT>}"
+  local lang=""
 
-  lang="${lang%%<*}"
-  [ -z "$lang" ] && return 0
+  if [[ "$xml" == *"LANGUAGE><DEFAULT>"* ]]; then
+    lang="${xml#*LANGUAGE><DEFAULT>}"
+    lang="${lang%%<*}"
+  else
+    if [[ "$xml" == *"FALLBACK><DEFAULT>"* ]]; then
+      lang="${xml#*FALLBACK><DEFAULT>}"
+      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"