Merge branch 'master' into plugin-2fa

dev/Common/Links.js

@@ -1,14 +1,12 @@
 import { pString, pInt } from 'Common/Utils';
-import { Settings, SettingsGet } from 'Common/Globals';
+import { Settings } from 'Common/Globals';
 
 const
 	ROOT = './',
 	HASH_PREFIX = '#/',
 	SERVER_PREFIX = './?',
 	VERSION = Settings.app('version'),
-	VERSION_PREFIX = Settings.app('webVersionPath') || 'snappymail/v/' + VERSION + '/',
-
-	getHash = () => SettingsGet('AuthAccountHash') || '0';
+	VERSION_PREFIX = Settings.app('webVersionPath') || 'snappymail/v/' + VERSION + '/';
 
 /**
  * @returns {string}
@@ -40,7 +38,7 @@ export function logoutLink() {
  */
 export function serverRequestRaw(type, hash, customSpecSuffix) {
 	return SERVER_PREFIX + '/Raw/' + SUB_QUERY_PREFIX + '/'
-		+ (null == customSpecSuffix ? getHash() : customSpecSuffix) + '/'
+		+ (null == customSpecSuffix ? '0' : customSpecSuffix) + '/'
 		+ (type
 			? type + '/' + (hash ? SUB_QUERY_PREFIX + '/' + hash : '')
 			: '')
@@ -61,7 +59,7 @@ export function attachmentDownload(download, customSpecSuffix) {
  * @returns {string}
  */
 export function serverRequest(type) {
-	return SERVER_PREFIX + '/' + type + '/' + SUB_QUERY_PREFIX + '/' + getHash() + '/';
+	return SERVER_PREFIX + '/' + type + '/' + SUB_QUERY_PREFIX + '/0/';
 }
 
 /**

dev/Common/Translator.js

@@ -3,7 +3,7 @@ import { Notification, UploadErrorCode } from 'Common/Enums';
 import { langLink } from 'Common/Links';
 import { doc, createElement } from 'Common/Globals';
 
-let I18N_DATA = window.snappymailI18N || {};
+let I18N_DATA = {};
 
 export const trigger = ko.observable(false);
 
@@ -49,10 +49,21 @@ const i18nToNode = element => {
 	}
 },
 
+	init = () => {
+		if (rl.I18N) {
+			I18N_DATA = rl.I18N;
+			Date.defineRelativeTimeFormat(rl.relativeTime || {});
+			rl.I18N = null;
+			return 1;
+		}
+	},
+
 	i18nKey = key => key.replace(/([a-z])([A-Z])/g, '$1_$2').toUpperCase(),
 
 	getKeyByValue = (o, v) => Object.keys(o).find(key => o[key] === v);
 
+init();
+
 /**
  * @param {Object} elements
  * @param {boolean=} animate = false
@@ -127,13 +138,11 @@ export function reload(admin, language) {
 		const script = createElement('script');
 		script.onload = () => {
 			// reload the data
-			if (window.snappymailI18N) {
-				I18N_DATA = window.snappymailI18N;
+			if (init()) {
 				i18nToNodes(doc);
 				dispatchEvent(new CustomEvent('reload-time'));
 				trigger(!trigger());
 			}
-			window.snappymailI18N = null;
 			script.remove();
 			resolve();
 		};

dev/Common/Utils.js

@@ -1,5 +1,5 @@
 import { SaveSettingsStep } from 'Common/Enums';
-import { doc, createElement, elementById } from 'Common/Globals';
+import { doc, elementById } from 'Common/Globals';
 
 export const
 	isArray = Array.isArray,
@@ -84,14 +84,13 @@ let __themeTimer = 0,
  * @returns {void}
  */
 export function changeTheme(value, themeTrigger = ()=>{}) {
-	const themeLink = elementById('app-theme-link'),
+	const themeStyle = elementById('app-theme-style'),
 		clearTimer = () => {
 			__themeTimer = setTimeout(() => themeTrigger(SaveSettingsStep.Idle), 1000);
 			__themeJson = null;
 		};
 
-	let themeStyle = elementById('app-theme-style'),
-		url = (themeLink && themeLink.href) || (themeStyle && themeStyle.dataset.href);
+	let url = themeStyle.dataset.href;
 
 	if (url) {
 		url = url.toString()
@@ -118,19 +117,9 @@ export function changeTheme(value, themeTrigger = ()=>{}) {
 		rl.fetchJSON(url, init)
 			.then(data => {
 				if (data && isArray(data) && 2 === data.length) {
-					if (themeLink && !themeStyle) {
-						themeStyle = createElement('style');
-						themeStyle.id = 'app-theme-style';
-						themeLink.after(themeStyle);
-						themeLink.remove();
-					}
-
-					if (themeStyle) {
-						themeStyle.textContent = data[1];
-						themeStyle.dataset.href = url;
-						themeStyle.dataset.theme = data[0];
-					}
-
+					themeStyle.textContent = data[1];
+					themeStyle.dataset.href = url;
+					themeStyle.dataset.theme = data[0];
 					themeTrigger(SaveSettingsStep.TrueResult);
 				}
 			})