Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable12] Improve text: 'you have now' -> 'you now have' #6464

Merged
merged 2 commits into from Nov 10, 2017
Merged

[stable12] Improve text: 'you have now' -> 'you now have' #6464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33ae6a4
Improve text: 'you have now' -> 'you now have'
Sep 8, 2017
d8cf19b
Fix welcome text for better grammar in themed instances
MorrisJobke Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/public/Mail/IEMailTemplate.php
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@
*
* $emailTemplate->addHeader();
* $emailTemplate->addHeading('Welcome aboard');
* $emailTemplate->addBodyText('You have now 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',
Expand Down
2 changes: 1 addition & 1 deletion settings/Mailer/NewUserMailHelper.php
View file
Open in desktop
Expand Up @@ -130,7 +130,7 @@ public function generateTemplate(IUser $user, $generatePasswordResetToken = fals
} else {
$emailTemplate->addHeading($this->l10n->t('Welcome aboard %s', [$displayName]));
}
$emailTemplate->addBodyText($this->l10n->t('You have now 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');
Expand Down
8 changes: 4 additions & 4 deletions tests/Settings/Mailer/NewUserMailHelperTest.php
View file
Open in desktop
Expand Up @@ -237,7 +237,7 @@ public function testGenerateTemplateWithPasswordResetToken() {
<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 have now 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>
Expand Down Expand Up @@ -350,7 +350,7 @@ public function testGenerateTemplateWithPasswordResetToken() {
$expectedTextBody = <<<EOF
Welcome aboard

You have now 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

Expand Down Expand Up @@ -470,7 +470,7 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
<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 have now 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>
Expand Down Expand Up @@ -583,7 +583,7 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
$expectedTextBody = <<<EOF
Welcome aboard John Doe

You have now 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

Expand Down
2 changes: 1 addition & 1 deletion tests/data/emails/new-account-email-custom-text-alternative.txt
View file
Open in desktop
@@ -1,6 +1,6 @@
Welcome aboard - text

You have now 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

Expand Down
2 changes: 1 addition & 1 deletion tests/data/emails/new-account-email-custom.html
View file
Open in desktop
Expand Up @@ -76,7 +76,7 @@ <h1 class="text-center" style="Margin:0;Margin-bottom:10px;color:inherit;font-fa
<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 have now 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>
Expand Down
2 changes: 1 addition & 1 deletion tests/data/emails/new-account-email-custom.txt
View file
Open in desktop
@@ -1,6 +1,6 @@
Welcome aboard

You have now 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

Expand Down
2 changes: 1 addition & 1 deletion tests/data/emails/new-account-email-single-button.html
View file
Open in desktop
Expand Up @@ -76,7 +76,7 @@ <h1 class="text-center" style="Margin:0;Margin-bottom:10px;color:inherit;font-fa
<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 have now 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>
Expand Down
2 changes: 1 addition & 1 deletion tests/data/emails/new-account-email-single-button.txt
View file
Open in desktop
@@ -1,6 +1,6 @@
Welcome aboard

You have now 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

Expand Down
2 changes: 1 addition & 1 deletion tests/data/emails/new-account-email.html
View file
Open in desktop
Expand Up @@ -76,7 +76,7 @@ <h1 class="text-center" style="Margin:0;Margin-bottom:10px;color:inherit;font-fa
<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 have now 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>
Expand Down
2 changes: 1 addition & 1 deletion tests/data/emails/new-account-email.txt
View file
Open in desktop
@@ -1,6 +1,6 @@
Welcome aboard

You have now 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

Expand Down
8 changes: 4 additions & 4 deletions tests/lib/Mail/EMailTemplateTest.php
View file
Open in desktop
Expand Up @@ -76,7 +76,7 @@ public function testEMailTemplateCustomFooter() {

$this->emailTemplate->addHeader();
$this->emailTemplate->addHeading('Welcome aboard');
$this->emailTemplate->addBodyText('You have now 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',
Expand Down Expand Up @@ -117,7 +117,7 @@ public function testEMailTemplateDefaultFooter() {

$this->emailTemplate->addHeader();
$this->emailTemplate->addHeading('Welcome aboard');
$this->emailTemplate->addBodyText('You have now 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',
Expand Down Expand Up @@ -156,7 +156,7 @@ public function testEMailTemplateSingleButton() {

$this->emailTemplate->addHeader();
$this->emailTemplate->addHeading('Welcome aboard');
$this->emailTemplate->addBodyText('You have now 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',
Expand Down Expand Up @@ -197,7 +197,7 @@ public function testEMailTemplateAlternativePlainTexts() {

$this->emailTemplate->addHeader();
$this->emailTemplate->addHeading('Welcome aboard', 'Welcome aboard - text');
$this->emailTemplate->addBodyText('You have now an Nextcloud account, you can add, protect, and share your data.', 'You have now 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',
Expand Down