Change compare sequence

src/freedombone-installer

@@ -152,43 +152,44 @@ function web_admin_translate {
     declare -a translations_array
     readarray translations_array < "$translations_file"
 
-    #webfile_temp=/tmp/.translationweb
     echo "Starting translations"
     for webfile in "$webadmin_install_dir"/*.html; do
         echo "Translating $webfile"
         webfile_var=$(cat "$webfile")
-
-        #cp "$webfile" "$webfile_temp"
         webfile_changed=
 
         i=0
         while (( ${#translations_array[@]} > i )); do
-            translated_text=$(echo "${translations_array[i]}" | awk -F '|' '{print $2}')
-            if [ "$translated_text" ]; then
-                english_text=$(echo "${translations_array[i]}" | awk -F '|' '{print $1}')
-                if [[ "$webfile_var" == *">$english_text<"* ]]; then
+            translated_text=
+            english_text=$(echo "${translations_array[i]}" | awk -F '|' '{print $1}')
+            if [[ "$webfile_var" == *">$english_text<"* ]]; then
+                translated_text=$(echo "${translations_array[i]}" | awk -F '|' '{print $2}')
+                if [ "$translated_text" ]; then
                     new_webfile_var=$(echo "$webfile_var" | sed "/translate=\"yes\"/s|>$english_text<|>$translated_text<|g")
                     webfile_var=$new_webfile_var
-                    #sed -i "/translate=\"yes\"/s|>$english_text<|>$translated_text<|g" "$webfile_temp";
                     webfile_changed=1
                 fi
-                if [[ "$webfile_var" == *"value=\"$english_text\""* ]]; then
+            fi
+
+            if [[ "$webfile_var" == *"value=\"$english_text\""* ]]; then
+                if [ ! "$translated_text" ]; then
+                    translated_text=$(echo "${translations_array[i]}" | awk -F '|' '{print $2}')
+                fi
+                if [ "$translated_text" ]; then
                     new_webfile_var=$(echo "$webfile_var" | sed "/translate=\"yes\"/s|value=\"$english_text\"|value=\"$translated_text\"|g")
                     webfile_var=$new_webfile_var
-                    #sed -i "/translate=\"yes\"/s|value=\"$english_text\"|value=\"$translated_text\"|g" "$webfile_temp";
                     webfile_changed=1
                 fi
             fi
             i=$((i+1))
         done
+
         if [ $webfile_changed ]; then
             echo "$new_webfile_var" > "$webfile"
-            #cp "$webfile_temp" "$webfile"
         fi
     done
 
     chown www-data:www-data "$webadmin_install_dir"/*.html
-    #rm "$webfile_temp"
     echo "Translations complete"
 }
 

src/freedombone-utils-webadmin

@@ -65,43 +65,44 @@ function web_admin_translate {
     declare -a translations_array
     readarray translations_array < "$translations_file"
 
-    #webfile_temp=/tmp/.translationweb
     echo "Starting translations"
     for webfile in "$webadmin_install_dir"/*.html; do
         echo "Translating $webfile"
         webfile_var=$(cat "$webfile")
-
-        #cp "$webfile" "$webfile_temp"
         webfile_changed=
 
         i=0
         while (( ${#translations_array[@]} > i )); do
-            translated_text=$(echo "${translations_array[i]}" | awk -F '|' '{print $2}')
-            if [ "$translated_text" ]; then
-                english_text=$(echo "${translations_array[i]}" | awk -F '|' '{print $1}')
-                if [[ "$webfile_var" == *">$english_text<"* ]]; then
+            translated_text=
+            english_text=$(echo "${translations_array[i]}" | awk -F '|' '{print $1}')
+            if [[ "$webfile_var" == *">$english_text<"* ]]; then
+                translated_text=$(echo "${translations_array[i]}" | awk -F '|' '{print $2}')
+                if [ "$translated_text" ]; then
                     new_webfile_var=$(echo "$webfile_var" | sed "/translate=\"yes\"/s|>$english_text<|>$translated_text<|g")
                     webfile_var=$new_webfile_var
-                    #sed -i "/translate=\"yes\"/s|>$english_text<|>$translated_text<|g" "$webfile_temp";
                     webfile_changed=1
                 fi
-                if [[ "$webfile_var" == *"value=\"$english_text\""* ]]; then
+            fi
+
+            if [[ "$webfile_var" == *"value=\"$english_text\""* ]]; then
+                if [ ! "$translated_text" ]; then
+                    translated_text=$(echo "${translations_array[i]}" | awk -F '|' '{print $2}')
+                fi
+                if [ "$translated_text" ]; then
                     new_webfile_var=$(echo "$webfile_var" | sed "/translate=\"yes\"/s|value=\"$english_text\"|value=\"$translated_text\"|g")
                     webfile_var=$new_webfile_var
-                    #sed -i "/translate=\"yes\"/s|value=\"$english_text\"|value=\"$translated_text\"|g" "$webfile_temp";
                     webfile_changed=1
                 fi
             fi
             i=$((i+1))
         done
+
         if [ $webfile_changed ]; then
             echo "$new_webfile_var" > "$webfile"
-            #cp "$webfile_temp" "$webfile"
         fi
     done
 
     chown www-data:www-data "$webadmin_install_dir"/*.html
-    #rm "$webfile_temp"
     echo "Translations complete"
 }