From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 17 Jun 2021 12:42:53 +0000 (+0200)
Subject: Merge branch '5.2' into 5.3
X-Git-Tag: 5.4.0_Beta_2~4^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0153ab1c17485011a2a4bae100ff305b77c6b660;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.2' into 5.3
---

0153ab1c17485011a2a4bae100ff305b77c6b660
diff --cc wcfsetup/install/lang/en.xml
index 6ae06cd205,d58d813012..5363b3acec
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -4780,22 -4704,22 +4780,22 @@@ not register with us.]]></item
  		<item name="wcf.user.register.needActivation.mail.html.headline"><![CDATA[Dear {$mailbox->getUser()->username},]]></item>
  		<item name="wcf.user.register.needActivation.mail.html.intro"><![CDATA[
  <p>Thank you for registering at: <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|language}</a>. Before you are able to use your
- user account to it’s full extent it is required that you confirm validity of your email address once:</p>]]></item>
+ user account to its full extent it is required that you confirm validity of your email address once:</p>]]></item>
  		<item name="wcf.user.register.needActivation.mail.html.activate"><![CDATA[Confirm my email address]]></item>
  		<item name="wcf.user.register.needActivation.mail.html.outro"><![CDATA[
 -<p>Your activation code is: <kbd>{$mailbox->getUser()->activationCode}</kbd>.</p>
 +<p>Your activation code is: <kbd>{$mailbox->getUser()->emailConfirmed}</kbd>.</p>
  <p>If you have trouble confirming your email address, please contact the administrator at:
  <a href="mailto:{MAIL_ADMIN_ADDRESS}">{MAIL_ADMIN_ADDRESS}</a>. Please ignore this email if
  you did not register an account with us.</p>]]></item>
  		<item name="wcf.user.register.needActivation.mail.plaintext"><![CDATA[Dear {@$mailbox->getUser()->username},
  
  Thank you for registering at: {@PAGE_TITLE|language} [URL:{link isEmail=true}{/link}]. Before you are
- able to use your user account to it's full extent it is required that you
+ able to use your user account to its full extent it is required that you
  confirm the validity of your email address once:
  
 -    {link controller='RegisterActivation' isEmail=true}u={@$mailbox->getUser()->userID}&a={@$mailbox->getUser()->activationCode}{/link} {* this line ends with a space *}
 +    {link controller='RegisterActivation' isEmail=true}u={@$mailbox->getUser()->userID}&a={@$mailbox->getUser()->emailConfirmed}{/link} {* this line ends with a space *}
  
 -Your activation code is: {@$mailbox->getUser()->activationCode} {* this line ends with a space *}
 +Your activation code is: {@$mailbox->getUser()->emailConfirmed} {* this line ends with a space *}
  
  If you have trouble confirming your email address, please contact the
  administrator at: {@MAIL_ADMIN_ADDRESS}. Please ignore this email if you did