paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Show textarea for queue item; [Web] Add lang string for "regex maps"; [Web] Add lang string for "loading" when opening queue item

master
andryyy 2020-05-20 12:19:52 +02:00
parent 347e65736e
commit 07ee440211
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
19 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/web/admin.php
View File

@ -31,7 +31,7 @@ if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CAC
<li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#"><?=$lang['admin']['rspamd_global_filters'];?>
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li role="presentation"><a href="#tab-globalfilter-regex" aria-controls="tab-globalfilter-regex" role="tab" data-toggle="tab">Regex maps</a></li>
<li role="presentation"><a href="#tab-globalfilter-regex" aria-controls="tab-globalfilter-regex" role="tab" data-toggle="tab"><?=$lang['admin']['regex_maps'];?></a></li>
</ul>
</li>
</ul>
@ -1248,7 +1248,7 @@ if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CAC
<div id="rspamd_global_filters" class="<?=($_SESSION['show_rspamd_global_filters'] !== true) ? 'hidden' : '';?>">
<hr>
<span class="anchor" id="regexmaps"></span>
<h4>Regex Maps</h4>
<h4><?=$lang['admin']['regex_maps'];?></h4>
<p><?=$lang['admin']['rspamd_global_filters_regex'];?></p>
<ul>
<?php

2
data/web/js/site/admin.js
View File

@ -419,7 +419,7 @@ jQuery(function($){
})
// Queue item
$('#showQueuedMsg').on('show.bs.modal', function (e) {
$('#queue_msg_content').text("Loading...");
$('#queue_msg_content').text(lang.loading);
button = $(e.relatedTarget)
if (button != null) {
$('#queue_id').text(button.data('queue-id'));

1
data/web/lang/lang.ca.json
View File

@ -109,6 +109,7 @@
"in_use_by": "En ús per",
"inactive": "Inactiu",
"link": "Enllaç",
"loading": "Si et plau espera ...",
"logo_info": "La vostra imatge es reduirà a una alçada de 40 píxels per a la barra de navegació superior i un màx. ample de 250 px per a la pàgina d'inici. És molt recomanable un gràfic escalable",
"main_name": "Nom de \"mailcow UI\"",
"merged_vars_hint": "Les files en gris venen de <code>vars.(local.)inc.php</code> i no es poden modificar.",

1
data/web/lang/lang.cs.json
View File

@ -180,6 +180,7 @@
"last_applied": "Naposledy použité",
"license_info": "Licence není povinná, pomůžete však dalšímu vývoji.<br><a href=\"https://www.servercow.de/mailcow?lang=en#sal\" target=\"_blank\" alt=\"SAL order\">Registrujte si své GUID</a>, nebo si <a href=\"https://www.servercow.de/mailcow?lang=en#support\" target=\"_blank\" alt=\"Support order\">zaplaťte podporu pro svou instalaci mailcow.</a>",
"link": "Odkaz",
"loading": "Prosím čekejte...",
"logo_info": "Obrázek bude zmenšen na výšku 40 pixelů pro horní navigační lištu a na max. šířku 250 pixelů pro úvodní stránku.",
"lookup_mx": "Ověřit cíl proti MX záznamu (.outlook.com bude směrovat všechnu poštu pro MX *.outlook.com přes tento uzel)",
"main_name": "Název webu (\"mailcow UI\")",

2
data/web/lang/lang.de.json
View File

@ -192,6 +192,7 @@
"last_applied": "Zuletzt angewendet",
"license_info": "Eine Lizenz ist nicht erforderlich, hilft jedoch der Entwicklung mailcows.<br><a href=\"https://www.servercow.de/mailcow#sal\" target=\"_blank\" alt=\"SAL Bestellung\">Hier kann die mailcow GUID registriert werden.</a> Alternativ ist <a href=\"https://www.servercow.de/mailcow#support\" target=\"_blank\" alt=\"SAL Bestellung\">die Bestellung von Support-Paketen möglich</a>.",
"link": "Link",
"loading": "Bitte warten...",
"logo_info": "Die hochgeladene Grafik wird für die Navigationsleiste auf eine Höhe von 40px skaliert. Für die Darstellung auf der Login-Maske beträgt die skalierte Breite maximal 250px. Eine frei skalierbare Grafik (etwa SVG) wird empfohlen.",
"lookup_mx": "Ziel gegen MX prüfen (etwa .outlook.com, um alle Ziele mit MX *.outlook.com zu routen)",
"main_name": "\"mailcow UI\" Name",
@ -245,6 +246,7 @@
"recipients": "Empfänger",
"refresh": "Neu laden",
"regen_api_key": "API-Key regenerieren",
"regex_maps": "Regex Maps",
"relay_from": "Absenderadresse",
"relay_run": "Test durchführen",
"relayhosts": "Senderabhängige Transport Maps",

2
data/web/lang/lang.en.json
View File

@ -191,6 +191,7 @@
"last_applied": "Last applied",
"license_info": "A license is not required but helps further development.<br><a href=\"https://www.servercow.de/mailcow?lang=en#sal\" target=\"_blank\" alt=\"SAL order\">Register your GUID here</a> or <a href=\"https://www.servercow.de/mailcow?lang=en#support\" target=\"_blank\" alt=\"Support order\">buy support for your mailcow installation.</a>",
"link": "Link",
"loading": "Please wait...",
"logo_info": "Your image will be scaled to a height of 40px for the top navigation bar and a max. width of 250px for the start page. A scalable graphic is highly recommended.",
"lookup_mx": "Match destination against MX (.outlook.com to route all mail targeted to a MX *.outlook.com over this hop)",
"main_name": "\"mailcow UI\" name",
@ -244,6 +245,7 @@
"recipients": "Recipients",
"refresh": "Refresh",
"regen_api_key": "Regenerate API key",
"regex_maps": "Regex maps",
"relay_from": "\"From:\" address",
"relay_run": "Run test",
"relayhosts": "Sender-dependent transports",

1
data/web/lang/lang.es.json
View File

@ -164,6 +164,7 @@
"include_exclude_info": "Por defecto - sin selección - <b>todos los buzones</b> son notificados.",
"includes": "Incluye a estos destinatarios",
"link": "Enlace",
"loading": "Espera por favor...",
"logo_info": "La imagen se escalará a una altura de 40 px para la barra de navegación superior y un máx. de ancho de 250 px para la página de inicio. Un gráfico escalable es muy recomendable.",
"main_name": "Nombre \"mailcow UI\"",
"merged_vars_hint": "Las filas grises fueron incorporadas de <code>vars.(local.)inc.php</code> y no son modificables.",

1
data/web/lang/lang.fi.json
View File

@ -180,6 +180,7 @@
"last_applied": "Viimeksi käytetty",
"license_info": "Lisenssiä ei vaadita, mutta se auttaa kehittämään ohjelmaa jatkossa.<br><a href=\"https://www.servercow.de/mailcow?lang=en#sal\" target=\"_blank\" alt=\"SAL order\">Rekisteröi GUID-tunnus täältä</a> or <a href=\"https://www.servercow.de/mailcow?lang=en#support\" target=\"_blank\" alt=\"Support order\">Osta tuki mailcow-asennusta varten.</a>",
"link": "Linkki",
"loading": "Ole hyvä ja odota...",
"logo_info": "Kuvasi skaalataan ylimmän navigointipalkin 40 pikselin korkeudelle ja korkeintaan. leveys 250 sivua aloitussivulle. Skaalautuva grafiikka on erittäin suositeltavaa.",
"lookup_mx": "Määränpää vastaan MX (. outlook.com reitittää kaikki Mail suunnattu MX *. outlook.com yli tämän hop)",
"main_name": "\"mailcow UI \"nimi",

1
data/web/lang/lang.fr.json
View File

@ -89,6 +89,7 @@
"in_use_by": "Utilisé par",
"inactive": "Inactif",
"link": "Lien",
"loading": "Veuillez patienter...",
"logo_info": "Votre image sera redimensionnée à une hauteur de 40 pixels pour la barre de navigation du haut et à un maximum de 250 pixels en largeur pour la page d'accueil. Un graphique extensible est fortement recommandé.",
"merged_vars_hint": "Les lignes grisées ont été importées depuis <code>vars.(local.)inc.php</code> et ne peuvent pas être modifiées.",
"message": "Message",

1
data/web/lang/lang.it.json
View File

@ -69,6 +69,7 @@
"forwarding_hosts_add_hint": "È possibile specificare indirizzi IPv4 / IPv6, reti nella notazione CIDR, nomi host (che verranno risolti in indirizzi IP) o nomi di dominio (che verranno risolti agli indirizzi IP richiamando i record SPF o, in assenza, i record MX) .",
"forwarding_hosts_hint": "I messaggi in entrata sono accettati in maniera incondizionata da tutti gli host elencati qui. Questi host sono quindi non controllati contro DNSBL o sottoposti a greylisting. Spam ricevuti da loro non viene mai rifiutata e sempre archiviata nella cartella Junk. L'utilizzo più comune per questo è quello di specificare i server di posta elettronica su cui è stata impostata una regola che inoltra le email in arrivo al server mailcow.",
"host": "Hostname",
"loading": "Attendere...",
"no_record": "Nessun risultato",
"password": "Password",
"password_repeat": "Conferma password(ripeti)",

1
data/web/lang/lang.lv.json
View File

@ -108,6 +108,7 @@
"in_use_by": "Tiek lietots ar",
"inactive": "Neaktīvs",
"link": "Saite",
"loading": "Lūdzu uzgaidiet...",
"logo_info": "Jūsu attēls augšējā navigācijas joslā tiks palielināts līdz 40 pikseļiem un maks. sākumlapas platums par 250 pikseļi. Ir ļoti ieteicama pielāgojama grafikaYour image will be scaled to a height of 40px for the top navigation bar and a max. width of 250px for the start page. Ir ļoti ieteicama pielāgojamā grafika",
"main_name": "\"mailcow UI\" nosaukums",
"merged_vars_hint": "Pelēkās rindas tika apvienotas <code>vars.(local.)inc.php</code> un nevar tikt modificētas.",

1
data/web/lang/lang.nl.json
View File

@ -191,6 +191,7 @@
"last_applied": "Voor het laatst toegepast",
"license_info": "Een licentie is niet vereist. Je steunt hier echter wel de ontwikkeling van Mailcow mee.<br><a href=\"https://www.servercow.de/mailcow?lang=nl#sal\" target=\"_blank\" alt=\"SAL order\">Registreer je GUID hier</a>, of <a href=\"https://www.servercow.de/mailcow?lang=nl#support\" target=\"_blank\" alt=\"Support order\">schaf ondersteuning aan voor deze installatie.</a>",
"link": "Link",
"loading": "Even geduld aub...",
"logo_info": "De afbeelding zal worden geschaald naar een hoogte van 40px voor de navigatiebar, en naar een breedte van 250px voor de startpagina.",
"lookup_mx": "Match bestemming aan MX (gebruik .outlook.com om alle mail gericht aan MX *.outlook.com over deze hop te laten gaan)",
"main_name": "\"Mailcow\"",

1
data/web/lang/lang.pl.json
View File

@ -79,6 +79,7 @@
"import": "Importuj",
"import_private_key": "Importuj klucz prywatny",
"inactive": "Nieaktywny",
"loading": "Proszę czekać...",
"message": "Wiadomość",
"no_record": "Brak rekordu",
"password": "Hasło",

1
data/web/lang/lang.pt.json
View File

@ -46,6 +46,7 @@
"domain_admins": "Administradores de domínio",
"edit": "Editar",
"filter_table": "Procurar",
"loading": "Aguarde..."
"no_record": "Nenhum registro",
"password": "Senha",
"password_repeat": "Confirmar senha (repetir)",

1
data/web/lang/lang.ru.json
View File

@ -186,6 +186,7 @@
"last_applied": "Посл. применение",
"license_info": "Лицензия не обезательна, но ее приобритение помогает дальнейшему развитию mailcow.<br><a href=\"https://www.servercow.de/mailcow?lang=en#sal\" target=\"_blank\" alt=\"SAL order\">Зарегистрируйте свой GUID здесь</a> или <a href=\"https://www.servercow.de/mailcow?lang=en#support\" target=\"_blank\" alt=\"Заказать поддержку\">приобретите поддержку для вашей установки mailcow.</a>",
"link": "Ссылка",
"loading": "Пожалуйста, подождите...",
"logo_info": "Ваше изображение будет масштабироваться до высоты 40px для верхней панели навигации и до 250px ширины для стартовой страницы. <br>Рекомендуется использовать векторную графику, на пример: .svg.",
"lookup_mx": "Сопоставление назначения с записью MX (.outlook.com для маршрутизации всей почты, направленной на MX *.outlook.com через этот хост)",
"main_name": "Название для \"mailcow UI\"",

1
data/web/lang/lang.sk.json
View File

@ -190,6 +190,7 @@
"last_applied": "Naposledy aplikované",
"license_info": "Licencia nie je potrebná, ale napomáha ďalšiemu vývoju.<br><a href=\"https://www.servercow.de/mailcow?lang=en#sal\" target=\"_blank\" alt=\"SAL order\">Registrujte váš GUID tu</a> alebo <a href=\"https://www.servercow.de/mailcow?lang=en#support\" target=\"_blank\" alt=\"Objednávka podpory\">zakúpte si podporu pre vašu mailcow inštaláciu.</a>",
"link": "Odkaz",
"loading": "Prosím čakajte...",
"logo_info": "Váš obrázok bude upravený na výšku 40px pre vrchný navigačný riadok a na maximálnu šírku 250px pre úvodnú stránku. Odporúča sa škálovateľná grafika.",
"lookup_mx": "Overiť cieľ voči MX záznamu (doručenie pre .outlook.com bude smerované cez MX *.outlook.com na konkrétny server)",
"main_name": "\"mailcow UI\" meno",

1
data/web/lang/lang.sv.json
View File

@ -192,6 +192,7 @@
"last_applied": "Senast tillämpat",
"license_info": "En licens är inte ett krav, men hjälper till att stödja vidareutveckling.<br><a href=\"https://www.servercow.de/mailcow?lang=en#sal\" target=\"_blank\" alt=\"SAL order\">Registrera ditt installations-ID här</a> or <a href=\"https://www.servercow.de/mailcow?lang=en#support\" target=\"_blank\" alt=\"Support order\">köp support för din mailcow installation.</a>",
"link": "Länk",
"loading": "Vänta...",
"logo_info": "Bilden skalas till en höjd av 40px till översta navigationsfältet, och en maximal bredd av 250px på startsidan. En skalbar grafik rekommenderas.",
"lookup_mx": "Kontrollera destinationen mot MX-uppslaget (.outlook.com för att dirigera all e-posttrafik med MX-uppslaget *.outlook.com över denna server)",
"main_name": "Rubrik på webbplatsen",

1
data/web/mailbox.php
View File

@ -498,7 +498,6 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
</div>
</div>
<p style="margin:10px" class="help-block"><?=$lang['mailbox']['tls_policy_maps_info'];?></p>
<p style="margin:10px" class="help-block"><?=$lang['mailbox']['tls_policy_maps_enforced_tls'];?></p>
<!-- <div class="mass-actions-mailbox" data-actions-header="true"></div> -->
<div class="table-responsive">
<table class="table table-striped" id="tls_policy_table"></table>

3
data/web/modals/admin.php
View File

@ -215,8 +215,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
<h3 class="modal-title"><span class="glyphicon glyphicon-hourglass" style="font-size:18px"></span> ID <span id="queue_id"></span></h3>
</div>
<div class="modal-body">
<pre id="queue_msg_content">
</pre>
<textarea class="form-control" id="queue_msg_content" name="content" rows="40"></textarea>
</div>
</div>
</div>