the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-01-02 21:12:02 +08:00
Code Issues Projects Releases Packages Wiki Activity

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

16
dev/Model/FilterCondition.js
View file

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