Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 19:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split simple RainLoop Sieve filter from the advanced filters as mentioned in #80 and #257

Browse source
This commit is contained in:
the-djmaze 2022-05-17 16:19:17 +02:00
parent 882c0bde42
commit 723ebc4055
36 changed files with 84 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/sieve.js
View file

@ -46,7 +46,7 @@ window.Sieve = {
*/
forEachObjectValue(data.Result.Scripts, value => {
value = SieveScriptModel.reviveFromJson(value);
value && scripts.push(value)
value && (value.allowFilters() ? scripts.unshift(value) : scripts.push(value))
});
}
});

2
snappymail/v/0.0.0/app/localization/ar-SA/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "عوامل التصفية",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "\"%FOLDER%\" نقل الى",
"SUBNAME_FORWARD_TO": "\"%EMAIL%\" إعادة توجيه الى",

2
snappymail/v/0.0.0/app/localization/bg-BG/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Филтри",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Премести в \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Препрати към \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/cs-CZ/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtry",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Přesunout do \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Přeposlat to \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/da-DK/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtre",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Flyt til \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Videresend til \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/de-DE/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filter",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Skript hinzufügen",
"SUBNAME_MOVE_TO": "Verschieben nach \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Weiterleiten nach \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/el-GR/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Φίλτρα",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Μετακίνηση στο \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Προώθηση στο \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/en/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filters",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/es-ES/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtros",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Añadir un Script",
"SUBNAME_MOVE_TO": "Mover a \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Reenviar a \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/et-EE/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtrid",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Liiguta kausta \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Edasta aadressile \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/fa-IR/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "فیلترها",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "انتقال به \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "ارسال به \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/fi-FI/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Suodattimet",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Siirrä kansioon \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Välitä osoitteeseen \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/fr-FR/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtres",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Ajouter un Script",
"SUBNAME_MOVE_TO": "Déplacer vers \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Faire suivre à \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/hu-HU/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Szűrők",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Áthelyezés ide \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Továbbítás ide: \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/id-ID/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filter",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Pindahkan ke \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Teruskan ke \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/is-IS/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Síur",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Færa í \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Áframsenda til \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/it-IT/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtri",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Aggiungi uno script",
"SUBNAME_MOVE_TO": "Sposta in \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Inoltra a \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/ja-JP/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "フィルター",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "\"%FOLDER%\" へ移動",
"SUBNAME_FORWARD_TO": "\"%EMAIL%\" へ転送",

2
snappymail/v/0.0.0/app/localization/ko-KR/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "필터",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "\"%FOLDER%\"(으)로 이동",
"SUBNAME_FORWARD_TO": "\"%EMAIL%\"(으)로 전달",

2
snappymail/v/0.0.0/app/localization/lt-LT/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtrai",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Perkelti į \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "persiūsti \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/lv-LV/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filters",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/nb-NO/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtre",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Flytt til «%FOLDER%»",
"SUBNAME_FORWARD_TO": "Videresend til «%EMAIL%»",

2
snappymail/v/0.0.0/app/localization/nl-NL/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filters",
"SIMPLE": "Simpel",
"ADVANCED": "Geavanceerd",
"BUTTON_ADD_SCRIPT": "Script toevoegen",
"SUBNAME_MOVE_TO": "Verplaats naar map \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Doorsturen naar \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/pl-PL/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtry",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Przenieś do \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Przekaż do \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/pt-BR/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtros",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Mover para \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Encaminhar para \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/pt-PT/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtros",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Mover para \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Encaminhar para \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/ro-RO/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filters",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/ru-RU/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Фильтры",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Переместить в \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Переслать на \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/sk-SK/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtre",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/sl-SI/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filtri",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Premakni v \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Posreduj na \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/sv-SE/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filter",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Flytta till \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Vidarebefordra till \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/tr-TR/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filters",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/uk-UA/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filters",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/zh-CN/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "筛选器",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "移动到 \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "转发到 \"%EMAIL%\"",

2
snappymail/v/0.0.0/app/localization/zh-TW/user.json
View file

@ -354,6 +354,8 @@
},
"SETTINGS_FILTERS": {
"LEGEND_FILTERS": "Filters",
"SIMPLE": "Simple",
"ADVANCED": "Advanced",
"BUTTON_ADD_SCRIPT": "Add a Script",
"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",

16
snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
View file

@ -14,9 +14,22 @@
<col style="width: 1em">
</colgroup>
<tbody data-bind="foreach: scripts, i18nUpdate: scripts">
<!-- ko if: allowFilters() -->
<tr><th colspan="4" data-i18n="SETTINGS_FILTERS/SIMPLE"></th></tr>
<tr class="script-item">
<td>
<span class="disabled-script fontastic" data-bind="click: function (oScript) { $root.toggleScript(oScript); }, text: active() ? '☑' : '☐'"></span>
<span class="fontastic" data-bind="click: function (oScript) { $root.toggleScript(oScript); }, text: active() ? '☑' : '☐'"></span>
</td>
<td class="e-action" class="script-name" data-bind="text: name()"></td>
<td></td>
<td></td>
</tr>
<tr><th colspan="4" data-i18n="SETTINGS_FILTERS/ADVANCED"></th></tr>
<!-- /ko -->
<!-- ko if: !allowFilters() -->
<tr class="script-item">
<td>
<span class="fontastic" data-bind="click: function (oScript) { $root.toggleScript(oScript); }, text: active() ? '☑' : '☐'"></span>
</td>
<td class="e-action" class="script-name" data-bind="text: name()"></td>
<td>
@ -27,6 +40,7 @@
<span class="delete-script fontastic" data-bind="visible: !askDelete() && canBeDeleted(), click: function (oScript) { $root.scriptForDeletion(oScript); }">🗑</span>
</td>
</tr>
<!-- /ko -->
</tbody>
</table>
<a class="btn" data-bind="click: addScript" data-icon="✚" data-i18n="SETTINGS_FILTERS/BUTTON_ADD_SCRIPT"></a>