Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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.activate.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.activate.infos' | trans }}
<a href="javascript:;" data-request="onSendActivationEmail">{{ 'winter.user::frontend.activate.link' | 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.link' | trans }}
</a>

<div id="accountDeactivateForm" style="display: none">
{{ form_ajax('onDeactivate') }}
<h3>Deactivate your account?</h3>
<h3>{{ 'winter.user::frontend.deactivate.title' | 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.infos' | trans }}
</p>
<div class="form-group">
<label for="accountDeletePassword">To continue, please enter your password:</label>
<label for="accountDeletePassword">{{ 'winter.user::frontend.deactivate.enter_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.button' | trans }}
</button>
<a
href="javascript:;"
onclick="toggleAccountDeactivateForm()">
I changed my mind
{{ 'winter.user::frontend.deactivate.mind_changed' | 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.register.title' | 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.register.button' | 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.signin.title' | 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.enter_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.signin.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.signin.button' | 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.update.title' | 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.update.new_password' | 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.update.new_password_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.update.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.update.avatar_remove' | trans }}
</a>
{% endif %}
</div>

{% if updateRequiresPassword %}
<p>To change these details, please confirm your current password.</p>
<p>{{ 'winter.user::frontend.update.password_required' | trans }}</p>
<div class="form-group">
<label for="accountPasswordCurrent">Current Password <small class="text-danger">* required</small></label>
<label for="accountPasswordCurrent">{{ 'winter.user::frontend.update.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.update.button' | trans }}</button>

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

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

return [
'general' => [
'email' => 'E-mail',
'email_placeholder' => 'Saisissez votre e-mail',
'enter_placeholder' => 'Saisissez votre :attribute',
'full_name' => 'Nom complet',
'full_name_placeholder' => 'Saisissez votre nom complet',
'username' => 'Pseudo',
'username_placeholder' => 'Entrez votre pseudo',
'password' => 'Mot de passe',
'password_placeholder' => 'Choisir un mot de passe',
'required' => 'requis',
],
'activate' => [
'title' => 'Votre adresse e-mail n\'a pas encore été vérifiée.',
'infos' => 'Vous devez vérifier votre compte, faute de quoi il pourrait être supprimé. Veuillez vérifier votre courrier électronique.',
'link' => 'Renvoyer l\'e-mail de vérification',
],
'deactivate' => [
'title' => 'Désactiver votre compte ?',
'button' => 'Confirmer la désactivation du compte',
'enter_password' => 'Pour continuer, veuillez saisir votre mot de passe actuel :',
'infos' => '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.',
'link' => 'Désactiver le compte',
'mind_changed' => 'J\'ai changé d\'avis',
],
'register' => [
'title' => 'S\'enregistrer',
'button' => 'S\'enregistrer',
],
'signin' => [
'title' => 'S\'authentifier',
'button' => 'S\'authentifier',
'password_placeholder' => 'Entrez votre mot de passe',
'remember' => 'Rester connecté',
],
'update' => [
'title' => 'Profil',
'button' => 'Enregistrer',
'avatar' => 'Image de présentation',
'avatar_remove' => 'Supprimer l\'image de présentation actuelle',
'password_current' => 'Mot de passe actuel',
'password_required' => 'Pour modifier ces données, veuillez confirmer votre mot de passe actuel.',
'new_password' => 'Nouveau mot de passe',
'new_password_confirm' => 'Confirmer le nouveau mot de passe',
],
];