Commit 1740a61c authored by Stefan Busemann's avatar Stefan Busemann

Merge branch '53-grammar-spelling-and-punctuation-of-the-confirmation-mail' into 'develop'

Resolve "Grammar, spelling and punctuation of the confirmation mail"

Closes #53

See merge request !41
parents bf08aa99 f5ac2b06
Pipeline #4327 passed with stages
in 5 minutes and 7 seconds
......@@ -167,7 +167,7 @@
<br>
<p style="Margin:0;color:#4a4a4a;font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;font-size:14px;font-weight:400;line-height:20px;margin:0;padding:0;text-align:center">
thank you for signing up! Use the link below activate your account.
thank you for signing up! Use the link below, to activate your account.
</p>
<br>
......@@ -200,7 +200,7 @@
<!-- / space with background color -->
<p style="Margin:0;color:#4a4a4a;font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;font-size:14px;font-weight:400;line-height:20px;margin:0;padding:0;text-align:center">
Or, paste this link into your browser:
Or paste this link into your browser:
<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'userConfirmation'}">
<f:translate key="emailCreateUserConfirmationLinkConfirm" />
</f:link.action>
......@@ -223,10 +223,14 @@
<p style="Margin:0;color:#4a4a4a;font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;font-size:14px;font-weight:400;line-height:20px;margin:0;padding:0;text-align:left">
By activating your account you will accept our terms and conditions:
By activating your account, you will accept our terms and conditions:
<br>
<br>
<strong>Personal data protection</strong>
<strong>Personal data protection</strong><br>
The TYPO3 Association is committed to user privacy. For statistical reasons we collect the following data:
<br>
<br>
</p>
<ul style="margin:0 0 0 10px;Margin:0 0 0 10px;padding:20px;">
<li style="Margin:0;color:#4a4a4a;font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;font-size:14px;font-weight:400;line-height:20px;margin:0;padding:0;text-align:left">type of browser</li>
......@@ -235,13 +239,16 @@
<li style="Margin:0;color:#4a4a4a;font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;font-size:14px;font-weight:400;line-height:20px;margin:0;padding:0;text-align:left">time and date of the use of the website</li>
<li style="Margin:0;color:#4a4a4a;font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;font-size:14px;font-weight:400;line-height:20px;margin:0;padding:0;text-align:left">your IP address</li>
</ul>
<p>
This data is collected anonymously and will be kept separately from private user data, you might have to give us at this website.
</p>
<br>
<p style="Margin:0;color:#4a4a4a;font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;font-size:14px;font-weight:400;line-height:20px;margin:0;padding:0;text-align:left">
<strong>Private user data</strong>
<br>
In some cases we need to collect your private user data, to process certain information on this website This data will
In some cases we need to collect your private user data, to process certain information on this website. This data will
not be give to any other third party without your explicit written notice. In some cases we might be forced to give the
data to official government agencies.
</p>
......@@ -253,7 +260,7 @@
<br>
Please be aware that by using our mailinglists, forums and services your profile and activities will be availabe to the
general public thru search engines and archives. As we also require you to use your real name while using the ressources
we will not accept any deletion requests for content created by you.
we ask you to act accordingly to our code of conduct too.
</p>
<!-- space with background color -->
......@@ -274,7 +281,7 @@
<p style="Margin:0;color:#4a4a4a;font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;font-size:14px;font-weight:400;line-height:20px;margin:0;padding:0;text-align:left">
Kind regards,
<br>
<strong><a href="http://TYPO3.org" style="text-decoration: none; color:#f49800">The TYPO3.org Team</a></strong>
<strong><a href="https://typo3.org" style="text-decoration: none; color:#f49800">The TYPO3.org Team</a></strong>
</p>
<br>
......@@ -283,6 +290,7 @@
<!-- //////////// -->
</td>
<td class="inner-padding" valign="top" style="vertical-align: top; width: 15px;" width="15px">&nbsp;</td>
<td class="inner-padding" valign="top" style="vertical-align: top; width: 15px;" width="15px">&nbsp;</td>
</tr>
</table>
<!-- / inner content -->
......@@ -301,12 +309,10 @@
</tbody>
</table>
<!-- / space -->
</td>
</tr>
</table>
<!-- / content -->
<!-- //////////// -->
</td>
<td class="inner-padding" valign="top" style="vertical-align: top; width: 15px;" width="15px">&nbsp;</td>
......@@ -316,7 +322,6 @@
</td>
</tr>
</table>
</td>
</tr>
<!-- / main content wrapper -->
......
......@@ -185,7 +185,7 @@
<!-- button -->
<table class="button-wrapper" border="0" cellspacing="0" cellpadding="0" align="center" style="margin:auto;">
<tr>
<td class="button" width="235" align="center" bgcolor="#ff8700" style="padding: 8px 16px 8px 16px; border-radius:0px; text-align:center;"><a href="https://www.typo3.org/cms/documentation/" target="_blank" style="font-size: 14px; font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; display: inline-block; text-align: center">Get started with using TYPO3</a></td>
<td class="button" width="235" align="center" bgcolor="#ff8700" style="padding: 8px 16px 8px 16px; border-radius:0px; text-align:center;"><a href="https://typo3.org/help/documentation/" target="_blank" style="font-size: 14px; font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; display: inline-block; text-align: center">Get started with using TYPO3</a></td>
</tr>
</table>
<!-- / button -->
......@@ -195,7 +195,7 @@
<!-- button -->
<table class="button-wrapper" border="0" cellspacing="0" cellpadding="0" align="center" style="margin:auto;">
<tr>
<td class="button" width="235" align="center" bgcolor="#ff8700" style="padding: 8px 16px 8px 16px; border-radius:0px; text-align:center;"><a href="https://stage.typo3.org/community/contribute/" target="_blank" style="font-size: 14px; font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; display: inline-block; text-align: center">Contribute and Get Involved</a></td>
<td class="button" width="235" align="center" bgcolor="#ff8700" style="padding: 8px 16px 8px 16px; border-radius:0px; text-align:center;"><a href="https://typo3.org/community/contribute/" target="_blank" style="font-size: 14px; font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; display: inline-block; text-align: center">Contribute and Get Involved</a></td>
</tr>
</table>
<!-- / button -->
......
......@@ -162,13 +162,13 @@
<p style="Margin:0;color:#f49800;font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;font-size:22px;font-weight:400;line-height:30px;margin:0;padding:0;text-align:center;text-transform: uppercase;">
<stong>Dear <a href="http://TYPO3.org" style="text-decoration: none; color:#f49800">typo3.org</a> user,</stong>
<stong>Dear <a href="https://typo3.org" style="text-decoration: none; color:#f49800">typo3.org</a> user,</stong>
</p>
<br>
<p style="Margin:0;color:#4a4a4a;font-family:'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;font-size:14px;font-weight:400;line-height:20px;margin:0;padding:0;text-align:center">
we have received your request for a <a href="http://TYPO3.org" style="text-decoration: none; color:#4a4a4a">typo3.org</a> login account.
we have received your request for a <a href="httpd://TYPO3.org" style="text-decoration: none; color:#4a4a4a">typo3.org</a> login account.
<br><br>
Due to an immensive amount of spam subscriptions, we are currently approving new accounts after manual verification.
<br><br>
......@@ -247,7 +247,7 @@
<br><br>
Kind regards,
<br>
<strong><a href="http://TYPO3.org" style="text-decoration: none; color:#f49800">The TYPO3.org Team</a></strong>
<strong><a href="https://typo3.org" style="text-decoration: none; color:#f49800">The TYPO3.org Team</a></strong>
</p>
<br>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment