adapt to upstream pull request (eb545788) · Commits · e / infra / ecloud / nextcloud-apps / nextcloud-theme

apps/passwords/js/Static/compatibility.js

+14 −17

Original line number	Diff line number	Diff line
		@@ -42,30 +42,27 @@ function showBrowserCompatibilityWarning() {
		throw new Error('Browser does not suport ECMAScript 2017 / ES2017');
		}

		function isWebAssemblyEnable(){
		if(!window.hasOwnProperty('WebAssembly') \|\| typeof window.WebAssembly.instantiate !== "function") {
		console.error('WebAssembly not supported');
		return false;
		}
		}

		function showWebAssemblyCompatibilityWarning() {

		var imgpath = OC.generateUrl('themes/eCloud/apps/passwords/img/warning.png'),
		container = document.getElementById('main');
		container.innerHTML =
		'<div class="passwords-browser-compatibility">' +
		'<div class="message password-message"><img class="passwords-warning" src="' + imgpath +'"/>To view this website properly, please enable Javascript JIT.' +
		'</div><div class="passwords-info" >' +
		'<h3 class="passwords-title">How to enable it</h3>' +
		'<p>JavaScript JIT is disabled by default in the browser in order to render web content in a more secure configuration.</p><br />' +
		'<p><b>Steps:</b> You can always enable Javascript JIT in the settings. To do it, click on the 3 dots icon at the top left corner and go to:' +
		'<div class="passwords-quote">Settings > Site settings</div>' +
		'Then, enable <b>Javascript JIT</b> at the bottom of the list.' +
		'</p></div></div>';
		'<div class="passwords-browser-compatibility passwords-jit-compatibility">' +
		'<div class="message"><img class="warning-icon" src="' + imgpath +'"/>'+OC.L10N.translate('passwords', 'To view this website properly, please enable Javascript JIT.') +
		'</div><div class="info" >' +
		'<h3 class="howto">' + OC.L10N.translate('passwords', 'How to enable it') + '</h3>' +
		'<p>' + OC.L10N.translate('passwords', 'JavaScript JIT might be disabled in your browser in order to render web content in a more secure configuration. You can always enable Javascript JIT in the settings, depending on your web browser.') + '</p><br />' +
		'</div></div>';
		container.setAttribute('class', '');

		throw new Error('Browser does not suport ECMAScript 2017 / ES2017');
		}

		function isWebAssemblyEnable(){
		if(!window.hasOwnProperty('WebAssembly') \|\| typeof window.WebAssembly.instantiate !== "function") {
		console.error('WebAssembly not supported');
		return false;
		}
		throw new Error('Browser does not suport WebAssembly');
		}

		function checkSystem() {

core/css/server.css

+5 −5

Original line number	Diff line number	Diff line
		@@ -1803,31 +1803,31 @@ textarea {

		/* Nextcloud passwords compatibility error style */

		.passwords-info {
		.passwords-jit-compatibility .info {
		max-width: 400px;
		margin: auto;
		color: var(--color-main-text);
		padding: 0px 24px 24px 24px;
		}

		.passwords-quote {
		.passwords-jit-compatibility .quote {
		padding: 8px 8px 8px 8px;
		background: #D0D0D036;
		margin-top: 8px;
		margin-bottom: 8px;
		}
		.passwords-title{
		.passwords-jit-compatibility .howto{
		color: var(--color-main-text);
		font-weight: bold;
		font-size: 20px;
		}

		.passwords-warning{
		.passwords-jit-compatibility .warning-icon{
		margin-right: 4px;
		height: 24px;
		}

		.password-message{
		.passwords-jit-compatibility .message{
		display: flex;
		justify-content: center;
		}

core/l10n/en.js

+2 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ OC.L10N.register(
		"Your files are encrypted. There will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?": "Your files are encrypted. There will be no way to get your data back after your password is reset. If you are not sure what to do, please contact Murena Cloud at helpdesk@murena.com before you continue. Do you really want to continue?",
		"Password cannot be changed. Please contact your administrator.": "Password cannot be changed. Please contact Murena Cloud at helpdesk@murena.com.",
		"If it is not there ask your local administrator.": "",
		"Due to encryption the search is only done on files' name.": "Due to encryption the search is only done on files' name."
		"Due to encryption the search is only done on files' name.": "Due to encryption the search is only done on files' name.",

		},
		"nplurals=2; plural=(n != 1);");

core/l10n/en.json

+3 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,8 @@
		"Your files are encrypted. There will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?": "Your files are encrypted. There will be no way to get your data back after your password is reset. If you are not sure what to do, please contact Murena Cloud at helpdesk@murena.com before you continue. Do you really want to continue?",
		"Password cannot be changed. Please contact your administrator.": "Password cannot be changed. Please contact Murena Cloud at helpdesk@murena.com.",
		"If it is not there ask your local administrator.": "",
		"Due to encryption the search is only done on files' name.": "Due to encryption the search is only done on files' name."
		"Due to encryption the search is only done on files' name.": "Due to encryption the search is only done on files' name.",
		"JavaScript JIT is disabled by default in the browser in order to render web content in a more secure configuration. You can always enable Javascript JIT in the settings, depending on your web browser.": "<p><b>Steps:</b> You can always enable Javascript JIT in the settings. To do it, click on the 3 dots icon at the top left corner and go to:<div class="quote">Settings > Site settings</div>Then, enable <b>Javascript JIT</b> at the bottom of the list.</p>"
		},
		"pluralForm": "nplurals=2; plural=(n != 1);"
		}

core/l10n/fr.js

+3 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@ OC.L10N.register(
		"Your files are encrypted. There will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?": "Vos fichiers sont cryptés. Il n'y aura aucun moyen de récupérer vos données après la réinitialisation de votre mot de passe. Si vous n'êtes pas sûr de ce que vous devez faire, veuillez contacter Murena Cloud au helpdesk@murena.com avant de continuer. Voulez-vous vraiment continuer?",
		"Password cannot be changed. Please contact your administrator.": "Le mot de passe ne peut pas être modifié. Veuillez contacter Murena Cloud à helpdesk@murena.com.",
		"If it is not there ask your local administrator.": "",
		"Due to encryption the search is only done on files' name.": "Les fichiers étant chiffrés, la recherche n'est effectuée que sur le nom des fichiers."
		"Due to encryption the search is only done on files' name.": "Les fichiers étant chiffrés, la recherche n'est effectuée que sur le nom des fichiers.",
		"JavaScript JIT is disabled by default in the browser in order to render web content in a more secure configuration. You can always enable Javascript JIT in the settings, depending on your web browser.": "<p><b>Steps:</b> You can always enable Javascript JIT in the settings. To do it, click on the 3 dots icon at the top left corner and go to:<div class=\"quote\">Settings > Site settings</div>Then, enable <b>Javascript JIT</b> at the bottom of the list.</p>"

		},
		"nplurals=2; plural=(n != 1);");