Skip to content

Commit

Permalink
Add additional translations and update Member translations
Browse files Browse the repository at this point in the history
  • Loading branch information
mlewis-everley committed Jul 27, 2020
1 parent 6cf6edc commit 1b9aad7
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 22 deletions.
6 changes: 5 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,8 @@ Minor update to:
# 2.1.0

* Switch to using frontend form fields to generate the "Edit Account Details" form
* Add better error handling on edit account submission
* Add better error handling on edit account submission

# 2.2.0

* Update translations
46 changes: 28 additions & 18 deletions src/control/RegisterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -311,32 +311,42 @@ public function RegisterForm()

$form = Form::create(
$this,
"RegisterForm",
'RegisterForm',
FieldList::create(
TextField::create("FirstName"),
TextField::create("Surname"),
EmailField::create("Email"),
$password_field = ConfirmedPasswordField::create("Password")
TextField::create(
'FirstName',
_t('SilverStripe\Security\Member.FIRSTNAME', 'First Name')
),
TextField::create(
'Surname',
_t('SilverStripe\Security\Member.SURNAME', 'Surname')
),
EmailField::create(
'Email',
_t('SilverStripe\Security\Member.EMAIL', 'Email')
),
$password_field = ConfirmedPasswordField::create('Password')
),
FieldList::create(
FormAction::create("doRegister", "Register")
->addExtraClass("btn")
->addExtraClass("btn-green")
FormAction::create(
'doRegister',
_t('Users.REGISTER', 'Register')
)->addExtraClass('btn')
),
RequiredFields::create([
"FirstName",
"Surname",
"Email",
"Password"
'FirstName',
'Surname',
'Emai',
'Password'
])
)->addExtraClass("forms")
->addExtraClass("forms-columnar");
)->addExtraClass('forms')
->addExtraClass('forms-columnar');

$password_field->minLength = $config->get("password_min_length");
$password_field->maxLength = $config->get("password_max_length");
$password_field->requireStrongPassword = $config->get("password_require_strong");
$password_field->minLength = $config->get('password_min_length');
$password_field->maxLength = $config->get('password_max_length');
$password_field->requireStrongPassword = $config->get('password_require_strong');

$this->extend("updateRegisterForm", $form);
$this->extend('updateRegisterForm', $form);

$session_data = $session->get("Form.{$form->FormName()}.data");

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<% with $CurrentUser %>
<div class="users-profile-summary">
<p>
<strong><%t Member.FIRSTNAME "First Name" %></strong> $FirstName<br/>
<strong><%t Member.SURNAME "Surname" %></strong> $Surname<br/>
<strong><%t Member.EMAIL "Email" %></strong> $Email<br/>
<strong><%t SilverStripe\Security\Member.Member.FIRSTNAME "First Name" %></strong> $FirstName<br/>
<strong><%t SilverStripe\Security\Member.Member.SURNAME "Surname" %></strong> $Surname<br/>
<strong><%t SilverStripe\Security\Member.Member.EMAIL "Email" %></strong> $Email<br/>
<strong><%t Users.FirstRegistered "First Registered" %></strong> $Created.Ago<br/>
</p>
</div>
Expand Down

0 comments on commit 1b9aad7

Please sign in to comment.