From 48045e9696d6ea7f05c88de72ac98eb9fdcec844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20T=C5=99=C3=AD=C5=A1ka?= <radek@fastlinux.eu>
Date: Sat, 1 Dec 2018 02:33:16 +0000
Subject: [PATCH 1/3] Localization extension (debug.php)
---
data/web/debug.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/web/debug.php b/data/web/debug.php
index 78d606cc..68b1a5a0 100644
--- a/data/web/debug.php
+++ b/data/web/debug.php
@@ -9,8 +9,8 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
<div class="container">
<ul class="nav nav-tabs" role="tablist">
- <li role="presentation" class="active"><a href="#tab-containers" aria-controls="tab-containers" role="tab" data-toggle="tab">Containers & System</a></li>
- <li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Logs
+ <li role="presentation" class="active"><a href="#tab-containers" aria-controls="tab-containers" role="tab" data-toggle="tab"><?=$lang['debug']['system_containers'];?></a></li>
+ <li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#"><?=$lang['debug']['logs'];?>
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li role="presentation"><span class="dropdown-desc"><?=$lang['debug']['in_memory_logs'];?></span></li>
@@ -41,7 +41,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
<div role="tabpanel" class="tab-pane active" id="tab-containers">
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title">Disk usage</h3>
+ <h3 class="panel-title"><?=$lang['debug']['disk_usage'];?></h3>
</div>
<div class="panel-body">
<div class="row">
@@ -59,7 +59,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
</div>
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title">Container information</h3>
+ <h3 class="panel-title"><?=$lang['debug']['containers_info'];?></h3>
</div>
<div class="panel-body">
<ul class="list-group">
@@ -90,7 +90,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
}
?>
<small>(Started on <?=$started;?>),
- <a href data-toggle="modal" data-container="<?=$container;?>" data-target="#RestartContainer">Restart</a></small>
+ <a href data-toggle="modal" data-container="<?=$container;?>" data-target="#RestartContainer"><?=$lang['debug']['restart_container'];?></a></small>
<span class="pull-right label label-<?=($container_info['State'] !== false && !empty($container_info['State'])) ? (($container_info['State']['Running'] == 1) ? 'success' : 'danger') : 'default'; ?>"> </span>
</li>
<?php
From 3ece6168c7a026ba20775f18cd3f19003a00ef3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20T=C5=99=C3=AD=C5=A1ka?= <radek@fastlinux.eu>
Date: Sat, 1 Dec 2018 02:34:15 +0000
Subject: [PATCH 2/3] Update lang.cs.php
---
data/web/lang/lang.cs.php | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/data/web/lang/lang.cs.php b/data/web/lang/lang.cs.php
index 0fe148ea..6d008b36 100644
--- a/data/web/lang/lang.cs.php
+++ b/data/web/lang/lang.cs.php
@@ -678,6 +678,8 @@ $lang['warning']['fuzzy_learn_error'] = "Chyba při učení Fuzzy hash: %s";
$lang['danger']['spam_learn_error'] = "Chyba při učení spamu: %s";
$lang['success']['qlearn_spam'] = "Zpráva ID %s byla naučena jako spam a smazána";
+$lang['debug']['system_containers'] = 'Systém a docker kontejnery';
+$lang['debug']['logs'] = 'Logy';
$lang['debug']['log_info'] = '<p><b>Logy v paměti</b> jsou schromažďovány pomocí Redis seznamů a jsou omezeny na LOG_LINES (%d) každou minutu pro zabránění přetěžování serveru. Nejsou navrženy jako trvalé. Všechny aplikace, které logují do paměti zároveň logují i do docker služby podle nastavení logging driveru. Logy v paměti jsou navrženy pro ladění menších problémů s kontejnery.</p>
<p><b>Externí logy</b> jsou schromažďovány pomocí API dané aplikace.</p>
<p><b>Statické logy</b> jsou většinou logy činností, které nejsou zaznamenávány do Docker služby, ale je potřeba aby byly trvalé (vyjímkou jsou API logy).</p>';
@@ -686,6 +688,10 @@ $lang['debug']['in_memory_logs'] = 'Logy v paměti';
$lang['debug']['external_logs'] = 'Externí logy';
$lang['debug']['static_logs'] = 'Statické logy';
+$lang['debug']['disk_usage'] = 'Využití disku';
+$lang['debug']['containers_info'] = "Informace o docker kontejnerech";
+$lang['debug']['restart_container'] = 'Restartovat';
+
$lang['quarantine']['release_body'] = "Váš email byla připojen jako soubor eml k této zprávě.";
$lang['danger']['release_send_failed'] = "Zprávu nelze propustit: %s";
$lang['quarantine']['release_subject'] = "Potenciálně škodlivá položka v karanténě %s";
From 8f856ad99d75d9bde8a05655b0050d280d48c47f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20T=C5=99=C3=AD=C5=A1ka?= <radek@fastlinux.eu>
Date: Sat, 1 Dec 2018 02:35:12 +0000
Subject: [PATCH 3/3] Update lang.en.php
---
data/web/lang/lang.en.php | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index fed53ea6..0929c463 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -676,6 +676,8 @@ $lang['warning']['fuzzy_learn_error'] = "Fuzzy hash learn error: %s";
$lang['danger']['spam_learn_error'] = "Spam learn error: %s";
$lang['success']['qlearn_spam'] = "Message ID %s was learned as spam and deleted";
+$lang['debug']['system_containers'] = 'System & Containers';
+$lang['debug']['logs'] = 'Logs';
$lang['debug']['log_info'] = '<p>mailcow <b>in-memory logs</b> are collected in Redis lists and trimmed to LOG_LINES (%d) every minute to reduce hammering.
<br>In-memory logs are not meant to be persistent. All applications that log in-memory, also log to the Docker daemon and therefore to the default logging driver.
<br>The in-memory log type should be used for debugging minor issues with containers.</p>
@@ -686,6 +688,10 @@ $lang['debug']['in_memory_logs'] = 'In-memory logs';
$lang['debug']['external_logs'] = 'External logs';
$lang['debug']['static_logs'] = 'Static logs';
+$lang['debug']['disk_usage'] = 'Disk usage';
+$lang['debug']['containers_info'] = "Container information";
+$lang['debug']['restart_container'] = 'Restart';
+
$lang['quarantine']['release_body'] = "We have attached your message as eml file to this message.";
$lang['danger']['release_send_failed'] = "Message could not be released: %s";
$lang['quarantine']['release_subject'] = "Potentially damaging quarantine item %s";