Language variability in protect_terminal

Author: Andreas Poulsen

os2borgerpc/sikkerhed/adjust_settings_access.sh

@@ -41,13 +41,10 @@ else # Remove access to settings
 
 USER=\$(id -un)
 
-# Extract the line in /etc/default/locale where LANG is set
-LOCALE_VAR=\$(grep LANG= /etc/default/locale)
-
 # Set the info text based on the chosen language
-if echo \$LOCALE_VAR | grep sv; then
+if echo \$LANG | grep sv; then
   INFO="Systeminställningarna är inte tillgängliga för allmänheten.\n\nKontakta personalen om det uppstår problem."
-elif echo \$LOCALE_VAR | grep en; then
+elif echo \$LANG | grep en; then
   INFO="The settings are not accessible to the public.\n\nContact the staff if there are issues."
 else
   INFO="Systemindstillingerne er ikke tilgængelige for publikum.\n\nKontakt personalet, hvis der er problemer."

os2borgerpc/sikkerhed/desktop_toggle_writable.sh

@@ -53,7 +53,7 @@ if [ "$ACTIVATE" = 'True' ]; then
 	# Prepend temporarily setting DESKTOP mutable before copying new files in, as otherwise that will fail
 	# We first determine the name of the user desktop directory as before
 	sed -i "/USERNAME=\"$USERNAME\"/a \
-export \$(grep LANG= \/etc\/default\/locale)\n\
+export \$(grep LANG= \/etc\/default\/locale | tr -d \'\"\')\n\
 runuser -u $USERNAME xdg-user-dirs-update\n\
 DESKTOP=\$(runuser -u $USERNAME xdg-user-dir DESKTOP)\n\
 chattr -i \$DESKTOP" $USER_CLEANUP

os2borgerpc/sikkerhed/protect_terminal.sh

@@ -39,16 +39,25 @@ else # Deny access
   fi
 
 	cat <<- EOF > "$PROGRAM_OLD_PATH"
-		#!/bin/bash
+#!/bin/bash
 
-		USER=\$(id -un)
+USER=\$(id -un)
 
-		if [ \$USER == "user" ]; then
-		  zenity --info --text="Terminalen er ikke tilgængelig for publikum."
-		else
-		  "$PROGRAM_NEW_PATH"
-		fi
-	EOF
+# Set the info text based on the chosen language
+if echo \$LANG | grep sv; then
+  INFO="Terminalen är inte tillgänglig för allmänheten."
+elif echo \$LANG | grep en; then
+  INFO="The terminal is not accessible to the public."
+else
+  INFO="Terminalen er ikke tilgængelig for publikum."
+fi
+
+if [ \$USER == "user" ]; then
+  zenity --info --text="\$INFO"
+else
+  "$PROGRAM_NEW_PATH"
+fi
+EOF
 
   chmod +x "$PROGRAM_OLD_PATH"