Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-06 07:57:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: invalid template id's

Browse source 
And cleanup strings
This commit is contained in:
djmaze 2021-01-25 22:29:55 +01:00
parent 5e63ade9dd
commit d23689dae8
2 changed files with 18 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

35
dev/Model/Filter.js
View file

@ -75,27 +75,27 @@ export class FilterModel extends AbstractModel {
this.addComputables({ this.addComputables({
nameSub: () => { nameSub: () => {
let result = ''; let result = '';
const actionValue = this.actionValue(); const actionValue = this.actionValue(), root = 'SETTINGS_FILTERS/SUBNAME_';
switch (this.actionType()) { switch (this.actionType()) {
case FilterAction.MoveTo: case FilterAction.MoveTo:
result = i18n('SETTINGS_FILTERS/SUBNAME_MOVE_TO', { result = i18n(root + 'MOVE_TO', {
FOLDER: fGetRealFolderName(actionValue) FOLDER: fGetRealFolderName(actionValue)
}); });
break; break;
case FilterAction.Forward: case FilterAction.Forward:
result = i18n('SETTINGS_FILTERS/SUBNAME_FORWARD_TO', { result = i18n(root + 'FORWARD_TO', {
EMAIL: actionValue EMAIL: actionValue
}); });
break; break;
case FilterAction.Vacation: case FilterAction.Vacation:
result = i18n('SETTINGS_FILTERS/SUBNAME_VACATION_MESSAGE'); result = i18n(root + 'VACATION_MESSAGE');
break; break;
case FilterAction.Reject: case FilterAction.Reject:
result = i18n('SETTINGS_FILTERS/SUBNAME_REJECT'); result = i18n(root + 'REJECT');
break; break;
case FilterAction.Discard: case FilterAction.Discard:
result = i18n('SETTINGS_FILTERS/SUBNAME_DISCARD'); result = i18n(root + 'DISCARD');
break; break;
// no default // no default
} }
@ -104,31 +104,22 @@ export class FilterModel extends AbstractModel {
}, },
actionTemplate: () => { actionTemplate: () => {
let result = ''; const result = 'SettingsFiltersAction';
switch (this.actionType()) { switch (this.actionType()) {
case FilterAction.Forward: case FilterAction.Forward:
result = 'SettingsFilterActionForward'; return result + 'Forward';
break;
case FilterAction.Vacation: case FilterAction.Vacation:
result = 'SettingsFilterActionVacation'; return result + 'Vacation';
break;
case FilterAction.Reject: case FilterAction.Reject:
result = 'SettingsFilterActionReject'; return result + 'Reject';
break;
case FilterAction.None: case FilterAction.None:
result = 'SettingsFilterActionNone'; return result + 'None';
break;
case FilterAction.Discard: case FilterAction.Discard:
result = 'SettingsFilterActionDiscard'; return result + 'Discard';
break;
case FilterAction.MoveTo: case FilterAction.MoveTo:
default: default:
result = 'SettingsFilterActionMoveToFolder'; return result + 'MoveToFolder';
break;
} }
return result;
} }
}); });

16
dev/Model/FilterCondition.js
View file

@ -44,23 +44,17 @@ export class FilterConditionModel extends AbstractModel {
}); });
this.template = ko.computed(() => { this.template = ko.computed(() => {
let template = ''; const template = 'SettingsFiltersCondition';
switch (this.field()) { switch (this.field()) {
case FilterConditionField.Body: case FilterConditionField.Body:
template = 'SettingsFiltersConditionBody'; return template + 'Body';
break;
case FilterConditionField.Size: case FilterConditionField.Size:
template = 'SettingsFiltersConditionSize'; return template + 'Size';
break;
case FilterConditionField.Header: case FilterConditionField.Header:
template = 'SettingsFiltersConditionMore'; return template + 'More';
break;
default: default:
template = 'SettingsFiltersConditionDefault'; return template + 'Default';
break;
} }
return template;
}, this); }, this);
this.addSubscribables({ this.addSubscribables({