From 78d0deed944e696be9d480681cf2ef026f5802b5 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Tue, 5 Feb 2019 10:37:28 +0100
Subject: [PATCH] [Web] Lang updates [Web] Minor fixes

---
 data/web/admin.php        | 13 +++++++------
 data/web/js/site/admin.js |  2 +-
 data/web/lang/lang.de.php |  5 +++++
 data/web/lang/lang.en.php |  5 +++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/data/web/admin.php b/data/web/admin.php
index b1de85a7..eefe2082 100644
--- a/data/web/admin.php
+++ b/data/web/admin.php
@@ -283,8 +283,8 @@ $tfa_data = get_tfa();
         <a href="#fwdhosts" class="list-group-item"><?=$lang['admin']['forwarding_hosts'];?></a>
         <a href="#f2bparams" class="list-group-item"><?=$lang['admin']['f2b_parameters'];?></a>
         <a href="#quarantine" class="list-group-item"><?=$lang['admin']['quarantine'];?></a>
-        <a href="#quota" class="list-group-item">Quota notifications</a>
-        <a href="#rsettings" class="list-group-item">Rspamd settings map</a>
+        <a href="#quota" class="list-group-item"><?=$lang['admin']['quota_notifications'];?></a>
+        <a href="#rsettings" class="list-group-item"><?=$lang['admin']['rspamd_settings_map'];?></a>
         <a href="#customize" class="list-group-item"><?=$lang['admin']['customize'];?></a>
         <a href="#top" class="list-group-item" style="border-top:1px dashed #dadada">↸ <?=$lang['admin']['to_top'];?></a>
       </div>
@@ -690,9 +690,9 @@ $tfa_data = get_tfa();
 
     <span class="anchor" id="quota"></span>
     <div class="panel panel-default">
-      <div class="panel-heading">Quota notifications</div>
+      <div class="panel-heading"><?=$lang['admin']['quota_notifications'];?></div>
       <div class="panel-body">
-      <p>Quota notications are sent to users once when crossing 80% and once when crossing 95% usage.</p>
+      <p><?=$lang['admin']['quota_notifications_info'];?></p>
        <?php $q_data = quota_notification('get');?>
       <form class="form" role="form" data-id="quota_notification" method="post">
         <div class="row">
@@ -715,6 +715,7 @@ $tfa_data = get_tfa();
               <span style="font-size:12px" class="arrow rotate glyphicon glyphicon-menu-down"></span> <?=$lang['admin']['quarantine_notification_html'];?>
             </legend>
             <div id="quota_template" class="collapse" >
+              <!-- <small><?=$lang['admin']['quota_notifications_vars'];?></small><br><br>-->
               <textarea autocorrect="off" spellcheck="false" autocapitalize="none" class="form-control textarea-code collapse in" rows="20" name="html"><?=$q_data['html_tmpl'];?></textarea>
             </div>
           </div>
@@ -737,10 +738,10 @@ $tfa_data = get_tfa();
 
     <span class="anchor" id="rsettings"></span>
     <div class="panel panel-default">
-      <div class="panel-heading">Rspamd settings map</div>
+      <div class="panel-heading"><?=$lang['admin']['rspamd_settings_map'];?></div>
       <div class="panel-body">
       <legend data-target="#active_settings_map" style="cursor:pointer" class="arrow-toggle" unselectable="on" data-toggle="collapse">
-        <span style="font-size:12px" class="arrow rotate glyphicon glyphicon-menu-down"></span> Active settings map
+        <span style="font-size:12px" class="arrow rotate glyphicon glyphicon-menu-down"></span> <?=$lang['admin']['active_rspamd_settings_map'];?>
       </legend>
       <div id="active_settings_map" class="collapse" >
         <textarea autocorrect="off" spellcheck="false" autocapitalize="none" class="form-control textarea-code" rows="20" name="settings_map" readonly><?=file_get_contents('http://nginx:8081/settings.php');?></textarea>
diff --git a/data/web/js/site/admin.js b/data/web/js/site/admin.js
index 6559b156..cb124dd3 100644
--- a/data/web/js/site/admin.js
+++ b/data/web/js/site/admin.js
@@ -25,7 +25,7 @@ jQuery(function($){
      });
      $('#dkim_add_domains').val(domains);
   });
-  $(".arrow-toggle").on('click', function(e) { e.preventDefault(); $('.arrow').toggleClass("animation"); });
+  $(".arrow-toggle").on('click', function(e) { e.preventDefault(); $(this).find('.arrow').toggleClass("animation"); });
   $("#mass_exclude").change(function(){ $("#mass_include").selectpicker('deselectAll'); });
   $("#mass_include").change(function(){ $("#mass_exclude").selectpicker('deselectAll'); });
   $("#mass_disarm").click(function() { $("#mass_send").attr("disabled", !this.checked); });
diff --git a/data/web/lang/lang.de.php b/data/web/lang/lang.de.php
index 494cecc4..4b9b6268 100644
--- a/data/web/lang/lang.de.php
+++ b/data/web/lang/lang.de.php
@@ -637,7 +637,12 @@ $lang['admin']['unban_pending'] = "ausstehend";
 $lang['admin']['queue_unban'] = "Unban einreihen";
 $lang['admin']['no_active_bans'] = "Keine aktiven Bans";
 
+$lang['admin']['quota_notifications'] = "Quota Benachrichtigungen";
+$lang['admin']['quota_notifications_vars'] = "{{percent}} entspricht der aktuellen Quota in Prozent<br>{{username}} entspricht dem Mailbox-Namen";
+$lang['admin']['rspamd_settings_map'] = "Rspamd Settings Map";
 $lang['admin']['quarantine'] = "Quarantäne";
+$lang['admin']['active_rspamd_settings_map'] = "Derzeit aktive Settings Map";
+$lang['admin']['quota_notifications_info'] = "Quota Benachrichtigungen werden an Mailboxen versendet, die 80 respektive 95 Prozent der zur Verfügung stehenden Quota überschreiten.";
 $lang['admin']['quarantine_retention_size'] = "Rückhaltungen pro Mailbox:<br><small>0 bedeutet <b>inaktiv</b>.</small>";
 $lang['admin']['quarantine_max_size'] = "Maximale Größe in MiB (größere Elemente werden verworfen):<br><small>0 bedeutet <b>nicht</b> unlimitert.</small>";
 $lang['admin']['quarantine_exclude_domains'] = "Domains und Alias-Domains ausschließen";
diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index c31ac515..263715a1 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -673,6 +673,11 @@ $lang['admin']['queue_unban'] = "queue unban";
 $lang['admin']['no_active_bans'] = "No active bans";
 
 $lang['admin']['quarantine'] = "Quarantine";
+$lang['admin']['rspamd_settings_map'] = "Rspamd settings map";
+$lang['admin']['quota_notifications'] = "Quota notifications";
+$lang['admin']['quota_notifications_vars'] = "{{percent}} equals the current quota of the user<br>{{username}} is the mailbox name";
+$lang['admin']['active_rspamd_settings_map'] = "Active settings map";
+$lang['admin']['quota_notifications_info'] = "Quota notications are sent to users once when crossing 80% and once when crossing 95% usage.";
 $lang['admin']['quarantine_retention_size'] = "Retentions per mailbox:<br><small>0 indicates <b>inactive</b>.</small>";
 $lang['admin']['quarantine_max_size'] = "Maximum size in MiB (larger elements are discarded):<br><small>0 does <b>not</b> indicate unlimited.</small>";
 $lang['admin']['quarantine_exclude_domains'] = "Exclude domains and alias-domains";