From 983e293eb157131ca5e085e4927ea5fc220edc73 Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Sat, 18 Jun 2016 11:14:01 +0200 Subject: Replaced text strings to allow translations --- include/tests_scheduling | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'include/tests_scheduling') diff --git a/include/tests_scheduling b/include/tests_scheduling index 78a5f958..08cf0650 100644 --- a/include/tests_scheduling +++ b/include/tests_scheduling @@ -169,12 +169,12 @@ # Show warning when an issue shows up. Even if *both* the permissions and ownership are wrong, just show one (prevent overload of warnings). if [ ${BAD_FILE_PERMISSIONS} -eq 1 ]; then ReportWarning "${TEST_NO}" "Found one or more cronjob files with incorrect file permissions (see log for details)" - Display --indent 2 --text "- Checking crontab/cronjob" --result WARNING --color RED + Display --indent 2 --text "- Checking crontab/cronjob" --result "${STATUS_WARNING}" --color RED elif [ ${BAD_FILE_OWNERSHIP} -eq 1 ]; then ReportWarning "${TEST_NO}" "Found one or more cronjob files with incorrect ownership (see log for details)" - Display --indent 2 --text "- Checking crontab/cronjob" --result WARNING --color RED + Display --indent 2 --text "- Checking crontab/cronjob" --result "${STATUS_WARNING}" --color RED else - Display --indent 2 --text "- Checking crontab/cronjob" --result DONE --color GREEN + Display --indent 2 --text "- Checking crontab/cronjob" --result "${STATUS_DONE}" --color GREEN fi fi @@ -189,12 +189,12 @@ FIND=$(${PSBINARY} ax | grep "/atd" | grep -v "grep") if [ ! "${FIND}" = "" ]; then LogText "Result: at daemon active" - Display --indent 2 --text "- Checking atd status" --result RUNNING --color GREEN + Display --indent 2 --text "- Checking atd status" --result "${STATUS_RUNNING}" --color GREEN ATD_RUNNING=1 Report "scheduler[]=atd" else LogText "Result: at daemon not active" - if IsVerbose; then Display --indent 2 --text "- Checking atd status" --result "NOT RUNNING" --color WHITE; fi + if IsVerbose; then Display --indent 2 --text "- Checking atd status" --result "${STATUS_NOT_RUNNING}" --color WHITE; fi fi fi # @@ -259,9 +259,9 @@ AddHP 1 1 fi fi - Display --indent 4 --text "- Checking at users" --result DONE --color GREEN + Display --indent 4 --text "- Checking at users" --result "${STATUS_DONE}" --color GREEN else - Display --indent 4 --text "- Checking at users" --result SKIPPED --color YELLOW + Display --indent 4 --text "- Checking at users" --result "${STATUS_SKIPPED}" --color YELLOW fi fi # @@ -280,10 +280,10 @@ VALUE=$(echo ${I} | sed 's/!space!/ /g') LogText "Found at job: ${VALUE}" done - Display --indent 4 --text "- Checking at jobs" --result FOUND --color GREEN + Display --indent 4 --text "- Checking at jobs" --result "${STATUS_FOUND}" --color GREEN else LogText "Result: no pending at jobs" - Display --indent 4 --text "- Checking at jobs" --result NONE --color GREEN + Display --indent 4 --text "- Checking at jobs" --result "${STATUS_NONE}" --color GREEN fi fi # -- cgit v1.2.3