Merge branch 'feature/56299_more_language_variability_in_scripts' into 'master'

More language variability in scripts

See merge request os2borgerpc/os2borgerpc-scripts!219

Author: Andreas Poulsen

common/system/on_off_schedule_remove.sh

@@ -33,7 +33,7 @@ if ! get_os2borgerpc_config os2_product | grep --quiet kiosk; then
   USERCRON=/tmp/usercron
   crontab -u user -l > $USERCRON
   if [ -f $USERCRON ]; then
-    sed --in-place "/lukker/d" $USERCRON
+    sed --in-place "/zenity/d" $USERCRON
     crontab -u user $USERCRON
   fi
   rm --force $USERCRON

common/system/on_off_schedule_set.sh

@@ -147,6 +147,7 @@ import os
 
 FILE = "$WAKE_PLAN_FILE" # "/etc/os2borgerpc/" + "$PLAN_NAME"
 MODE = "$MODE".lower()
+LOCALE_FILE = "/etc/default/locale"
 
 def check_weekday(plan, date):
     """Helper method that returns the week plan settings for the week day
@@ -318,7 +319,17 @@ def main():
 
     # Check the product type and add a notification 5 minutes before shutdown on OS2BorgerPC machines
     if plan['product'] == 'os2borgerpc':
-        MESSAGE = 'ADVARSEL: Denne computer lukker ned om fem minutter'
+        # Set the notification text based on the chosen language
+        locale = "None"
+        if os.path.exists(LOCALE_FILE):
+            with open(LOCALE_FILE, "r") as file:
+                locale = file.read()
+        if 'LANG=sv' in locale or 'LANG="sv' in locale:
+            MESSAGE = 'VARNING: Den här datorn stängs av om fem minuter'
+        elif 'LANG=en' in locale or 'LANG="en' in locale:
+            MESSAGE = 'WARNING: This computer will shut down in five minutes'
+        else:
+            MESSAGE = 'ADVARSEL: Denne computer lukker ned om fem minutter'
         # Find the time 5 minutes before shutdown
         notify_time = shutdown - datetime.timedelta(minutes=5)
         # Get current entries
@@ -330,7 +341,7 @@ def main():
             cronentries = cronfile.readlines()
         with open(USERCRON, 'w') as cronfile:
             for entry in cronentries:
-                if "lukker" not in entry:
+                if "zenity" not in entry and "notify-send" not in entry:
                     cronfile.write(entry)
         # Add notification for next shutdown
         with open(USERCRON, 'a') as cronfile:

common/system/shutdown_and_wakeup.sh

@@ -39,7 +39,13 @@ fi
 
 ROOTCRON_TMP=/tmp/oldcron
 USERCRON_TMP=/tmp/usercron
-MESSAGE="Denne computer lukker ned om fem minutter"
+if grep "LANG=" /etc/default/locale | grep "sv"; then
+  MESSAGE="Den här datorn stängs av om fem minuter"
+elif grep "LANG=" /etc/default/locale | grep "en"; then
+  MESSAGE="This computer will shut down in five minutes"
+else
+  MESSAGE="Denne computer lukker ned om fem minutter"
+fi
 
 mkdir --parents "$(dirname $SCHEDULED_OFF_SCRIPT)"
 
@@ -49,7 +55,7 @@ crontab -u user -l > $USERCRON_TMP
 
 # Delete current crontab entries related to this script AND shutdown_at_time
 sed --in-place --expression "/rtcwake/d" --expression "/scheduled_off/d" --expression "/shutdown/d" $ROOTCRON_TMP
-sed --in-place "/lukker/d" $USERCRON_TMP
+sed --in-place "/notify-send/d" $USERCRON_TMP
 
 if [ "$1" == "--off" ]; then
     rm --force $SCHEDULED_OFF_SCRIPT

common/system/shutdown_at_time.sh

@@ -30,15 +30,21 @@ fi
 
 ROOTCRON_TMP=/tmp/oldcron
 USERCRON_TMP=/tmp/usercron
-MESSAGE="Denne computer lukker ned om fem minutter"
+if grep "LANG=" /etc/default/locale | grep "sv"; then
+  MESSAGE="Den här datorn stängs av om fem minuter"
+elif grep "LANG=" /etc/default/locale | grep "en"; then
+  MESSAGE="This computer will shut down in five minutes"
+else
+  MESSAGE="Denne computer lukker ned om fem minutter"
+fi
 
 # Read and save current cron settings first
 crontab -l > $ROOTCRON_TMP
 crontab -u user -l > $USERCRON_TMP
 
 # Delete current crontab entries related to this script AND shutdown_and_wakeup.sh
 sed --in-place --expression "/shutdown/d" --expression "/rtcwake/d" --expression "/scheduled_off/d" $ROOTCRON_TMP
-sed --in-place "/lukker/d" $USERCRON_TMP
+sed --in-place "/notify-send/d" $USERCRON_TMP
 
 # If not called with --off: Determine the new crontab contents
 if [ "$1" != "--off" ]; then