Upgrade i18n() to use Object.entries()

And replace quoted object keys to be without quotes

Author: djmaze

dev/Common/File.js

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

dev/Common/Translator.js

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

dev/Model/Message.js

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

dev/Remote/AbstractFetch.js

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

dev/Settings/Admin/Branding.js

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

dev/Settings/Admin/Contacts.js

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

dev/Settings/Admin/General.js

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

dev/Settings/Admin/Login.js

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

dev/Settings/Admin/Plugins.js

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