|
@@ -95,9 +95,9 @@ class User extends Model {
|
|
|
|
|
|
|
|
// Build
|
|
// Build
|
|
|
$builder = new EmailBuilder;
|
|
$builder = new EmailBuilder;
|
|
|
- $builder->addParagraph("<b>" . sprintf(_("Hi %s"), $name) . "</b>");
|
|
|
|
|
- $builder->addLeadParagraph(_("Thanks for registering!"));
|
|
|
|
|
- $builder->addParagraph(sprintf(_("Welcome to %s! Before you can log in, you will need to verify your email address. You can do so by tapping the following link:"), APP_NAME));
|
|
|
|
|
|
|
+ $builder->addParagraph("<b>" . sprintf(__("Hi %s"), $name) . "</b>");
|
|
|
|
|
+ $builder->addLeadParagraph(__("Thanks for registering!"));
|
|
|
|
|
+ $builder->addParagraph(sprintf(__("Welcome to %s! Before you can log in, you will need to verify your email address. You can do so by tapping the following link:"), APP_NAME));
|
|
|
$builder->addParagraph("<a href=\"$link\">$link</a>");
|
|
$builder->addParagraph("<a href=\"$link\">$link</a>");
|
|
|
$content = $builder->build();
|
|
$content = $builder->build();
|
|
|
|
|
|
|
@@ -107,7 +107,7 @@ class User extends Model {
|
|
|
$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
|
|
$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
|
|
|
$mail->addAddress($this->email, $this->getDisplayName());
|
|
$mail->addAddress($this->email, $this->getDisplayName());
|
|
|
|
|
|
|
|
- $mail->setSubject(_("Verify your email address"));
|
|
|
|
|
|
|
+ $mail->setSubject(__("Verify your email address"));
|
|
|
|
|
|
|
|
$mail->send();
|
|
$mail->send();
|
|
|
|
|
|
|
@@ -122,9 +122,9 @@ class User extends Model {
|
|
|
|
|
|
|
|
// Build
|
|
// Build
|
|
|
$builder = new EmailBuilder;
|
|
$builder = new EmailBuilder;
|
|
|
- $builder->addParagraph("<b>" . sprintf(_("Hi %s"), $name) . "</b>");
|
|
|
|
|
- $builder->addLeadParagraph(_("Thanks for verifying your email address!"));
|
|
|
|
|
- $builder->addParagraph(sprintf(_("Welcome to %s! Before you can take part in tests, you will need to provide us with some ID. You can do so by tapping the following link:"), APP_NAME));
|
|
|
|
|
|
|
+ $builder->addParagraph("<b>" . sprintf(__("Hi %s"), $name) . "</b>");
|
|
|
|
|
+ $builder->addLeadParagraph(__("Thanks for verifying your email address!"));
|
|
|
|
|
+ $builder->addParagraph(sprintf(__("Welcome to %s! Before you can take part in tests, you will need to provide us with some ID. You can do so by tapping the following link:"), APP_NAME));
|
|
|
$builder->addParagraph("<a href=\"$link\">$link</a>");
|
|
$builder->addParagraph("<a href=\"$link\">$link</a>");
|
|
|
$content = $builder->build();
|
|
$content = $builder->build();
|
|
|
|
|
|
|
@@ -133,7 +133,7 @@ class User extends Model {
|
|
|
$mail->setHtmlContent($content);
|
|
$mail->setHtmlContent($content);
|
|
|
$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
|
|
$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
|
|
|
$mail->addAddress($this->email, $this->getDisplayName());
|
|
$mail->addAddress($this->email, $this->getDisplayName());
|
|
|
- $mail->setSubject(sprintf(_("Welcome to %s"), APP_NAME));
|
|
|
|
|
|
|
+ $mail->setSubject(sprintf(__("Welcome to %s"), APP_NAME));
|
|
|
$mail->send();
|
|
$mail->send();
|
|
|
|
|
|
|
|
return true;
|
|
return true;
|
|
@@ -147,20 +147,20 @@ class User extends Model {
|
|
|
|
|
|
|
|
// Build
|
|
// Build
|
|
|
$builder = new EmailBuilder;
|
|
$builder = new EmailBuilder;
|
|
|
- $builder->addParagraph("<b>" . sprintf(_("Hi %s"), $name) . "</b>");
|
|
|
|
|
- $builder->addLeadParagraph(_("Your application has been successful!"));
|
|
|
|
|
- $builder->addParagraph(sprintf(_("Welcome to %s! In order to get you a test as soon as possible, we need one final confirmation. Please log in to your account and have a quick read of the documents that explain what we need you to do during a test."), APP_NAME));
|
|
|
|
|
- $builder->addParagraph(_("When you're ready to try a Practice test, in your account and select the \"Practice\" option."));
|
|
|
|
|
- $builder->addParagraph(_("1. As it is a Practice test, you can reset and start over as many times as you like because it doesn't count but lets you see what the real thing is like."));
|
|
|
|
|
- $builder->addParagraph(sprintf(_("2. Email us at %s and let us know that you're ready."), "contact@" . DOMAIN));
|
|
|
|
|
- $builder->addParagraph(_("3. We will allocate a test to you as soon as possible."));
|
|
|
|
|
-
|
|
|
|
|
- $builder->addParagraph(_("Remember to check your online account for when tests become available."));
|
|
|
|
|
- $builder->addParagraph(_("Keep an eye out for emails inviting you to accept a test via the email or log in to your account where you can see your available tests."));
|
|
|
|
|
- $builder->addParagraph(_("If you accept to do a test within the agreed period (usually 7 days) please click Accept to confirm that you would like to do the test within the agreed period."));
|
|
|
|
|
- $builder->addParagraph(_("If you can't make it (it's too far or you'll be away), please Reject the test or email us with other suitable dates."));
|
|
|
|
|
- $builder->addParagraph(_("After you click Accept, you will be given the option to Begin the test whenever you want. Just log in to your account and click Begin on the test."));
|
|
|
|
|
- $builder->addParagraph(sprintf(_("Once again welcome to %s - Accept, Begin, Complete and get paid for up to 8 minutes work!"), APP_NAME));
|
|
|
|
|
|
|
+ $builder->addParagraph("<b>" . sprintf(__("Hi %s"), $name) . "</b>");
|
|
|
|
|
+ $builder->addLeadParagraph(__("Your application has been successful!"));
|
|
|
|
|
+ $builder->addParagraph(sprintf(__("Welcome to %s! In order to get you a test as soon as possible, we need one final confirmation. Please log in to your account and have a quick read of the documents that explain what we need you to do during a test."), APP_NAME));
|
|
|
|
|
+ $builder->addParagraph(__("When you're ready to try a Practice test, in your account and select the \"Practice\" option."));
|
|
|
|
|
+ $builder->addParagraph(__("1. As it is a Practice test, you can reset and start over as many times as you like because it doesn't count but lets you see what the real thing is like."));
|
|
|
|
|
+ $builder->addParagraph(sprintf(__("2. Email us at %s and let us know that you're ready."), "contact@" . DOMAIN));
|
|
|
|
|
+ $builder->addParagraph(__("3. We will allocate a test to you as soon as possible."));
|
|
|
|
|
+
|
|
|
|
|
+ $builder->addParagraph(__("Remember to check your online account for when tests become available."));
|
|
|
|
|
+ $builder->addParagraph(__("Keep an eye out for emails inviting you to accept a test via the email or log in to your account where you can see your available tests."));
|
|
|
|
|
+ $builder->addParagraph(__("If you accept to do a test within the agreed period (usually 7 days) please click Accept to confirm that you would like to do the test within the agreed period."));
|
|
|
|
|
+ $builder->addParagraph(__("If you can't make it (it's too far or you'll be away), please Reject the test or email us with other suitable dates."));
|
|
|
|
|
+ $builder->addParagraph(__("After you click Accept, you will be given the option to Begin the test whenever you want. Just log in to your account and click Begin on the test."));
|
|
|
|
|
+ $builder->addParagraph(sprintf(__("Once again welcome to %s - Accept, Begin, Complete and get paid for up to 8 minutes work!"), APP_NAME));
|
|
|
$content = $builder->build();
|
|
$content = $builder->build();
|
|
|
|
|
|
|
|
// Send
|
|
// Send
|
|
@@ -168,7 +168,7 @@ class User extends Model {
|
|
|
$mail->setHtmlContent($content);
|
|
$mail->setHtmlContent($content);
|
|
|
$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
|
|
$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
|
|
|
$mail->addAddress($this->email, $this->getDisplayName());
|
|
$mail->addAddress($this->email, $this->getDisplayName());
|
|
|
- $mail->setSubject(_("ID accepted and verified"));
|
|
|
|
|
|
|
+ $mail->setSubject(__("ID accepted and verified"));
|
|
|
$mail->send();
|
|
$mail->send();
|
|
|
|
|
|
|
|
return true;
|
|
return true;
|
|
@@ -183,12 +183,12 @@ class User extends Model {
|
|
|
|
|
|
|
|
// Build
|
|
// Build
|
|
|
$builder = new EmailBuilder;
|
|
$builder = new EmailBuilder;
|
|
|
- $builder->addParagraph("<b>" . sprintf(_("Hi %s"), $name) . "</b>");
|
|
|
|
|
- $builder->addLeadParagraph(_("Thank you for submitting your ID details."));
|
|
|
|
|
- $builder->addParagraph(_("Unfortunately we could not verify and accept your documents and/or image."));
|
|
|
|
|
- $builder->addParagraph(sprintf(_("The reason for this is: %s"), $reason));
|
|
|
|
|
- $builder->addParagraph(_("Please log in again, resubmit and we will try again."));
|
|
|
|
|
- $builder->addParagraph(_("We look forward to welcoming you onboard soon!"));
|
|
|
|
|
|
|
+ $builder->addParagraph("<b>" . sprintf(__("Hi %s"), $name) . "</b>");
|
|
|
|
|
+ $builder->addLeadParagraph(__("Thank you for submitting your ID details."));
|
|
|
|
|
+ $builder->addParagraph(__("Unfortunately we could not verify and accept your documents and/or image."));
|
|
|
|
|
+ $builder->addParagraph(sprintf(__("The reason for this is: %s"), $reason));
|
|
|
|
|
+ $builder->addParagraph(__("Please log in again, resubmit and we will try again."));
|
|
|
|
|
+ $builder->addParagraph(__("We look forward to welcoming you onboard soon!"));
|
|
|
$content = $builder->build();
|
|
$content = $builder->build();
|
|
|
|
|
|
|
|
// Send
|
|
// Send
|
|
@@ -196,7 +196,7 @@ class User extends Model {
|
|
|
$mail->setHtmlContent($content);
|
|
$mail->setHtmlContent($content);
|
|
|
$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
|
|
$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
|
|
|
$mail->addAddress($this->email, $this->getDisplayName());
|
|
$mail->addAddress($this->email, $this->getDisplayName());
|
|
|
- $mail->setSubject(_("We could not verify your ID details"));
|
|
|
|
|
|
|
+ $mail->setSubject(__("We could not verify your ID details"));
|
|
|
$mail->send();
|
|
$mail->send();
|
|
|
|
|
|
|
|
return true;
|
|
return true;
|
|
@@ -213,11 +213,11 @@ class User extends Model {
|
|
|
|
|
|
|
|
// Build
|
|
// Build
|
|
|
$builder = new EmailBuilder;
|
|
$builder = new EmailBuilder;
|
|
|
- $builder->addParagraph("<b>" . sprintf(_("Hi %s"), $name) . "</b>");
|
|
|
|
|
- $builder->addLeadParagraph(_("A reset password request has been received."));
|
|
|
|
|
- $builder->addParagraph(_("To reset your password, please tap on the following link:"));
|
|
|
|
|
|
|
+ $builder->addParagraph("<b>" . sprintf(__("Hi %s"), $name) . "</b>");
|
|
|
|
|
+ $builder->addLeadParagraph(__("A reset password request has been received."));
|
|
|
|
|
+ $builder->addParagraph(__("To reset your password, please tap on the following link:"));
|
|
|
$builder->addParagraph("<a href=\"$link\">$link</a>");
|
|
$builder->addParagraph("<a href=\"$link\">$link</a>");
|
|
|
- $builder->addParagraph(sprintf(_("If you %sdid not%s request for your password to be reset, please ignore this email."), '<strong>', '</strong>'));
|
|
|
|
|
|
|
+ $builder->addParagraph(sprintf(__("If you %sdid not%s request for your password to be reset, please ignore this email."), '<strong>', '</strong>'));
|
|
|
$content = $builder->build();
|
|
$content = $builder->build();
|
|
|
|
|
|
|
|
// Send
|
|
// Send
|
|
@@ -227,7 +227,7 @@ class User extends Model {
|
|
|
$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
|
|
$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
|
|
|
$mail->addAddress($this->email, $this->getDisplayName());
|
|
$mail->addAddress($this->email, $this->getDisplayName());
|
|
|
|
|
|
|
|
- $mail->setSubject(_("Password reset instructions"));
|
|
|
|
|
|
|
+ $mail->setSubject(__("Password reset instructions"));
|
|
|
|
|
|
|
|
$mail->send();
|
|
$mail->send();
|
|
|
|
|
|
|
@@ -297,7 +297,7 @@ class User extends Model {
|
|
|
|
|
|
|
|
public function getAge() {
|
|
public function getAge() {
|
|
|
|
|
|
|
|
- if(is_null($this->date_of_birth)) return _("N/A");
|
|
|
|
|
|
|
+ if(is_null($this->date_of_birth)) return __("N/A");
|
|
|
|
|
|
|
|
$now = new DateTime("now");
|
|
$now = new DateTime("now");
|
|
|
$dob = new DateTime($this->date_of_birth);
|
|
$dob = new DateTime($this->date_of_birth);
|
|
@@ -306,7 +306,7 @@ class User extends Model {
|
|
|
|
|
|
|
|
public function getDisplayName() {
|
|
public function getDisplayName() {
|
|
|
|
|
|
|
|
- if(empty($this->email)) return _("Deleted User");
|
|
|
|
|
|
|
+ if(empty($this->email)) return __("Deleted User");
|
|
|
|
|
|
|
|
$parts = array_filter([$this->first_name, $this->last_name]);
|
|
$parts = array_filter([$this->first_name, $this->last_name]);
|
|
|
return implode(" ", $parts);
|
|
return implode(" ", $parts);
|