Signed-off-by: Morris Jobke <hey@morrisjobke.de>tags/v13.0.0beta1
@@ -39,7 +39,7 @@ namespace OCP\Mail; | |||
* | |||
* $emailTemplate->addHeader(); | |||
* $emailTemplate->addHeading('Welcome aboard'); | |||
* $emailTemplate->addBodyText('You now have an Nextcloud account, you can add, protect, and share your data.'); | |||
* $emailTemplate->addBodyText('Welcome to your Nextcloud account, you can add, protect, and share your data.'); | |||
* | |||
* $emailTemplate->addBodyButtonGroup( | |||
* 'Set your password', 'https://example.org/resetPassword/q1234567890qwertz', |
@@ -136,7 +136,7 @@ class NewUserMailHelper { | |||
} else { | |||
$emailTemplate->addHeading($this->l10n->t('Welcome aboard %s', [$displayName])); | |||
} | |||
$emailTemplate->addBodyText($this->l10n->t('You now have an %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()])); | |||
$emailTemplate->addBodyText($this->l10n->t('Welcome to your %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()])); | |||
$emailTemplate->addBodyText($this->l10n->t('Your username is: %s', [$userId])); | |||
if ($generatePasswordResetToken) { | |||
$leftButtonText = $this->l10n->t('Set your password'); |
@@ -237,7 +237,7 @@ class NewUserMailHelperTest extends TestCase { | |||
<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"> | |||
<tr style="padding:0;text-align:left;vertical-align:top"> | |||
<th style="Margin:0;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"> | |||
<p class="text-left" style="Margin:0;Margin-bottom:10px;color:#777;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">You now have an TestCloud account, you can add, protect, and share your data.</p> | |||
<p class="text-left" style="Margin:0;Margin-bottom:10px;color:#777;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">Welcome to your TestCloud account, you can add, protect, and share your data.</p> | |||
</th> | |||
<th class="expander" style="Margin:0;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0!important;text-align:left;visibility:hidden;width:0"></th> | |||
</tr> | |||
@@ -350,7 +350,7 @@ EOF; | |||
$expectedTextBody = <<<EOF | |||
Welcome aboard | |||
You now have an TestCloud account, you can add, protect, and share your data. | |||
Welcome to your TestCloud account, you can add, protect, and share your data. | |||
Your username is: john | |||
@@ -470,7 +470,7 @@ EOF; | |||
<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"> | |||
<tr style="padding:0;text-align:left;vertical-align:top"> | |||
<th style="Margin:0;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"> | |||
<p class="text-left" style="Margin:0;Margin-bottom:10px;color:#777;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">You now have an TestCloud account, you can add, protect, and share your data.</p> | |||
<p class="text-left" style="Margin:0;Margin-bottom:10px;color:#777;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">Welcome to your TestCloud account, you can add, protect, and share your data.</p> | |||
</th> | |||
<th class="expander" style="Margin:0;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0!important;text-align:left;visibility:hidden;width:0"></th> | |||
</tr> | |||
@@ -583,7 +583,7 @@ EOF; | |||
$expectedTextBody = <<<EOF | |||
Welcome aboard John Doe | |||
You now have an TestCloud account, you can add, protect, and share your data. | |||
Welcome to your TestCloud account, you can add, protect, and share your data. | |||
Your username is: john | |||
@@ -1,6 +1,6 @@ | |||
Welcome aboard - text | |||
You now have an Nextcloud account, you can add, protect, and share your data. - text | |||
Welcome to your Nextcloud account, you can add, protect, and share your data. - text | |||
Your username is: abc | |||
@@ -76,7 +76,7 @@ | |||
<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"> | |||
<tr style="padding:0;text-align:left;vertical-align:top"> | |||
<th style="Margin:0;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"> | |||
<p class="text-left" style="Margin:0;Margin-bottom:10px;color:#777;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">You now have an Nextcloud account, you can add, protect, and share your data.</p> | |||
<p class="text-left" style="Margin:0;Margin-bottom:10px;color:#777;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">Welcome to your Nextcloud account, you can add, protect, and share your data.</p> | |||
</th> | |||
<th class="expander" style="Margin:0;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0!important;text-align:left;visibility:hidden;width:0"></th> | |||
</tr> |
@@ -1,6 +1,6 @@ | |||
Welcome aboard | |||
You now have an Nextcloud account, you can add, protect, and share your data. | |||
Welcome to your Nextcloud account, you can add, protect, and share your data. | |||
Your username is: abc | |||
@@ -76,7 +76,7 @@ | |||
<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"> | |||
<tr style="padding:0;text-align:left;vertical-align:top"> | |||
<th style="Margin:0;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"> | |||
<p class="text-left" style="Margin:0;Margin-bottom:10px;color:#777;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">You now have an Nextcloud account, you can add, protect, and share your data.</p> | |||
<p class="text-left" style="Margin:0;Margin-bottom:10px;color:#777;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">Welcome to your Nextcloud account, you can add, protect, and share your data.</p> | |||
</th> | |||
<th class="expander" style="Margin:0;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0!important;text-align:left;visibility:hidden;width:0"></th> | |||
</tr> |
@@ -1,6 +1,6 @@ | |||
Welcome aboard | |||
You now have an Nextcloud account, you can add, protect, and share your data. | |||
Welcome to your Nextcloud account, you can add, protect, and share your data. | |||
Your username is: abc | |||
@@ -76,7 +76,7 @@ | |||
<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"> | |||
<tr style="padding:0;text-align:left;vertical-align:top"> | |||
<th style="Margin:0;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"> | |||
<p class="text-left" style="Margin:0;Margin-bottom:10px;color:#777;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">You now have an Nextcloud account, you can add, protect, and share your data.</p> | |||
<p class="text-left" style="Margin:0;Margin-bottom:10px;color:#777;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">Welcome to your Nextcloud account, you can add, protect, and share your data.</p> | |||
</th> | |||
<th class="expander" style="Margin:0;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0!important;text-align:left;visibility:hidden;width:0"></th> | |||
</tr> |
@@ -1,6 +1,6 @@ | |||
Welcome aboard | |||
You now have an Nextcloud account, you can add, protect, and share your data. | |||
Welcome to your Nextcloud account, you can add, protect, and share your data. | |||
Your username is: abc | |||
@@ -76,7 +76,7 @@ class EMailTemplateTest extends TestCase { | |||
$this->emailTemplate->addHeader(); | |||
$this->emailTemplate->addHeading('Welcome aboard'); | |||
$this->emailTemplate->addBodyText('You now have an Nextcloud account, you can add, protect, and share your data.'); | |||
$this->emailTemplate->addBodyText('Welcome to your Nextcloud account, you can add, protect, and share your data.'); | |||
$this->emailTemplate->addBodyText('Your username is: abc'); | |||
$this->emailTemplate->addBodyButtonGroup( | |||
'Set your password', 'https://example.org/resetPassword/123', | |||
@@ -117,7 +117,7 @@ class EMailTemplateTest extends TestCase { | |||
$this->emailTemplate->addHeader(); | |||
$this->emailTemplate->addHeading('Welcome aboard'); | |||
$this->emailTemplate->addBodyText('You now have an Nextcloud account, you can add, protect, and share your data.'); | |||
$this->emailTemplate->addBodyText('Welcome to your Nextcloud account, you can add, protect, and share your data.'); | |||
$this->emailTemplate->addBodyText('Your username is: abc'); | |||
$this->emailTemplate->addBodyButtonGroup( | |||
'Set your password', 'https://example.org/resetPassword/123', | |||
@@ -156,7 +156,7 @@ class EMailTemplateTest extends TestCase { | |||
$this->emailTemplate->addHeader(); | |||
$this->emailTemplate->addHeading('Welcome aboard'); | |||
$this->emailTemplate->addBodyText('You now have an Nextcloud account, you can add, protect, and share your data.'); | |||
$this->emailTemplate->addBodyText('Welcome to your Nextcloud account, you can add, protect, and share your data.'); | |||
$this->emailTemplate->addBodyText('Your username is: abc'); | |||
$this->emailTemplate->addBodyButton( | |||
'Set your password', 'https://example.org/resetPassword/123', | |||
@@ -197,7 +197,7 @@ class EMailTemplateTest extends TestCase { | |||
$this->emailTemplate->addHeader(); | |||
$this->emailTemplate->addHeading('Welcome aboard', 'Welcome aboard - text'); | |||
$this->emailTemplate->addBodyText('You now have an Nextcloud account, you can add, protect, and share your data.', 'You now have an Nextcloud account, you can add, protect, and share your data. - text'); | |||
$this->emailTemplate->addBodyText('Welcome to your Nextcloud account, you can add, protect, and share your data.', 'Welcome to your Nextcloud account, you can add, protect, and share your data. - text'); | |||
$this->emailTemplate->addBodyText('Your username is: abc'); | |||
$this->emailTemplate->addBodyButtonGroup( | |||
'Set your password', 'https://example.org/resetPassword/123', |