diff options
author | Leon Klingele <leon@struktur.de> | 2017-09-08 13:47:03 +0200 |
---|---|---|
committer | Leon Klingele <leon@struktur.de> | 2017-09-08 13:47:11 +0200 |
commit | 8e46e6b827a8433e547ae8aa3c1c8b7b753e49db (patch) | |
tree | ad6adbc52372252fb2f1323040a3860889362ebe /tests | |
parent | c58853d22374edbf4b3f3c477d3aeb960c3cbe72 (diff) | |
download | nextcloud-server-8e46e6b827a8433e547ae8aa3c1c8b7b753e49db.tar.gz nextcloud-server-8e46e6b827a8433e547ae8aa3c1c8b7b753e49db.zip |
Improve text: 'you have now' -> 'you now have'
Signed-off-by: Leon Klingele <leon@struktur.de>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Settings/Mailer/NewUserMailHelperTest.php | 8 | ||||
-rw-r--r-- | tests/data/emails/new-account-email-custom-text-alternative.txt | 2 | ||||
-rw-r--r-- | tests/data/emails/new-account-email-custom.html | 2 | ||||
-rw-r--r-- | tests/data/emails/new-account-email-custom.txt | 2 | ||||
-rw-r--r-- | tests/data/emails/new-account-email-single-button.html | 2 | ||||
-rw-r--r-- | tests/data/emails/new-account-email-single-button.txt | 2 | ||||
-rw-r--r-- | tests/data/emails/new-account-email.html | 2 | ||||
-rw-r--r-- | tests/data/emails/new-account-email.txt | 2 | ||||
-rw-r--r-- | tests/lib/Mail/EMailTemplateTest.php | 8 |
9 files changed, 15 insertions, 15 deletions
diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php index 033847e49f6..1af1bed808c 100644 --- a/tests/Settings/Mailer/NewUserMailHelperTest.php +++ b/tests/Settings/Mailer/NewUserMailHelperTest.php @@ -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 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">You now have an 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 have now an TestCloud account, you can add, protect, and share your data. +You now have an 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 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">You now have an 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 have now an TestCloud account, you can add, protect, and share your data. +You now have an TestCloud account, you can add, protect, and share your data. Your username is: john diff --git a/tests/data/emails/new-account-email-custom-text-alternative.txt b/tests/data/emails/new-account-email-custom-text-alternative.txt index 9f02563edfe..52da8957ab3 100644 --- a/tests/data/emails/new-account-email-custom-text-alternative.txt +++ b/tests/data/emails/new-account-email-custom-text-alternative.txt @@ -1,6 +1,6 @@ Welcome aboard - text -You have now an Nextcloud account, you can add, protect, and share your data. - text +You now have an Nextcloud account, you can add, protect, and share your data. - text Your username is: abc diff --git a/tests/data/emails/new-account-email-custom.html b/tests/data/emails/new-account-email-custom.html index e35b9f57848..f5f3fbda21b 100644 --- a/tests/data/emails/new-account-email-custom.html +++ b/tests/data/emails/new-account-email-custom.html @@ -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 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">You now have an 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> diff --git a/tests/data/emails/new-account-email-custom.txt b/tests/data/emails/new-account-email-custom.txt index e849c73d941..41ac8de8f49 100644 --- a/tests/data/emails/new-account-email-custom.txt +++ b/tests/data/emails/new-account-email-custom.txt @@ -1,6 +1,6 @@ Welcome aboard -You have now 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. Your username is: abc diff --git a/tests/data/emails/new-account-email-single-button.html b/tests/data/emails/new-account-email-single-button.html index d70a8a647d3..f3874144109 100644 --- a/tests/data/emails/new-account-email-single-button.html +++ b/tests/data/emails/new-account-email-single-button.html @@ -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 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">You now have an 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> diff --git a/tests/data/emails/new-account-email-single-button.txt b/tests/data/emails/new-account-email-single-button.txt index 90ae35b0695..f05f6136d16 100644 --- a/tests/data/emails/new-account-email-single-button.txt +++ b/tests/data/emails/new-account-email-single-button.txt @@ -1,6 +1,6 @@ Welcome aboard -You have now 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. Your username is: abc diff --git a/tests/data/emails/new-account-email.html b/tests/data/emails/new-account-email.html index 3e8814bbfbb..72daf3ec5c8 100644 --- a/tests/data/emails/new-account-email.html +++ b/tests/data/emails/new-account-email.html @@ -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 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">You now have an 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> diff --git a/tests/data/emails/new-account-email.txt b/tests/data/emails/new-account-email.txt index 42d41406ba8..66d7dbc906a 100644 --- a/tests/data/emails/new-account-email.txt +++ b/tests/data/emails/new-account-email.txt @@ -1,6 +1,6 @@ Welcome aboard -You have now 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. Your username is: abc diff --git a/tests/lib/Mail/EMailTemplateTest.php b/tests/lib/Mail/EMailTemplateTest.php index b2d08f7e81b..fce214a82aa 100644 --- a/tests/lib/Mail/EMailTemplateTest.php +++ b/tests/lib/Mail/EMailTemplateTest.php @@ -76,7 +76,7 @@ class EMailTemplateTest extends TestCase { $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('You now have an 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 have now an Nextcloud account, you can add, protect, and share your data.'); + $this->emailTemplate->addBodyText('You now have an 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 have now an Nextcloud account, you can add, protect, and share your data.'); + $this->emailTemplate->addBodyText('You now have an 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 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('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('Your username is: abc'); $this->emailTemplate->addBodyButtonGroup( 'Set your password', 'https://example.org/resetPassword/123', |