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

Commit 3f9037d4 authored by Ronak Patel's avatar Ronak Patel
Browse files

Merge branch 'dev/remove-code-duplicate' into 'main' 

Remove duplication and use EmailRecovery functions

See merge request !142
parents 3c39e711 bc1b6c47

appinfo/info.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
		<personal-section>OCA\EcloudAccounts\Settings\BetaSection</personal-section>

	</settings>

    <commands>

        <command>OCA\EcloudAccounts\Command\UpdateBlacklistedDomains</command>

        <command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>

        <command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>

        <command>OCA\EcloudAccounts\Command\MapActiveAttributetoLDAP</command>

l10n/de.js

+1 −5
Original line number Diff line number Diff line
@@ -79,12 +79,8 @@ OC.L10N.register( 
		"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",

		"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!",

		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",

		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",

		"The domain of this email address is blacklisted. Please provide another recovery address.": "Die Domäne dieser E-Mailadresse ist auf der Sperrliste. Bitte geben Sie eine andere E-Mailadresse an."

		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"

	},

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

l10n/de.json

+1 −5
Original line number Diff line number Diff line
@@ -77,13 +77,9 @@ 
		"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",

		"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!",

		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",

		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",

		"The domain of this email address is blacklisted. Please provide another recovery address.": "Die Domäne dieser E-Mailadresse ist auf der Sperrliste. Bitte geben Sie eine andere E-Mailadresse an."

		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"

	},

	"pluralForm": "nplurals=2; plural=(n != 1);"

}

l10n/en.js

+1 −6
Original line number Diff line number Diff line
@@ -77,18 +77,13 @@ OC.L10N.register( 
		"Success!": "Success!",

		"Your <b>__username__@__domain__</b> account was successfully created.": "Your <b>__username__@__domain__</b> account was successfully created.",

		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.",

		"Recovery email address is already taken.": "Recovery email address is already taken.",

		"Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32",

		"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",

		"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!",

		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",

		"An error occurred while creating your account!": "An error occurred while creating your account!",

		"The domain of this email address is blacklisted. Please provide another recovery address.": "The domain of this email address is blacklisted. Please provide another recovery address."

		"An error occurred while creating your account!": "An error occurred while creating your account!"

	},

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

l10n/en.json

+1 −5
Original line number Diff line number Diff line
@@ -79,13 +79,9 @@ 
		"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",

		"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!",

		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",

		"An error occurred while creating your account!": "An error occurred while creating your account!",

		"The domain of this email address is blacklisted. Please provide another recovery address.": "The domain of this email address is blacklisted. Please provide another recovery address."

		"An error occurred while creating your account!": "An error occurred while creating your account!"

	},

	"pluralForm": "nplurals=2; plural=(n != 1);"

}