From f1604c2e554eaa42ecc23dd16fa6be9333273c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane?= <steph78630@gmail.com>
Date: Tue, 5 Jan 2021 11:53:11 +0100
Subject: Add and improvements strings

---
 db/languages/en           |  2 ++
 db/languages/fr           |  4 +++-
 include/tests_filesystems | 10 +++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/db/languages/en b/db/languages/en
index 409b92d5..60be1f74 100644
--- a/db/languages/en
+++ b/db/languages/en
@@ -64,6 +64,7 @@ SECTION_USERS_GROUPS_AND_AUTHENTICATION="Users, Groups and Authentication"
 SECTION_VIRTUALIZATION="Virtualization"
 SECTION_WEBSERVER="Software: webserver"
 STATUS_ACTIVE="ACTIVE"
+STATUS_CHECK_NEEDED="CHECK NEEDED"
 STATUS_DEBUG="DEBUG"
 STATUS_DEFAULT="DEFAULT"
 STATUS_DIFFERENT="DIFFERENT"
@@ -77,6 +78,7 @@ STATUS_FOUND="FOUND"
 STATUS_INSTALLED="INSTALLED"
 STATUS_NO="NO"
 STATUS_NO_UPDATE="NO UPDATE"
+STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="NONE"
 STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 STATUS_NOT_DISABLED="NOT DISABLED"
diff --git a/db/languages/fr b/db/languages/fr
index 8b99e548..21355c0c 100644
--- a/db/languages/fr
+++ b/db/languages/fr
@@ -39,7 +39,7 @@ SECTION_KERNEL="Noyau"
 SECTION_KERNEL_HARDENING="Kernel Hardening"
 SECTION_LDAP_SERVICES="Services LDAP"
 SECTION_LOGGING_AND_FILES="Journalisation et fichiers"
-SECTION_MALWARE="Logiciel : Malveillant"
+SECTION_MALWARE="Logiciel : Malveillants"
 SECTION_MEMORY_AND_PROCESSES="Mémoire et processus"
 SECTION_NAME_SERVICES="Services de noms"
 SECTION_NETWORKING="Mise en réseau"
@@ -64,6 +64,7 @@ SECTION_USERS_GROUPS_AND_AUTHENTICATION="Utilisateurs, groupes et authentificati
 SECTION_VIRTUALIZATION="Virtualisation"
 SECTION_WEBSERVER="Logiciel : Serveur web"
 STATUS_ACTIVE="ACTIF"
+STATUS_CHECK_NEEDED="VÉRIFICATION NÉCESSAIRE"
 STATUS_DEBUG="DÉBUG"
 STATUS_DEFAULT="PAR DÉFAUT"
 STATUS_DIFFERENT="DIFFÉRENT"
@@ -77,6 +78,7 @@ STATUS_FOUND="TROUVÉ"
 STATUS_INSTALLED="INSTALLÉ"
 STATUS_NO="NON"
 STATUS_NO_UPDATE="PAS DE MISE A JOUR"
+STATUS_NON_DEFAULT="PAS PAR DÉFAUT"
 STATUS_NONE="AUCUN"
 STATUS_NOT_CONFIGURED="NON CONFIGURÉ"
 STATUS_NOT_DISABLED="NON DESACTIVÉ"
diff --git a/include/tests_filesystems b/include/tests_filesystems
index 0de387f7..a2ae58cd 100644
--- a/include/tests_filesystems
+++ b/include/tests_filesystems
@@ -327,7 +327,7 @@
             Display --indent 2 --text "- Testing swap partitions" --result "${STATUS_OK}" --color GREEN
             LogText "Result: all swap partitions have correct options (sw or swap)"
         else
-            Display --indent 2 --text "- Testing swap partitions" --result "CHECK NEEDED" --color YELLOW
+            Display --indent 2 --text "- Testing swap partitions" --result "${STATUS_CHECK_NEEDED}" --color YELLOW
             LogText "Result: possible incorrect mount options used for mounting swap partition (${FIND})"
             #ReportWarning "${TEST_NO}" "Possible incorrect mount options used for swap partition (${FIND})"
             ReportSuggestion "${TEST_NO}" "Check your /etc/fstab file for swap partition mount options"
@@ -535,7 +535,7 @@
                 if [ "${FIND}" = "defaults" ]; then
                     Display --indent 2 --text "- Mount options of /" --result "${STATUS_OK}" --color GREEN
                 else
-                    Display --indent 2 --text "- Mount options of /" --result "NON DEFAULT" --color YELLOW
+                    Display --indent 2 --text "- Mount options of /" --result "${STATUS_NON_DEFAULT}" --color YELLOW
                 fi
             else
                 LogText "Result: no mount point / or expected options found"
@@ -616,11 +616,11 @@
                         # if 
                         if ContainsString "defaults" "${FOUND_FLAGS}"; then
                             LogText "Result: marked ${FILESYSTEM} options as default (not hardened)"
-                            Display --indent 2 --text "- Mount options of ${FILESYSTEM}" --result DEFAULT --color YELLOW
+                            Display --indent 2 --text "- Mount options of ${FILESYSTEM}" --result "${STATUS_DEFAULT}" --color YELLOW
                             AddHP 3 5
                         else
                             LogText "Result: marked ${FILESYSTEM} options as non-default (unclear about hardening)"
-                            Display --indent 2 --text "- Mount options of ${FILESYSTEM}" --result "NON DEFAULT" --color YELLOW
+                            Display --indent 2 --text "- Mount options of ${FILESYSTEM}" --result "${STATUS_NON_DEFAULT}" --color YELLOW
                             AddHP 4 5
                         fi
                     fi
@@ -653,7 +653,7 @@
                     Display --indent 2 --text "- /var/tmp is bound to /tmp" --result "${STATUS_OK}" --color GREEN
                     LogText "Result : /var/tmp is bind to /tmp"
                 else
-                    Display --indent 2 --text "- /var/tmp is not bound to /tmp" --result "NON DEFAULT" --color YELLOW
+                    Display --indent 2 --text "- /var/tmp is not bound to /tmp" --result "${STATUS_NON_DEFAULT}" --color YELLOW
                     LogText "Result: /var/tmp is not bind to /tmp"
                 fi
             else
-- 
cgit v1.2.3