mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix welcome text for better grammar in themed instances 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-11-09 09:24:35 +01:00
parent 33ae6a4e9e
commit d8cf19b258
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/public/Mail/IEMailTemplate.php
View File

@ -36,7 +36,7 @@ namespace OCP\Mail;
* *
* $emailTemplate->addHeader(); * $emailTemplate->addHeader();
* $emailTemplate->addHeading('Welcome aboard'); * $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( * $emailTemplate->addBodyButtonGroup(
* 'Set your password', 'https://example.org/resetPassword/q1234567890qwertz', * 'Set your password', 'https://example.org/resetPassword/q1234567890qwertz',

2
settings/Mailer/NewUserMailHelper.php
View File

@ -130,7 +130,7 @@ class NewUserMailHelper {
} else { } else {
$emailTemplate->addHeading($this->l10n->t('Welcome aboard %s', [$displayName])); $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])); $emailTemplate->addBodyText($this->l10n->t('Your username is: %s', [$userId]));
if ($generatePasswordResetToken) { if ($generatePasswordResetToken) {
$leftButtonText = $this->l10n->t('Set your password'); $leftButtonText = $this->l10n->t('Set your password');

8
tests/Settings/Mailer/NewUserMailHelperTest.php
View File

@ -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%"> <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"> <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"> <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>
<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> <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> </tr>
@ -350,7 +350,7 @@ EOF;
$expectedTextBody = <<<EOF $expectedTextBody = <<<EOF
Welcome aboard 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 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%"> <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"> <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"> <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>
<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> <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> </tr>
@ -583,7 +583,7 @@ EOF;
$expectedTextBody = <<<EOF $expectedTextBody = <<<EOF
Welcome aboard John Doe 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 Your username is: john

2
tests/data/emails/new-account-email-custom-text-alternative.txt
View File

@ -1,6 +1,6 @@
Welcome aboard - text 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 Your username is: abc

2
tests/data/emails/new-account-email-custom.html
View File

@ -76,7 +76,7 @@
<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"> <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"> <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"> <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>
<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> <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> </tr>

2
tests/data/emails/new-account-email-custom.txt
View File

@ -1,6 +1,6 @@
Welcome aboard 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 Your username is: abc

2
tests/data/emails/new-account-email-single-button.html
View File

@ -76,7 +76,7 @@
<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"> <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"> <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"> <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>
<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> <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> </tr>

2
tests/data/emails/new-account-email-single-button.txt
View File

@ -1,6 +1,6 @@
Welcome aboard 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 Your username is: abc

2
tests/data/emails/new-account-email.html
View File

@ -76,7 +76,7 @@
<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"> <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"> <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"> <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>
<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> <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> </tr>

2
tests/data/emails/new-account-email.txt
View File

@ -1,6 +1,6 @@
Welcome aboard 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 Your username is: abc

8
tests/lib/Mail/EMailTemplateTest.php
View File

@ -76,7 +76,7 @@ class EMailTemplateTest extends TestCase {
$this->emailTemplate->addHeader(); $this->emailTemplate->addHeader();
$this->emailTemplate->addHeading('Welcome aboard'); $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->addBodyText('Your username is: abc');
$this->emailTemplate->addBodyButtonGroup( $this->emailTemplate->addBodyButtonGroup(
'Set your password', 'https://example.org/resetPassword/123', 'Set your password', 'https://example.org/resetPassword/123',
@ -117,7 +117,7 @@ class EMailTemplateTest extends TestCase {
$this->emailTemplate->addHeader(); $this->emailTemplate->addHeader();
$this->emailTemplate->addHeading('Welcome aboard'); $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->addBodyText('Your username is: abc');
$this->emailTemplate->addBodyButtonGroup( $this->emailTemplate->addBodyButtonGroup(
'Set your password', 'https://example.org/resetPassword/123', 'Set your password', 'https://example.org/resetPassword/123',
@ -156,7 +156,7 @@ class EMailTemplateTest extends TestCase {
$this->emailTemplate->addHeader(); $this->emailTemplate->addHeader();
$this->emailTemplate->addHeading('Welcome aboard'); $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->addBodyText('Your username is: abc');
$this->emailTemplate->addBodyButton( $this->emailTemplate->addBodyButton(
'Set your password', 'https://example.org/resetPassword/123', 'Set your password', 'https://example.org/resetPassword/123',
@ -197,7 +197,7 @@ class EMailTemplateTest extends TestCase {
$this->emailTemplate->addHeader(); $this->emailTemplate->addHeader();
$this->emailTemplate->addHeading('Welcome aboard', 'Welcome aboard - text'); $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->addBodyText('Your username is: abc');
$this->emailTemplate->addBodyButtonGroup( $this->emailTemplate->addBodyButtonGroup(
'Set your password', 'https://example.org/resetPassword/123', 'Set your password', 'https://example.org/resetPassword/123',