Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 886ffee8 authored Mar 06, 2024 by Ronak Patel

Merge branch 'dev/restrict-murena-domain-as-recovery' into 'main'

user cannot use legacy domain or main domain as recovery email

See merge request !97

parents e4ad54a0 5e70efdc

appinfo/info.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		<description><![CDATA[in /e/OS cloud, nextcloud accounts are linked to mail accounts. This app ensures both are coordinated: it sets the e-mail address, quota and storage of the user upon creation.
		It also completes the account deletion by cleaning other parts of the /e/OS cloud setup to ensure no more data is retained when a user requests an account deletion.
		This app uses the UserDeletedEvent to invoke scripts in the docker-welcome container of /e/OS cloud setup]]></description>
		<version>4.0.0</version>
		<version>4.0.1</version>
		<licence>agpl</licence>
		<author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
		<namespace>EcloudAccounts</namespace>

l10n/de.js

+5 −1

Original line number	Diff line number	Diff line
		@@ -78,6 +78,10 @@ OC.L10N.register(
		"Use an alternative email": "Verwenden Sie eine alternative E-Mail",
		"Important:": "Das ist wichtig:",
		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.",
		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse"
		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse",
		"Recovery email address has an incorrect format.": "Die E-Mail-Adresse für die Wiederherstellung hat ein falsches Format.",
		"Recovery email address is already taken.": "Die E-Mail-Adresse für die Wiederherstellung ist bereits vergeben.",
		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
		"Captcha is not verified!": "Captcha wird nicht überprüft!"
		},
		"nplurals=2; plural=(n != 1);");

l10n/de.json

+5 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,11 @@
		"Use an alternative email": "Verwenden Sie eine alternative E-Mail",
		"Important:": "Das ist wichtig:",
		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.",
		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse"
		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse",
		"Recovery email address has an incorrect format.": "Die E-Mail-Adresse für die Wiederherstellung hat ein falsches Format.",
		"Recovery email address is already taken.": "Die E-Mail-Adresse für die Wiederherstellung ist bereits vergeben.",
		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
		"Captcha is not verified!": "Captcha wird nicht überprüft!"
		},
		"pluralForm": "nplurals=2; plural=(n != 1);"
		}

l10n/en.js

+5 −1

Original line number	Diff line number	Diff line
		@@ -82,6 +82,10 @@ OC.L10N.register(
		"Use an alternative email": "Use an alternative email",
		"Important:": "Important:",
		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.",
		"Set a recovery email address": "Set a recovery email address"
		"Set a recovery email address": "Set a recovery email address",
		"Recovery email address has an incorrect format.": "Recovery email address has an incorrect format.",
		"Recovery email address is already taken.": "Recovery email address is already taken.",
		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
		"Captcha is not verified!": "Captcha is not verified!"
		},
		"nplurals=2; plural=(n != 1);");

l10n/en.json

+5 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,11 @@
		"Use an alternative email": "Use an alternative email",
		"Important:": "Important:",
		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.",
		"Set a recovery email address": "Set a recovery email address"
		"Set a recovery email address": "Set a recovery email address",
		"Recovery email address has an incorrect format.": "Recovery email address has an incorrect format.",
		"Recovery email address is already taken.": "Recovery email address is already taken.",
		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
		"Captcha is not verified!": "Captcha is not verified!"
		},
		"pluralForm": "nplurals=2; plural=(n != 1);"
		}