From 1e34e0b996205dd4d29c7341e7aeae0dc5c45301 Mon Sep 17 00:00:00 2001
From: Aidaho <aidaho@roxy-wi.org>
Date: Sat, 29 Apr 2023 09:30:58 +0300
Subject: [PATCH] v6.3.10.0

Changelog: https://roxy-wi.org/changelog#6_3_10
---
 app/options.py                     | 7 +++----
 app/templates/languages/en.html    | 6 ++++++
 app/templates/languages/fr.html    | 6 ++++++
 app/templates/languages/pt-br.html | 6 ++++++
 app/templates/languages/ru.html    | 6 ++++++
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/options.py b/app/options.py
index 8e6d0f0b..8e907645 100644
--- a/app/options.py
+++ b/app/options.py
@@ -780,8 +780,7 @@ if form.getvalue('updatehapwiserver') is not None:
     service = form.getvalue('service_name')
     sql.update_hapwi_server(hapwi_id, alert, metrics, active, service)
     server_ip = sql.select_server_ip_by_id(hapwi_id)
-    roxywi_common.logging(server_ip, f'The server {name} has been updated ', roxywi=1, login=1, keep_history=1,
-                  service=service)
+    roxywi_common.logging(server_ip, f'The server {name} has been updated ', roxywi=1, login=1, keep_history=1, service=service)
 
 if form.getvalue('updateserver') is not None:
     name = form.getvalue('updateserver')
@@ -1273,7 +1272,7 @@ if form.getvalue('awsinit') or form.getvalue('doinit') or form.getvalue('gcorein
         print('error: ' + stderr)
     else:
         if "Terraform initialized in an empty directory" in output[0]:
-            print('error: There is not need modules')
+            print('error: There is not need module')
         elif "mkdir .terraform: permission denied" in output[0]:
             print('error: Cannot init. Check permission to folder')
 
@@ -1842,7 +1841,7 @@ if form.getvalue('gcoreeditworkspace'):
         ):
 
             try:
-                cmd = 'cd scripts/terraform/ && sudo terraform workspace select ' + workspace + '_' + group + '_gcore'
+                cmd = f'cd scripts/terraform/ && sudo terraform workspace select {workspace}_{group}_gcore'
                 output, stderr = server_mod.subprocess_execute(cmd)
             except Exception as e:
                 print('error: ' + str(e))
diff --git a/app/templates/languages/en.html b/app/templates/languages/en.html
index 6cd7a928..8aa4cc7c 100644
--- a/app/templates/languages/en.html
+++ b/app/templates/languages/en.html
@@ -161,6 +161,7 @@
         "checker_check_interval": "Threshold value for maxconn alerting, in %",
         "smon_ssl_expire_warning_alert": "Warning alert about a SSL certificate expiration (in days)",
         "smon_ssl_expire_critical_alert": "Critical alert about a SSL certificate expiration (in days)",
+        "action_keep_history_range": "Retention period for Action history (in days)",
         },
     "main": {
         "time_zone": "Time Zone",
@@ -861,5 +862,10 @@
     "processes": "processes",
     "position": "position",
     "global": "global",
+    "none": "none",
+    "headers": "headers",
+    "value": "value",
+    "if": "if",
+    "then": "then",
     }
 %}
diff --git a/app/templates/languages/fr.html b/app/templates/languages/fr.html
index 9226f630..806a7a83 100644
--- a/app/templates/languages/fr.html
+++ b/app/templates/languages/fr.html
@@ -161,6 +161,7 @@
         "checker_check_interval": "Valeur du seuil pour les alertes maxconn, en %",
         "smon_ssl_expire_warning_alert": "Alerte type warning dès qu'un certificat SSL expire (en jours)",
         "smon_ssl_expire_critical_alert": "Alerte tpye critical dès qu'un certificat SSL expire (en jours)",
+        "action_keep_history_range": "Période de conservation de l'historique des actions (en jours)",
         },
     "main": {
         "time_zone": "Fuseau horaire",
@@ -861,5 +862,10 @@
     "processes": "processus",
     "position": "position",
     "global": "mondial",
+    "none": "aucun",
+    "headers": "en-têtes",
+    "value": "valeur",
+    "if": "si",
+    "then": "alors",
     }
 %}
diff --git a/app/templates/languages/pt-br.html b/app/templates/languages/pt-br.html
index 42386d81..e9418bd2 100644
--- a/app/templates/languages/pt-br.html
+++ b/app/templates/languages/pt-br.html
@@ -161,6 +161,7 @@
         "checker_check_interval": "Valor limite para a notificação de maxconn, em %",
         "smon_ssl_expire_warning_alert": "Aviso de alerta sobre a expiração do certificado SSL (em dias)",
         "smon_ssl_expire_critical_alert": "Alerta critico a expiração do certificado SSL (em dias)"
+        "action_keep_history_range": "Período de retenção do histórico de ações (em dias)",
         },
     "main": {
         "time_zone": "Fuso horário.",
@@ -861,5 +862,10 @@
     "processes": "processos",
     "position": "posição",
     "global": "global",
+    "none": "nenhum",
+    "headers": "cabeçalhos",
+    "value": "valor",
+    "if": "se",
+    "then": "então",
     }
 %}
diff --git a/app/templates/languages/ru.html b/app/templates/languages/ru.html
index 4973b4ea..0151a2a0 100644
--- a/app/templates/languages/ru.html
+++ b/app/templates/languages/ru.html
@@ -161,6 +161,7 @@
         "checker_check_interval": "Порог срабатывания уведомления по maxconn, в %",
         "smon_ssl_expire_warning_alert": "Предупреждение о истечении SSL-сертификата (в днях)",
         "smon_ssl_expire_critical_alert": "Критическое предупреждение о истечении SSL-сертификата (в днях)",
+        "action_keep_history_range": "Время хранения истории действий (в днях)",
         },
     "main": {
         "time_zone": "Временная зона",
@@ -861,5 +862,10 @@
     "processes": "процессов",
     "position": "позицию",
     "global": "глобальный",
+    "none": "нет",
+    "headers": "заголовки",
+    "value": "значение",
+    "if": "если",
+    "then": "тогда",
     }
 %}