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

Upgrade i18n() to use Object.entries()

Browse source 
And replace quoted object keys to be without quotes
This commit is contained in:
djmaze 2021-03-24 21:26:40 +01:00
parent fe4dbc729c
commit 7eaaa0a793
24 changed files with 224 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

142
dev/Common/File.js
View file

@ -11,96 +11,96 @@ const
sizes = ['B', 'KiB', 'MiB', 'GiB', 'TiB'], sizes = ['B', 'KiB', 'MiB', 'GiB', 'TiB'],
exts = { exts = {
'eml': 'message/rfc822', eml: 'message/rfc822',
'mime': 'message/rfc822', mime: 'message/rfc822',
'rtx': 'text/richtext', rtx: 'text/richtext',
'vcard': 'text/vcard', vcard: 'text/vcard',
'vcf': 'text/vcard', vcf: 'text/vcard',
'htm': 'text/html', htm: 'text/html',
'html': 'text/html', html: 'text/html',
'csv': 'text/csv', csv: 'text/csv',
'ics': 'text/calendar', ics: 'text/calendar',
'ifb': 'text/calendar', ifb: 'text/calendar',
'xml': 'text/xml', xml: 'text/xml',
'json': app+'json', json: app+'json',
'p10': app+'pkcs10', p10: app+'pkcs10',
'p7c': app+'pkcs7-mime', p7c: app+'pkcs7-mime',
'p7m': app+'pkcs7-mime', p7m: app+'pkcs7-mime',
'p7s': app+'pkcs7-signature', p7s: app+'pkcs7-signature',
'torrent': app+'x-bittorrent', torrent: app+'x-bittorrent',
// scripts // scripts
'js': app+'javascript', js: app+'javascript',
'pl': 'text/perl', pl: 'text/perl',
'css': 'text/css', css: 'text/css',
'asp': 'text/asp', asp: 'text/asp',
'php': app+'x-httpd-php', php: app+'x-httpd-php',
'phtml': app+'x-httpd-php', phtml: app+'x-httpd-php',
// images // images
'jpg': 'image/jpeg', jpg: 'image/jpeg',
'ico': 'image/x-icon', ico: 'image/x-icon',
'tif': 'image/tiff', tif: 'image/tiff',
'svg': 'image/svg+xml', svg: 'image/svg+xml',
'svgz': 'image/svg+xml', svgz: 'image/svg+xml',
// archives // archives
'zip': app+'zip', zip: app+'zip',
'7z': app+'x-7z-compressed', '7z': app+'x-7z-compressed',
'rar': app+'x-rar-compressed', rar: app+'x-rar-compressed',
'cab': app+'vnd.ms-cab-compressed', cab: app+'vnd.ms-cab-compressed',
'gz': app+'x-gzip', gz: app+'x-gzip',
'tgz': app+'x-gzip', tgz: app+'x-gzip',
'bz': app+'x-bzip', bz: app+'x-bzip',
'bz2': app+'x-bzip2', bz2: app+'x-bzip2',
'deb': app+'x-debian-package', deb: app+'x-debian-package',
// audio // audio
'mp3': 'audio/mpeg', mp3: 'audio/mpeg',
'wav': 'audio/x-wav', wav: 'audio/x-wav',
'mp4a': 'audio/mp4', mp4a: 'audio/mp4',
'weba': 'audio/webm', weba: 'audio/webm',
'm3u': 'audio/x-mpegurl', m3u: 'audio/x-mpegurl',
// video // video
'qt': 'video/quicktime', qt: 'video/quicktime',
'mov': 'video/quicktime', mov: 'video/quicktime',
'wmv': 'video/windows-media', wmv: 'video/windows-media',
'avi': 'video/x-msvideo', avi: 'video/x-msvideo',
'3gp': 'video/3gpp', '3gp': 'video/3gpp',
'3g2': 'video/3gpp2', '3g2': 'video/3gpp2',
'mp4v': 'video/mp4', mp4v: 'video/mp4',
'mpg4': 'video/mp4', mpg4: 'video/mp4',
'ogv': 'video/ogg', ogv: 'video/ogg',
'm4v': 'video/x-m4v', m4v: 'video/x-m4v',
'asf': 'video/x-ms-asf', asf: 'video/x-ms-asf',
'asx': 'video/x-ms-asf', asx: 'video/x-ms-asf',
'wm': 'video/x-ms-wm', wm: 'video/x-ms-wm',
'wmx': 'video/x-ms-wmx', wmx: 'video/x-ms-wmx',
'wvx': 'video/x-ms-wvx', wvx: 'video/x-ms-wvx',
'movie': 'video/x-sgi-movie', movie: 'video/x-sgi-movie',
// adobe // adobe
'pdf': app+'pdf', pdf: app+'pdf',
'psd': 'image/vnd.adobe.photoshop', psd: 'image/vnd.adobe.photoshop',
'ai': app+'postscript', ai: app+'postscript',
'eps': app+'postscript', eps: app+'postscript',
'ps': app+'postscript', ps: app+'postscript',
// ms office // ms office
'doc': app+'msword', doc: app+'msword',
'rtf': app+'rtf', rtf: app+'rtf',
'xls': app+'vnd.ms-excel', xls: app+'vnd.ms-excel',
'ppt': app+'vnd.ms-powerpoint', ppt: app+'vnd.ms-powerpoint',
'docx': msOffice+'wordprocessingml.document', docx: msOffice+'wordprocessingml.document',
'xlsx': msOffice+'spreadsheetml.sheet', xlsx: msOffice+'spreadsheetml.sheet',
'dotx': msOffice+'wordprocessingml.template', dotx: msOffice+'wordprocessingml.template',
'pptx': msOffice+'presentationml.presentation', pptx: msOffice+'presentationml.presentation',
// open office // open office
'odt': openDoc+'text', odt: openDoc+'text',
'ods': openDoc+'spreadsheet', ods: openDoc+'spreadsheet',
'odp': openDoc+'presentation' odp: openDoc+'presentation'
}; };
export const FileType = { export const FileType = {

17
dev/Common/Translator.js
View file

@ -14,19 +14,12 @@ export const trigger = ko.observable(false);
* @returns {string} * @returns {string}
*/ */
export function i18n(key, valueList, defaulValue) { export function i18n(key, valueList, defaulValue) {
let valueName = '', let result = I18N_DATA[key] || defaulValue || key;
result = I18N_DATA[key];
if (undefined === result) { if (valueList) {
result = undefined === defaulValue ? key : defaulValue; Object.entries(valueList).forEach(([key, value]) => {
} result = result.replace('%' + key + '%', value);
});
if (null != valueList) {
for (valueName in valueList) {
if (Object.prototype.hasOwnProperty.call(valueList, valueName)) {
result = result.replace('%' + valueName + '%', valueList[valueName]);
}
}
} }
return result; return result;

30
dev/Model/Message.js
View file

@ -272,22 +272,22 @@ export class MessageModel extends AbstractModel {
lineAsCss() { lineAsCss() {
let classes = []; let classes = [];
Object.entries({ Object.entries({
'deleted': this.deleted(), deleted: this.deleted(),
'deleted-mark': this.isDeleted(), 'deleted-mark': this.isDeleted(),
'selected': this.selected(), selected: this.selected(),
'checked': this.checked(), checked: this.checked(),
'flagged': this.isFlagged(), flagged: this.isFlagged(),
'unseen': this.isUnseen(), unseen: this.isUnseen(),
'answered': this.isAnswered(), answered: this.isAnswered(),
'forwarded': this.isForwarded(), forwarded: this.isForwarded(),
'focused': this.focused(), focused: this.focused(),
'important': this.isImportant(), important: this.isImportant(),
'withAttachments': this.hasAttachments(), withAttachments: this.hasAttachments(),
'new': this.newForAnimation(), new: this.newForAnimation(),
'emptySubject': !this.subject(), emptySubject: !this.subject(),
// 'hasChildrenMessage': 1 < this.threadsLen(), // hasChildrenMessage: 1 < this.threadsLen(),
'hasUnseenSubMessage': this.hasUnseenSubMessage(), hasUnseenSubMessage: this.hasUnseenSubMessage(),
'hasFlaggedSubMessage': this.hasFlaggedSubMessage() hasFlaggedSubMessage: this.hasFlaggedSubMessage()
}).forEach(([key, value]) => value && classes.push(key)); }).forEach(([key, value]) => value && classes.push(key));
return classes.join(' '); return classes.join(' ');
} }

2
dev/Remote/AbstractFetch.js
View file

@ -162,7 +162,7 @@ export class AbstractFetchRemote
*/ */
jsVersion(fCallback, sVersion) { jsVersion(fCallback, sVersion) {
this.defaultRequest(fCallback, 'Version', { this.defaultRequest(fCallback, 'Version', {
'Version': sVersion Version: sVersion
}); });
} }

6
dev/Settings/Admin/Branding.js
View file

@ -13,19 +13,19 @@ export class BrandingAdminSettings {
this.title.subscribe(value => this.title.subscribe(value =>
Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.title.trigger, this), { Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.title.trigger, this), {
'Title': value.trim() Title: value.trim()
}) })
); );
this.loadingDesc.subscribe(value => this.loadingDesc.subscribe(value =>
Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.loadingDesc.trigger, this), { Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.loadingDesc.trigger, this), {
'LoadingDescription': value.trim() LoadingDescription: value.trim()
}) })
); );
this.faviconUrl.subscribe(value => this.faviconUrl.subscribe(value =>
Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.faviconUrl.trigger, this), { Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.faviconUrl.trigger, this), {
'FaviconUrl': value.trim() FaviconUrl: value.trim()
}) })
); );
} }

20
dev/Settings/Admin/Contacts.js
View file

@ -74,12 +74,12 @@ export class ContactsAdminSettings {
addSubscribablesTo(this, { addSubscribablesTo(this, {
enableContacts: value => enableContacts: value =>
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'ContactsEnable': value ? 1 : 0 ContactsEnable: value ? 1 : 0
}), }),
contactsSync: value => contactsSync: value =>
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'ContactsSync': value ? 1 : 0 ContactsSync: value ? 1 : 0
}), }),
contactsType: value => { contactsType: value => {
@ -87,23 +87,23 @@ export class ContactsAdminSettings {
this.testContactsError(false); this.testContactsError(false);
this.testContactsErrorMessage(''); this.testContactsErrorMessage('');
Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.contactsTypeTrigger, this), { Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.contactsTypeTrigger, this), {
'ContactsPdoType': value.trim() ContactsPdoType: value.trim()
}) })
}, },
pdoDsn: value => pdoDsn: value =>
Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.pdoDsnTrigger, this), { Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.pdoDsnTrigger, this), {
'ContactsPdoDsn': value.trim() ContactsPdoDsn: value.trim()
}), }),
pdoUser: value => pdoUser: value =>
Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.pdoUserTrigger, this), { Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.pdoUserTrigger, this), {
'ContactsPdoUser': value.trim() ContactsPdoUser: value.trim()
}), }),
pdoPassword: value => pdoPassword: value =>
Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.pdoPasswordTrigger, this), { Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.pdoPasswordTrigger, this), {
'ContactsPdoPassword': value.trim() ContactsPdoPassword: value.trim()
}) })
}) })
@ -121,10 +121,10 @@ export class ContactsAdminSettings {
this.testing(true); this.testing(true);
Remote.testContacts(this.onTestContactsResponse, { Remote.testContacts(this.onTestContactsResponse, {
'ContactsPdoType': this.contactsType(), ContactsPdoType: this.contactsType(),
'ContactsPdoDsn': this.pdoDsn(), ContactsPdoDsn: this.pdoDsn(),
'ContactsPdoUser': this.pdoUser(), ContactsPdoUser: this.pdoUser(),
'ContactsPdoPassword': this.pdoPassword() ContactsPdoPassword: this.pdoPassword()
}); });
} }

8
dev/Settings/Admin/General.js
View file

@ -93,12 +93,12 @@ export class GeneralAdminSettings {
addSubscribablesTo(this, { addSubscribablesTo(this, {
mainAttachmentLimit: value => mainAttachmentLimit: value =>
Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.attachmentLimitTrigger, this), { Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.attachmentLimitTrigger, this), {
'AttachmentLimit': pInt(value) AttachmentLimit: pInt(value)
}), }),
language: value => language: value =>
Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.languageTrigger, this), { Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.languageTrigger, this), {
'Language': value.trim() Language: value.trim()
}), }),
languageAdmin: value => { languageAdmin: value => {
@ -106,14 +106,14 @@ export class GeneralAdminSettings {
translatorReload(true, value) translatorReload(true, value)
.then(fReloadLanguageHelper(SaveSettingsStep.TrueResult), fReloadLanguageHelper(SaveSettingsStep.FalseResult)) .then(fReloadLanguageHelper(SaveSettingsStep.TrueResult), fReloadLanguageHelper(SaveSettingsStep.FalseResult))
.then(() => Remote.saveAdminConfig(null, { .then(() => Remote.saveAdminConfig(null, {
'LanguageAdmin': value.trim() LanguageAdmin: value.trim()
})); }));
}, },
theme: value => { theme: value => {
changeTheme(value, this.themeTrigger); changeTheme(value, this.themeTrigger);
Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.themeTrigger, this), { Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.themeTrigger, this), {
'Theme': value.trim() Theme: value.trim()
}); });
}, },

10
dev/Settings/Admin/Login.js
View file

@ -19,27 +19,27 @@ export class LoginAdminSettings {
addSubscribablesTo(this, { addSubscribablesTo(this, {
determineUserLanguage: value => determineUserLanguage: value =>
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'DetermineUserLanguage': value ? 1 : 0 DetermineUserLanguage: value ? 1 : 0
}), }),
determineUserDomain: value => determineUserDomain: value =>
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'DetermineUserDomain': value ? 1 : 0 DetermineUserDomain: value ? 1 : 0
}), }),
allowLanguagesOnLogin: value => allowLanguagesOnLogin: value =>
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'AllowLanguagesOnLogin': value ? 1 : 0 AllowLanguagesOnLogin: value ? 1 : 0
}), }),
hideSubmitButton: value => hideSubmitButton: value =>
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'hideSubmitButton': value ? 1 : 0 hideSubmitButton: value ? 1 : 0
}), }),
defaultDomain: value => defaultDomain: value =>
Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.defaultDomain.trigger, this), { Remote.saveAdminConfig(settingsSaveHelperSimpleFunction(this.defaultDomain.trigger, this), {
'LoginDefaultDomain': value.trim() LoginDefaultDomain: value.trim()
}) })
}); });
} }

2
dev/Settings/Admin/Plugins.js
View file

@ -24,7 +24,7 @@ export class PluginsAdminSettings {
this.enabledPlugins.subscribe(value => this.enabledPlugins.subscribe(value =>
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'EnabledPlugins': value ? 1 : 0 EnabledPlugins: value ? 1 : 0
}) })
); );
} }

12
dev/Settings/Admin/Security.js
View file

@ -57,36 +57,36 @@ export class SecurityAdminSettings {
capaOpenPGP: value => capaOpenPGP: value =>
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'CapaOpenPGP': value ? 1 : 0 CapaOpenPGP: value ? 1 : 0
}), }),
capaTwoFactorAuth: value => { capaTwoFactorAuth: value => {
value || this.capaTwoFactorAuthForce(false); value || this.capaTwoFactorAuthForce(false);
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'CapaTwoFactorAuth': value ? 1 : 0 CapaTwoFactorAuth: value ? 1 : 0
}); });
}, },
capaTwoFactorAuthForce: value => capaTwoFactorAuthForce: value =>
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'CapaTwoFactorAuthForce': value ? 1 : 0 CapaTwoFactorAuthForce: value ? 1 : 0
}), }),
useLocalProxyForExternalImages: value => useLocalProxyForExternalImages: value =>
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'UseLocalProxyForExternalImages': value ? 1 : 0 UseLocalProxyForExternalImages: value ? 1 : 0
}), }),
verifySslCertificate: value => { verifySslCertificate: value => {
value => value || this.allowSelfSigned(true); value => value || this.allowSelfSigned(true);
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'VerifySslCertificate': value ? 1 : 0 VerifySslCertificate: value ? 1 : 0
}); });
}, },
allowSelfSigned: value => allowSelfSigned: value =>
Remote.saveAdminConfig(null, { Remote.saveAdminConfig(null, {
'AllowSelfSigned': value ? 1 : 0 AllowSelfSigned: value ? 1 : 0
}) })
}); });

2
dev/Settings/User/Contacts.js
View file

@ -27,7 +27,7 @@ export class ContactsUserSettings {
this.contactsAutosave.subscribe(value => this.contactsAutosave.subscribe(value =>
Remote.saveSettings(null, { Remote.saveSettings(null, {
'ContactsAutosave': value ? 1 : 0 ContactsAutosave: value ? 1 : 0
}) })
); );

16
dev/Settings/User/General.js
View file

@ -68,19 +68,19 @@ export class GeneralUserSettings {
this.editorDefaultTypes = ko.computed(() => { this.editorDefaultTypes = ko.computed(() => {
translatorTrigger(); translatorTrigger();
return [ return [
{ 'id': EditorDefaultType.Html, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML') }, { id: EditorDefaultType.Html, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML') },
{ 'id': EditorDefaultType.Plain, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN') }, { id: EditorDefaultType.Plain, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN') },
{ 'id': EditorDefaultType.HtmlForced, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML_FORCED') }, { id: EditorDefaultType.HtmlForced, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML_FORCED') },
{ 'id': EditorDefaultType.PlainForced, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_FORCED') } { id: EditorDefaultType.PlainForced, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_FORCED') }
]; ];
}); });
this.layoutTypes = ko.computed(() => { this.layoutTypes = ko.computed(() => {
translatorTrigger(); translatorTrigger();
return [ return [
{ 'id': Layout.NoPreview, 'name': i18n('SETTINGS_GENERAL/LABEL_LAYOUT_NO_SPLIT') }, { id: Layout.NoPreview, name: i18n('SETTINGS_GENERAL/LABEL_LAYOUT_NO_SPLIT') },
{ 'id': Layout.SidePreview, 'name': i18n('SETTINGS_GENERAL/LABEL_LAYOUT_VERTICAL_SPLIT') }, { id: Layout.SidePreview, name: i18n('SETTINGS_GENERAL/LABEL_LAYOUT_VERTICAL_SPLIT') },
{ 'id': Layout.BottomPreview, 'name': i18n('SETTINGS_GENERAL/LABEL_LAYOUT_HORIZONTAL_SPLIT') } { id: Layout.BottomPreview, name: i18n('SETTINGS_GENERAL/LABEL_LAYOUT_HORIZONTAL_SPLIT') }
]; ];
}); });
@ -142,7 +142,7 @@ export class GeneralUserSettings {
} }
testSystemNotification() { testSystemNotification() {
NotificationUserStore.displayDesktopNotification('SnappyMail', 'Test notification', { }); NotificationUserStore.displayDesktopNotification('SnappyMail', 'Test notification');
} }
selectLanguage() { selectLanguage() {

16
dev/Settings/User/Security.js
View file

@ -25,14 +25,14 @@ export class SecurityUserSettings {
this.autoLogoutOptions = ko.computed(() => { this.autoLogoutOptions = ko.computed(() => {
translatorTrigger(); translatorTrigger();
return [ return [
{ 'id': 0, 'name': i18nLogout('NEVER_OPTION_NAME') }, { id: 0, name: i18nLogout('NEVER_OPTION_NAME') },
{ 'id': 5, 'name': i18nLogout('MINUTES_OPTION_NAME', { 'MINUTES': 5 }) }, { id: 5, name: i18nLogout('MINUTES_OPTION_NAME', { MINUTES: 5 }) },
{ 'id': 10, 'name': i18nLogout('MINUTES_OPTION_NAME', { 'MINUTES': 10 }) }, { id: 10, name: i18nLogout('MINUTES_OPTION_NAME', { MINUTES: 10 }) },
{ 'id': 30, 'name': i18nLogout('MINUTES_OPTION_NAME', { 'MINUTES': 30 }) }, { id: 30, name: i18nLogout('MINUTES_OPTION_NAME', { MINUTES: 30 }) },
{ 'id': 60, 'name': i18nLogout('MINUTES_OPTION_NAME', { 'MINUTES': 60 }) }, { id: 60, name: i18nLogout('MINUTES_OPTION_NAME', { MINUTES: 60 }) },
{ 'id': 60 * 2, 'name': i18nLogout('HOURS_OPTION_NAME', { 'HOURS': 2 }) }, { id: 60 * 2, name: i18nLogout('HOURS_OPTION_NAME', { HOURS: 2 }) },
{ 'id': 60 * 5, 'name': i18nLogout('HOURS_OPTION_NAME', { 'HOURS': 5 }) }, { id: 60 * 5, name: i18nLogout('HOURS_OPTION_NAME', { HOURS: 5 }) },
{ 'id': 60 * 10, 'name': i18nLogout('HOURS_OPTION_NAME', { 'HOURS': 10 }) } { id: 60 * 10, name: i18nLogout('HOURS_OPTION_NAME', { HOURS: 10 }) }
]; ];
}); });

2
dev/Settings/User/Themes.js
View file

@ -35,7 +35,7 @@ export class ThemesUserSettings {
changeTheme(value, this.themeTrigger); changeTheme(value, this.themeTrigger);
Remote.saveSettings(null, { Remote.saveSettings(null, {
'Theme': value Theme: value
}); });
}); });

6
dev/Stores/User/Message.js
View file

@ -247,16 +247,16 @@ export const MessageUserStore = new class {
NotificationUserStore.displayDesktopNotification( NotificationUserStore.displayDesktopNotification(
AccountUserStore.email(), AccountUserStore.email(),
i18n('MESSAGE_LIST/NEW_MESSAGE_NOTIFICATION', { i18n('MESSAGE_LIST/NEW_MESSAGE_NOTIFICATION', {
'COUNT': len COUNT: len
}), }),
{ 'Url': mailBox(newMessages[0].Folder, 1) } { Url: mailBox(newMessages[0].Folder, 1) }
); );
} else { } else {
newMessages.forEach(item => { newMessages.forEach(item => {
NotificationUserStore.displayDesktopNotification( NotificationUserStore.displayDesktopNotification(
EmailCollectionModel.reviveFromJson(item.From).toString(), EmailCollectionModel.reviveFromJson(item.From).toString(),
item.Subject, item.Subject,
{ 'Folder': item.Folder, 'Uid': item.Uid } { Folder: item.Folder, Uid: item.Uid }
); );
}); });
} }

4
dev/Stores/User/Pgp.js
View file

@ -49,7 +49,7 @@ function domControlEncryptedClickHelper(store, dom, armoredMessage, recipients)
this, this,
true, true,
i18n('PGP_NOTIFICATIONS/GOOD_SIGNATURE', { i18n('PGP_NOTIFICATIONS/GOOD_SIGNATURE', {
'USER': validPublicKey.user + ' (' + validPublicKey.id + ')' USER: validPublicKey.user + ' (' + validPublicKey.id + ')'
}), }),
decryptedMessage.getText() decryptedMessage.getText()
); );
@ -105,7 +105,7 @@ function domControlSignedClickHelper(store, dom, armoredMessage) {
this, this,
true, true,
i18n('PGP_NOTIFICATIONS/GOOD_SIGNATURE', { i18n('PGP_NOTIFICATIONS/GOOD_SIGNATURE', {
'USER': validKey.user + ' (' + validKey.id + ')' USER: validKey.user + ' (' + validKey.id + ')'
}), }),
message.getText() message.getText()
); );

12
dev/View/Popup/Compose.js
View file

@ -226,7 +226,7 @@ class ComposePopupView extends AbstractViewPopup {
sendButtonSuccess: () => !this.sendError() && !this.sendSuccessButSaveError(), sendButtonSuccess: () => !this.sendError() && !this.sendSuccessButSaveError(),
savedTimeText: () => savedTimeText: () =>
this.savedTime() ? i18n('COMPOSE/SAVED_TIME', { 'TIME': this.savedTime().format('LT') }) : '', this.savedTime() ? i18n('COMPOSE/SAVED_TIME', { TIME: this.savedTime().format('LT') }) : '',
emptyToErrorTooltip: () => (this.emptyToError() ? i18n('COMPOSE/EMPTY_TO_ERROR_DESC') : ''), emptyToErrorTooltip: () => (this.emptyToError() ? i18n('COMPOSE/EMPTY_TO_ERROR_DESC') : ''),
@ -254,9 +254,9 @@ class ComposePopupView extends AbstractViewPopup {
identitiesOptions: () => identitiesOptions: () =>
IdentityUserStore.map(item => ({ IdentityUserStore.map(item => ({
'item': item, item: item,
'optValue': item.id(), optValue: item.id(),
'optText': item.formattedName() optText: item.formattedName()
})), })),
currentIdentityView: () => { currentIdentityView: () => {
@ -931,8 +931,8 @@ class ComposePopupView extends AbstractViewPopup {
case ComposeType.ReplyAll: case ComposeType.ReplyAll:
sFrom = message.fromToLine(false, true); sFrom = message.fromToLine(false, true);
sReplyTitle = i18n('COMPOSE/REPLY_MESSAGE_TITLE', { sReplyTitle = i18n('COMPOSE/REPLY_MESSAGE_TITLE', {
'DATETIME': sDate, DATETIME: sDate,
'EMAIL': sFrom EMAIL: sFrom
}); });
sText = sText.replace(/<img[^>]+>/g, '').replace(/<a\s[^>]+><\/a>/g, '').trim(); sText = sText.replace(/<img[^>]+>/g, '').replace(/<a\s[^>]+><\/a>/g, '').trim();

62
dev/View/Popup/ComposeOpenPgp.js
View file

@ -49,9 +49,9 @@ class ComposeOpenPgpPopupView extends AbstractViewPopup {
return null; return null;
} }
return oKey.users.map(user => ({ return oKey.users.map(user => ({
'id': oKey.guid, id: oKey.guid,
'name': '(' + oKey.id.substr(KEY_NAME_SUBSTR).toUpperCase() + ') ' + user, name: '(' + oKey.id.substr(KEY_NAME_SUBSTR).toUpperCase() + ') ' + user,
'key': oKey key: oKey
})); }));
}); });
@ -64,9 +64,9 @@ class ComposeOpenPgpPopupView extends AbstractViewPopup {
return null; return null;
} }
return oKey.users.map(user => ({ return oKey.users.map(user => ({
'id': oKey.guid, id: oKey.guid,
'name': '(' + oKey.id.substr(KEY_NAME_SUBSTR).toUpperCase() + ') ' + user, name: '(' + oKey.id.substr(KEY_NAME_SUBSTR).toUpperCase() + ') ' + user,
'key': oKey key: oKey
})); }));
}); });
return opts.flat().filter(v => v); return opts.flat().filter(v => v);
@ -114,7 +114,7 @@ class ComposeOpenPgpPopupView extends AbstractViewPopup {
} else if (!this.signKey().key) { } else if (!this.signKey().key) {
this.notification( this.notification(
i18nPGP('NO_PRIVATE_KEY_FOUND_FOR', { i18nPGP('NO_PRIVATE_KEY_FOUND_FOR', {
'EMAIL': this.signKey().email EMAIL: this.signKey().email
}) })
); );
@ -150,7 +150,7 @@ class ComposeOpenPgpPopupView extends AbstractViewPopup {
} else if (oKey && oKey.email) { } else if (oKey && oKey.email) {
this.notification( this.notification(
i18nPGP('NO_PUBLIC_KEYS_FOUND_FOR', { i18nPGP('NO_PUBLIC_KEYS_FOUND_FOR', {
'EMAIL': oKey.email EMAIL: oKey.email
}) })
); );
@ -196,7 +196,7 @@ class ComposeOpenPgpPopupView extends AbstractViewPopup {
this.notification( this.notification(
i18nPGP('PGP_ERROR', { i18nPGP('PGP_ERROR', {
'ERROR': '' + e ERROR: '' + e
}) })
); );
} }
@ -211,13 +211,13 @@ class ComposeOpenPgpPopupView extends AbstractViewPopup {
.catch((e) => { .catch((e) => {
this.notification( this.notification(
i18nPGP('PGP_ERROR', { i18nPGP('PGP_ERROR', {
'ERROR': '' + e ERROR: '' + e
}) })
); );
}); });
} catch (e) { } catch (e) {
this.notification( this.notification(
i18nPGP('PGP_ERROR', {'ERROR': '' + e}) i18nPGP('PGP_ERROR', {ERROR: '' + e})
); );
} }
} }
@ -237,11 +237,11 @@ class ComposeOpenPgpPopupView extends AbstractViewPopup {
if (option) { if (option) {
this.signKey({ this.signKey({
'empty': !option.key, empty: !option.key,
'selected': ko.observable(!!option.key), selected: ko.observable(!!option.key),
'users': option.key.users, users: option.key.users,
'hash': option.key.id.substr(KEY_NAME_SUBSTR).toUpperCase(), hash: option.key.id.substr(KEY_NAME_SUBSTR).toUpperCase(),
'key': option.key key: option.key
}); });
} }
} }
@ -252,12 +252,12 @@ class ComposeOpenPgpPopupView extends AbstractViewPopup {
if (option) { if (option) {
this.encryptKeys.push({ this.encryptKeys.push({
'empty': !option.key, empty: !option.key,
'selected': ko.observable(!!option.key), selected: ko.observable(!!option.key),
'removable': ko.observable(!this.sign() || !this.signKey() || this.signKey().key.id !== option.key.id), removable: ko.observable(!this.sign() || !this.signKey() || this.signKey().key.id !== option.key.id),
'users': option.key.users, users: option.key.users,
'hash': option.key.id.substr(KEY_NAME_SUBSTR).toUpperCase(), hash: option.key.id.substr(KEY_NAME_SUBSTR).toUpperCase(),
'key': option.key key: option.key
}); });
} }
} }
@ -343,9 +343,9 @@ class ComposeOpenPgpPopupView extends AbstractViewPopup {
const keys = PgpUserStore.findAllPrivateKeysByEmailNotNative(emailLine); const keys = PgpUserStore.findAllPrivateKeysByEmailNotNative(emailLine);
if (keys && keys[0]) { if (keys && keys[0]) {
this.signKey({ this.signKey({
'users': keys[0].users || [emailLine], users: keys[0].users || [emailLine],
'hash': keys[0].id.substr(KEY_NAME_SUBSTR).toUpperCase(), hash: keys[0].id.substr(KEY_NAME_SUBSTR).toUpperCase(),
'key': keys[0] key: keys[0]
}); });
} }
} }
@ -360,14 +360,14 @@ class ComposeOpenPgpPopupView extends AbstractViewPopup {
const keys = PgpUserStore.findAllPublicKeysByEmailNotNative(recEmail); const keys = PgpUserStore.findAllPublicKeysByEmailNotNative(recEmail);
return keys return keys
? keys.map(publicKey => ({ ? keys.map(publicKey => ({
'empty': !publicKey, empty: !publicKey,
'selected': ko.observable(!!publicKey), selected: ko.observable(!!publicKey),
'removable': ko.observable( removable: ko.observable(
!this.sign() || !this.signKey() || this.signKey().key.id !== publicKey.id !this.sign() || !this.signKey() || this.signKey().key.id !== publicKey.id
), ),
'users': publicKey ? publicKey.users || [recEmail] : [recEmail], users: publicKey ? publicKey.users || [recEmail] : [recEmail],
'hash': publicKey ? publicKey.id.substr(KEY_NAME_SUBSTR).toUpperCase() : '', hash: publicKey ? publicKey.id.substr(KEY_NAME_SUBSTR).toUpperCase() : '',
'key': publicKey key: publicKey
})) }))
: []; : [];
}).flat().validUnique(encryptKey => encryptKey.hash) }).flat().validUnique(encryptKey => encryptKey.hash)

6
dev/View/Popup/Domain.js
View file

@ -63,13 +63,13 @@ class DomainPopupView extends AbstractViewPopup {
let result = ''; let result = '';
if (this.edit()) { if (this.edit()) {
result = i18n('POPUPS_DOMAIN/TITLE_EDIT_DOMAIN', { 'NAME': name }); result = i18n('POPUPS_DOMAIN/TITLE_EDIT_DOMAIN', { NAME: name });
if (aliasName) { if (aliasName) {
result += ' ← ' + aliasName; result += ' ← ' + aliasName;
} }
} else { } else {
result = name result = name
? i18n('POPUPS_DOMAIN/TITLE_ADD_DOMAIN_WITH_NAME', { 'NAME': name }) ? i18n('POPUPS_DOMAIN/TITLE_ADD_DOMAIN_WITH_NAME', { NAME: name })
: i18n('POPUPS_DOMAIN/TITLE_ADD_DOMAIN'); : i18n('POPUPS_DOMAIN/TITLE_ADD_DOMAIN');
} }
@ -78,7 +78,7 @@ class DomainPopupView extends AbstractViewPopup {
domainDesc: () => { domainDesc: () => {
const name = this.name(); const name = this.name();
return !this.edit() && name ? i18n('POPUPS_DOMAIN/NEW_DOMAIN_DESC', { 'NAME': '*@' + name }) : ''; return !this.edit() && name ? i18n('POPUPS_DOMAIN/NEW_DOMAIN_DESC', { NAME: '*@' + name }) : '';
}, },
domainIsComputed: () => { domainIsComputed: () => {

50
dev/View/Popup/Filter.js
View file

@ -66,22 +66,22 @@ class FilterPopupView extends AbstractViewPopup {
let i18nFilter = key => i18n('POPUPS_FILTER/SELECT_' + key); let i18nFilter = key => i18n('POPUPS_FILTER/SELECT_' + key);
this.fieldOptions([ this.fieldOptions([
{ 'id': FilterConditionField.From, 'name': i18n('GLOBAL/FROM') }, { id: FilterConditionField.From, name: i18n('GLOBAL/FROM') },
{ 'id': FilterConditionField.Recipient, 'name': i18nFilter('FIELD_RECIPIENTS') }, { id: FilterConditionField.Recipient, name: i18nFilter('FIELD_RECIPIENTS') },
{ 'id': FilterConditionField.Subject, 'name': i18n('GLOBAL/SUBJECT') }, { id: FilterConditionField.Subject, name: i18n('GLOBAL/SUBJECT') },
{ 'id': FilterConditionField.Size, 'name': i18nFilter('FIELD_SIZE') }, { id: FilterConditionField.Size, name: i18nFilter('FIELD_SIZE') },
{ 'id': FilterConditionField.Header, 'name': i18nFilter('FIELD_HEADER') } { id: FilterConditionField.Header, name: i18nFilter('FIELD_HEADER') }
]); ]);
this.typeOptions([ this.typeOptions([
{ 'id': FilterConditionType.Contains, 'name': i18nFilter('TYPE_CONTAINS') }, { id: FilterConditionType.Contains, name: i18nFilter('TYPE_CONTAINS') },
{ 'id': FilterConditionType.NotContains, 'name': i18nFilter('TYPE_NOT_CONTAINS') }, { id: FilterConditionType.NotContains, name: i18nFilter('TYPE_NOT_CONTAINS') },
{ 'id': FilterConditionType.EqualTo, 'name': i18nFilter('TYPE_EQUAL_TO') }, { id: FilterConditionType.EqualTo, name: i18nFilter('TYPE_EQUAL_TO') },
{ 'id': FilterConditionType.NotEqualTo, 'name': i18nFilter('TYPE_NOT_EQUAL_TO') } { id: FilterConditionType.NotEqualTo, name: i18nFilter('TYPE_NOT_EQUAL_TO') }
]); ]);
// this.actionTypeOptions.push({'id': FilterAction.None, // this.actionTypeOptions.push({id: FilterAction.None,
// 'name': i18n('GLOBAL/NONE')}); // name: i18n('GLOBAL/NONE')});
const modules = SieveUserStore.capa; const modules = SieveUserStore.capa;
if (modules) { if (modules) {
if (modules.includes('imap4flags')) { if (modules.includes('imap4flags')) {
@ -90,45 +90,45 @@ class FilterPopupView extends AbstractViewPopup {
if (modules.includes('fileinto')) { if (modules.includes('fileinto')) {
this.actionTypeOptions.push({ this.actionTypeOptions.push({
'id': FilterAction.MoveTo, id: FilterAction.MoveTo,
'name': i18nFilter('ACTION_MOVE_TO') name: i18nFilter('ACTION_MOVE_TO')
}); });
this.actionTypeOptions.push({ this.actionTypeOptions.push({
'id': FilterAction.Forward, id: FilterAction.Forward,
'name': i18nFilter('ACTION_FORWARD_TO') name: i18nFilter('ACTION_FORWARD_TO')
}); });
} }
if (modules.includes('reject')) { if (modules.includes('reject')) {
this.actionTypeOptions.push({ 'id': FilterAction.Reject, 'name': i18nFilter('ACTION_REJECT') }); this.actionTypeOptions.push({ id: FilterAction.Reject, name: i18nFilter('ACTION_REJECT') });
} }
if (modules.includes('vacation')) { if (modules.includes('vacation')) {
this.actionTypeOptions.push({ this.actionTypeOptions.push({
'id': FilterAction.Vacation, id: FilterAction.Vacation,
'name': i18nFilter('ACTION_VACATION_MESSAGE') name: i18nFilter('ACTION_VACATION_MESSAGE')
}); });
} }
if (modules.includes('body')) { if (modules.includes('body')) {
this.fieldOptions.push({ 'id': FilterConditionField.Body, 'name': i18nFilter('FIELD_BODY') }); this.fieldOptions.push({ id: FilterConditionField.Body, name: i18nFilter('FIELD_BODY') });
} }
if (modules.includes('regex')) { if (modules.includes('regex')) {
this.typeOptions.push({ 'id': FilterConditionType.Regex, 'name': 'Regex' }); this.typeOptions.push({ id: FilterConditionType.Regex, name: 'Regex' });
} }
} }
this.actionTypeOptions.push({ 'id': FilterAction.Discard, 'name': i18nFilter('ACTION_DISCARD') }); this.actionTypeOptions.push({ id: FilterAction.Discard, name: i18nFilter('ACTION_DISCARD') });
this.typeOptionsSize([ this.typeOptionsSize([
{ 'id': FilterConditionType.Over, 'name': i18nFilter('TYPE_OVER') }, { id: FilterConditionType.Over, name: i18nFilter('TYPE_OVER') },
{ 'id': FilterConditionType.Under, 'name': i18nFilter('TYPE_UNDER') } { id: FilterConditionType.Under, name: i18nFilter('TYPE_UNDER') }
]); ]);
this.typeOptionsBody([ this.typeOptionsBody([
{ 'id': FilterConditionType.Text, 'name': i18nFilter('TYPE_TEXT') }, { id: FilterConditionType.Text, name: i18nFilter('TYPE_TEXT') },
{ 'id': FilterConditionType.Raw, 'name': i18nFilter('TYPE_RAW') } { id: FilterConditionType.Raw, name: i18nFilter('TYPE_RAW') }
]); ]);
} }

2
dev/View/Popup/FolderClear.js
View file

@ -29,7 +29,7 @@ class FolderClearPopupView extends AbstractViewPopup {
return folder ? folder.localName() : ''; return folder ? folder.localName() : '';
}, },
dangerDescHtml: () => i18n('POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_1', { 'FOLDER': this.folderNameForClear() }) dangerDescHtml: () => i18n('POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_1', { FOLDER: this.folderNameForClear() })
}); });
decorateKoCommands(this, { decorateKoCommands(this, {

14
dev/View/Popup/Plugin.js
View file

@ -74,13 +74,13 @@ class PluginPopupView extends AbstractViewPopup {
if (isNonEmptyArray(config)) { if (isNonEmptyArray(config)) {
this.configures( this.configures(
config.map(item => ({ config.map(item => ({
'value': ko.observable(item[0]), value: ko.observable(item[0]),
'placeholder': ko.observable(item[6]), placeholder: ko.observable(item[6]),
'Name': item[1], Name: item[1],
'Type': item[2], Type: item[2],
'Label': item[3], Label: item[3],
'Default': item[4], Default: item[4],
'Desc': item[5] Desc: item[5]
})) }))
); );
} }

12
dev/View/User/MailBox/MessageList.js
View file

@ -114,15 +114,15 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
}); });
// append drag and drop // append drag and drop
this.dragOver = ko.observable(false).extend({ 'throttle': 1 }); this.dragOver = ko.observable(false).extend({ throttle: 1 });
this.dragOverEnter = ko.observable(false).extend({ 'throttle': 1 }); this.dragOverEnter = ko.observable(false).extend({ throttle: 1 });
this.sLastSearchValue = ''; this.sLastSearchValue = '';
this.addComputables({ this.addComputables({
messageListSearchDesc: () => { messageListSearchDesc: () => {
const value = MessageUserStore.listEndSearch(); const value = MessageUserStore.listEndSearch();
return value ? i18n('MESSAGE_LIST/SEARCH_RESULT_FOR', { 'SEARCH': value }) : '' return value ? i18n('MESSAGE_LIST/SEARCH_RESULT_FOR', { SEARCH: value }) : ''
}, },
messageListPaginator: computedPaginatorHelper(MessageUserStore.listPage, messageListPaginator: computedPaginatorHelper(MessageUserStore.listPage,
@ -871,9 +871,9 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
quotaTooltip() { quotaTooltip() {
return i18n('MESSAGE_LIST/QUOTA_SIZE', { return i18n('MESSAGE_LIST/QUOTA_SIZE', {
'SIZE': FileInfo.friendlySize(this.userUsageSize()), SIZE: FileInfo.friendlySize(this.userUsageSize()),
'PROC': this.userUsageProc(), PROC: this.userUsageProc(),
'LIMIT': FileInfo.friendlySize(this.userQuota()) LIMIT: FileInfo.friendlySize(this.userQuota())
}); });
} }

2
dev/View/User/MailBox/MessageView.js
View file

@ -732,7 +732,7 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
oMessage.folder, oMessage.folder,
oMessage.uid, oMessage.uid,
oMessage.readReceipt(), oMessage.readReceipt(),
i18n('READ_RECEIPT/SUBJECT', { 'SUBJECT': oMessage.subject() }), i18n('READ_RECEIPT/SUBJECT', { SUBJECT: oMessage.subject() }),
i18n('READ_RECEIPT/BODY', { 'READ-RECEIPT': AccountUserStore.email() }) i18n('READ_RECEIPT/BODY', { 'READ-RECEIPT': AccountUserStore.email() })
); );