Merge pull request #6417 from nextcloud/proper-english-nowhave

MorrisJobke · web-flow · commit e9c713902ec6 · 2017-09-08T18:29:22.000+02:00
Improve text: 'you have now' -&gt; 'you now have'
diff --git a/lib/public/Mail/IEMailTemplate.php b/lib/public/Mail/IEMailTemplate.php
@@ -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('You now have an Nextcloud account, you can add, protect, and share your data.');
  *
  * $emailTemplate->addBodyButtonGroup(
  *     'Set your password', 'https://example.org/resetPassword/q1234567890qwertz',
diff --git a/settings/Mailer/NewUserMailHelper.php b/settings/Mailer/NewUserMailHelper.php
@@ -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('You now have an %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');
diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php
@@ -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">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 @@ public function testGenerateTemplateWithPasswordResetToken() {
 		$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 @@ 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">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 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
 		$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
@@ -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
@@ -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">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
@@ -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
@@ -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">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
@@ -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
@@ -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">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
@@ -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
@@ -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('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 @@ 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('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 @@ 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('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 @@ 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('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',

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`*`
`37`	`37`	`* $emailTemplate->addHeader();`
`38`	`38`	`* $emailTemplate->addHeading('Welcome aboard');`
`39`		`- * $emailTemplate->addBodyText('You have now an Nextcloud account, you can add, protect, and share your data.');`
	`39`	`+ * $emailTemplate->addBodyText('You now have an Nextcloud account, you can add, protect, and share your data.');`
`40`	`40`	`*`
`41`	`41`	`* $emailTemplate->addBodyButtonGroup(`
`42`	`42`	`* 'Set your password', 'https://example.org/resetPassword/q1234567890qwertz',`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public function generateTemplate(IUser $user, $generatePasswordResetToken = fals`
`130`	`130`	`} else {`
`131`	`131`	`$emailTemplate->addHeading($this->l10n->t('Welcome aboard %s', [$displayName]));`
`132`	`132`	`}`
`133`		`- $emailTemplate->addBodyText($this->l10n->t('You have now an %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()]));`
	`133`	`+ $emailTemplate->addBodyText($this->l10n->t('You now have an %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()]));`
`134`	`134`	`$emailTemplate->addBodyText($this->l10n->t('Your username is: %s', [$userId]));`
`135`	`135`	`if ($generatePasswordResetToken) {`
`136`	`136`	`$leftButtonText = $this->l10n->t('Set your password');`