Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions components/account/activation_check.htm
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% if not user.is_activated %}

<h3>Your email address has not yet been verified.</h3>
<h3>{{ 'winter.user::frontend.email_not_verified.title' | trans }}</h3>
<p>
You should verify your account otherwise it may be deleted. Please check your email to verify.
<a href="javascript:;" data-request="onSendActivationEmail">Send the verification email again</a>.
{{ 'winter.user::frontend.email_not_verified.description' | trans }}
<a href="javascript:;" data-request="onSendActivationEmail">{{ 'winter.user::frontend.resend_verification_email' | trans }}</a>.
</p>

{% endif %}
{% endif %}
12 changes: 6 additions & 6 deletions components/account/deactivate_link.htm
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@
onclick="toggleAccountDeactivateForm()"
class="deactivate"
>
Deactivate account
{{ 'winter.user::frontend.deactivate_account.title' | trans }}
</a>

<div id="accountDeactivateForm" style="display: none">
{{ form_ajax('onDeactivate') }}
<h3>Deactivate your account?</h3>
<h3>{{ 'winter.user::frontend.deactivate_account.prompt' | trans }}</h3>
<p>
Your account will be disabled and your details removed from the site. You can reactivate your account any time by signing back in.
{{ 'winter.user::frontend.deactivate_account.description' | trans }}
</p>
<div class="form-group">
<label for="accountDeletePassword">To continue, please enter your password:</label>
<label for="accountDeletePassword">{{ 'winter.user::frontend.continue_with_password' | trans }}</label>
<input name="password" type="password" class="form-control" id="accountDeletePassword" />
</div>
<button type="submit" class="btn btn-danger">
Confirm Deactivate Account
{{ 'winter.user::frontend.deactivate_account.confirm' | trans }}
</button>
<a
href="javascript:;"
onclick="toggleAccountDeactivateForm()">
I changed my mind
{{ 'winter.user::frontend.deactivate_account.cancel' | trans }}
</a>
{{ form_close() }}
</div>
20 changes: 10 additions & 10 deletions components/account/register.htm
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{% if canRegister %}
<h3>Register</h3>
<h3>{{ 'winter.user::frontend.general.register' | trans }}</h3>

{{ form_ajax('onRegister') }}

<div class="form-group">
<label for="registerName">Full Name</label>
<label for="registerName">{{ 'winter.user::frontend.general.full_name' | trans }}</label>
<input
name="name"
type="text"
class="form-control"
id="registerName"
placeholder="Enter your full name"/>
placeholder="{{ 'winter.user::frontend.general.full_name_placeholder' | trans }}"/>
</div>

<div class="form-group">
<label for="registerEmail">Email</label>
<label for="registerEmail">{{ 'winter.user::frontend.general.email' | trans }}</label>
<input
name="email"
type="email"
class="form-control"
id="registerEmail"
placeholder="Enter your email"/>
placeholder="{{ 'winter.user::frontend.general.email_placeholder' | trans }}"/>
</div>

{% if loginAttribute == "username" %}
<div class="form-group">
<label for="registerUsername">Username</label>
<label for="registerUsername">{{ 'winter.user::frontend.general.username' | trans }}</label>
<input
name="username"
type="text"
class="form-control"
id="registerUsername"
placeholder="Enter your username"/>
placeholder="{{ 'winter.user::frontend.general.username_placeholder' | trans }}"/>
</div>
{% endif %}

<div class="form-group">
<label for="registerPassword">Password</label>
<label for="registerPassword">{{ 'winter.user::frontend.general.password' | trans }}</label>
<input
name="password"
type="password"
class="form-control"
id="registerPassword"
placeholder="Choose a password"
placeholder="{{ 'winter.user::frontend.general.password_placeholder' | trans }}"
autocomplete="new-password"/>
</div>

<button type="submit" class="btn btn-default">Register</button>
<button type="submit" class="btn btn-default">{{ 'winter.user::frontend.general.register' | trans }}</button>

{{ form_close() }}
{% else %}
Expand Down
12 changes: 6 additions & 6 deletions components/account/signin.htm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h3>Sign in</h3>
<h3>{{ 'winter.user::frontend.general.signin' | trans }}</h3>

{{ form_ajax('onSignin') }}
<div class="form-group">
Expand All @@ -8,29 +8,29 @@ <h3>Sign in</h3>
type="text"
class="form-control"
id="userSigninLogin"
placeholder="Enter your {{ loginAttributeLabel|lower }}"
placeholder="{{ 'winter.user::frontend.general.login_placeholder' | trans({attribute: loginAttributeLabel | lower}) }}"
autocomplete="username"/>
</div>

<div class="form-group">
<label for="userSigninPassword">Password</label>
<label for="userSigninPassword">{{ 'winter.user::frontend.general.password' | trans }}</label>
<input
name="password"
type="password"
class="form-control"
id="userSigninPassword"
placeholder="Enter your password"
placeholder="{{ 'winter.user::frontend.signin.password_placeholder' | trans }}"
autocomplete="current-password"/>
</div>

{% if rememberLoginMode == 'ask' %}
<div class="form-group">
<div class="checkbox">
<label><input name="remember" type="checkbox" value="1">Stay logged in</label>
<label><input name="remember" type="checkbox" value="1"> {{ 'winter.user::frontend.general.remember' | trans }}</label>
</div>
</div>
{% endif %}

<button type="submit" class="btn btn-default">Sign in</button>
<button type="submit" class="btn btn-default">{{ 'winter.user::frontend.general.signin' | trans }}</button>

{{ form_close() }}
20 changes: 10 additions & 10 deletions components/account/update.htm
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<h3>Profile</h3>
<h3>{{ 'winter.user::frontend.general.profile' | trans }}</h3>

{{ form_ajax('onUpdate', { flash: 1 }) }}

<div class="form-group">
<label for="accountName">Full Name</label>
<label for="accountName">{{ 'winter.user::frontend.general.full_name' | trans }}</label>
<input name="name" type="text" class="form-control" id="accountName" value="{{ user.name }}">
</div>

<div class="form-group">
<label for="accountEmail">Email</label>
<label for="accountEmail">{{ 'winter.user::frontend.general.email' | trans }}</label>
<input name="email" type="email" class="form-control" id="accountEmail" value="{{ user.email }}">
</div>

<div class="form-group">
<label for="accountPassword">New Password</label>
<label for="accountPassword">{{ 'winter.user::frontend.general.password_new' | trans }}</label>
<input name="password" type="password" class="form-control" id="accountPassword">
</div>

<div class="form-group">
<label for="accountPasswordConfirm">Confirm New Password</label>
<label for="accountPasswordConfirm">{{ 'winter.user::frontend.general.password_new_confirm' | trans }}</label>
<input name="password_confirmation" type="password" class="form-control" id="accountPasswordConfirm">
</div>

<div class="form-group">
<label for="accountAvatar">Display Picture</label>
<label for="accountAvatar">{{ 'winter.user::frontend.general.avatar' | trans }}</label>
<input
name="avatar"
type="file"
Expand All @@ -35,19 +35,19 @@ <h3>Profile</h3>

{% if user.avatar %}
<a href="javascript:;" data-request="onRemoveAvatar" data-request-flash class="remove-avatar">
Remove current display picture
{{ 'winter.user::frontend.general.avatar_remove' | trans }}
</a>
{% endif %}
</div>

{% if updateRequiresPassword %}
<p>To change these details, please confirm your current password.</p>
<p>{{ 'winter.user::frontend.password_required_update' | trans }}</p>
<div class="form-group">
<label for="accountPasswordCurrent">Current Password <small class="text-danger">* required</small></label>
<label for="accountPasswordCurrent">{{ 'winter.user::frontend.general.password_current' | trans }} <small class="text-danger">* {{ 'winter.user::frontend.general.required' | trans }}</small></label>
<input name="password_current" type="password" class="form-control" id="accountPasswordCurrent">
</div>
{% endif %}

<button type="submit" class="btn btn-default">Save</button>
<button type="submit" class="btn btn-default">{{ 'winter.user::frontend.general.save' | trans }}</button>

{{ form_close() }}
43 changes: 43 additions & 0 deletions lang/en/frontend.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php

return [
'continue_with_password' => 'To continue, please enter your password:',
'password_required_update' => 'To change these details, please confirm your current password.',
'resend_verification_email' => 'Send the verification email again',
'general' => [
'avatar' => 'Display Picture',
'avatar_remove' => 'Remove current display picture',
'email' => 'Email',
'email_placeholder' => 'Enter your email',
'full_name' => 'Full Name',
'full_name_placeholder' => 'Enter your full name',
'login_placeholder' => 'Enter your :attribute',
'password' => 'Password',
'password_current' => 'Current Password',
'password_new' => 'New password',
'password_new_confirm' => 'Confirm New Password',
'password_placeholder' => 'Choose a password',
'profile' => 'Profile',
'register' => 'Register',
'remember' => 'Stay logged in',
'required' => 'required',
'save' => 'Save',
'signin' => 'Sign In',
'username' => 'Username',
'username_placeholder' => 'Enter your username',
],
'email_not_verified' => [
'description' => 'You should verify your account otherwise it may be deleted. Please check your email to verify.',
'title' => 'Your email address has not yet been verified.',
],
'deactivate_account' => [
'cancel' => 'I changed my mind',
'confirm' => 'Confirm Deactivate Account',
'description' => 'Your account will be disabled and your details removed from the site. You can reactivate your account any time by signing back in.',
'prompt' => 'Deactivate your account?',
'title' => 'Deactivate account',
],
'signin' => [
'password_placeholder' => 'Enter your password',
],
];
43 changes: 43 additions & 0 deletions lang/fr/frontend.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php

return [
'continue_with_password' => 'Pour continuer, veuillez saisir votre mot de passe actuel :',
'password_required_update' => 'Pour modifier ces données, veuillez confirmer votre mot de passe actuel.',
'resend_verification_email' => 'Renvoyer l\'e-mail de vérification',
'general' => [
'avatar' => 'Image de présentation',
'avatar_remove' => 'Supprimer l\'image de présentation actuelle',
'email' => 'E-mail',
'email_placeholder' => 'Saisissez votre e-mail',
'full_name' => 'Nom complet',
'full_name_placeholder' => 'Saisissez votre nom complet',
'login_placeholder' => 'Saisissez votre :attribute',
'password' => 'Mot de passe',
'password_current' => 'Mot de passe actuel',
'password_new' => 'Nouveau mot de passe',
'password_new_confirm' => 'Confirmer le nouveau mot de passe',
'password_placeholder' => 'Choisir un mot de passe',
'profile' => 'Profil',
'register' => 'S\'enregistrer',
'remember' => 'Rester connecté',
'required' => 'requis',
'save' => 'Enregistrer',
'signin' => 'S\'authentifier',
'username' => 'Pseudo',
'username_placeholder' => 'Saisissez votre pseudo',
],
'email_not_verified' => [
'description' => 'Vous devez vérifier votre compte, faute de quoi il pourrait être supprimé. Veuillez vérifier votre courrier électronique.',
'title' => 'Votre adresse e-mail n\'a pas encore été vérifiée.',
],
'deactivate_account' => [
'cancel' => 'J\'ai changé d\'avis',
'confirm' => 'Confirmer la désactivation du compte',
'description' => 'Votre compte sera désactivé et vos données seront supprimées du site. Vous pouvez réactiver votre compte à tout moment en vous reconnectant.',
'prompt' => 'Désactiver votre compte ?',
'title' => 'Désactiver le compte',
],
'signin' => [
'password_placeholder' => 'Saisissez votre mot de passe',
],
];