Permalink
Browse files

Merge branch 'translations' of https://github.com/mweimerskirch/UserB…

  • Loading branch information...
2 parents bdacdb6 + 1ca6e7a commit c29541901c9db31bd69fe21750980a49e0b19408 @lsmith77 lsmith77 committed Apr 18, 2011
@@ -0,0 +1,61 @@
+group.edit.submit: Update group
+group.show.name: Group name
+group.new.submit: Create group
+
+security.login.username: "Username:"
+security.login.password: "Password:"
+security.login.remember_me: Remember me
+security.login.submit: Login
+security.login.request_reset_password: Forgotten password
+
+user.change_password.submit: Change password
+user.check_confirmation_email.message: An email has been sent to %email%. It contains an activation link you must click to activate your account.
+user.check_resetting_email.sent: An email has been sent to %email%. It contains an link you must click to reset your password.
+user.confirmed.message: Congrats %username%, your account is now confirmed.
+
+user.show.username: Username
+user.show.email: Email
+user.new.submit: Create user
+user.edit.submit: Update user
+user.password_already_requested: The password for this user has already been requested within the last 24 hours.
+user.password_request_reset.username: "Username:"
+user.password_request_reset.submit: Reset password
+user.reset_password.submit: Change password
+
+user.email.resetting_password: |
+ Welcome %username%!
+ Hello %username%!
+
+ To reset your password - please visit %confirmationUrl%
+
+ Regards,
+ the Team.
+
+user.email.confirmation: |
+ Welcome %username%!
+ Hello %username%!
+
+ To finish validating your account - please visit %confirmationUrl%
+
+ Regards,
+ the Team.
+
+# Global strings
+layout.logout: Logout
+layout.login: Login
+layout.register: Register
+layout.logged_in_as: Logged in as %username%
+
+# Form field labels
+fos_user_group_form_name: "Group name:"
+
+fos_user_user_form_username: "Username:"
+fos_user_user_form_email: "Email:"
+fos_user_user_form_plainPassword: "Password (enter twice):"
+fos_user_user_form_plainPassword_first: "Password:"
+fos_user_user_form_plainPassword_second: "Verification:"
+
+fos_user_reset_password_form_new: "New password:"
+
+fos_user_change_password_form_new: "New password:"
+fos_user_change_password_form_current: "Current password:"
@@ -1,7 +1,7 @@
-{% form_theme form form.getOption('theme') %}
+{% form_theme form 'FOSUserBundle::form.html.twig' %}
<form action="{{ path('fos_user_group_update', {'groupname': groupname} ) }}" {{ form_enctype(form) }} method="POST" class="fos_user_group_edit">
{{ form_field(form) }}
<div>
- <input type="submit" value="{% trans 'Update group' from 'FOSUserBundle' %}" />
+ <input type="submit" value="{% trans 'group.edit.submit' from 'FOSUserBundle' %}" />
</div>
</form>
@@ -1,7 +1,7 @@
-{% form_theme form form.getOption('theme') %}
+{% form_theme form 'FOSUserBundle::form.html.twig' %}
<form action="{{ path('fos_user_group_create') }}" {{ form_enctype(form) }} method="POST" class="fos_user_group_new">
{{ form_field(form) }}
<div>
- <input type="submit" value="{% trans 'Create group' from 'FOSUserBundle' %}" />
+ <input type="submit" value="{% trans 'group.new.submit' from 'FOSUserBundle' %}" />
</div>
</form>
@@ -1,3 +1,3 @@
<div class="fos_user_group_show">
- <p>{% trans "Groupname" from 'FOSUserBundle' %}: {{ group.getName() }}</p>
+ <p>{% trans "group.show.name" from 'FOSUserBundle' %}: {{ group.getName() }}</p>
</div>
@@ -6,18 +6,18 @@
{% endif %}
<form action="{{ path("_security_check") }}" method="post">
- <label for="username">Username:</label>
+ <label for="username">{% trans "security.login.username" from 'FOSUserBundle' %}</label>
<input type="text" id="username" name="_username" value="{{ last_username }}" />
- <label for="password">Password:</label>
+ <label for="password">{% trans "security.login.password" from 'FOSUserBundle' %}</label>
<input type="password" id="password" name="_password" />
<input type="checkbox" id="remember_me" name="_remember_me" value="on" />
- <label for="remember_me">Remember Me</label>
+ <label for="remember_me">{% trans "security.login.remember_me" from 'FOSUserBundle' %}</label>
- <input type="submit" name="login" />
+ <input type="submit" name="{% trans "security.login.submit" from 'FOSUserBundle' %}" />
</form>
<p>
- <a href="{{ path('fos_user_user_request_reset_password') }}">{% trans 'Forgotten password' from 'FOSUserBundle' %}</a>
+ <a href="{{ path('fos_user_user_request_reset_password') }}">{% trans 'security.login.request_reset_password' from 'FOSUserBundle' %}</a>
</p>
{% endblock content %}
@@ -1,7 +1,7 @@
-{% form_theme form form.getOption('theme') %}
+{% form_theme form 'FOSUserBundle::form.html.twig' %}
<form action="{{ path('fos_user_user_change_password_update') }}" {{ form_enctype(form) }} method="POST" class="fos_user_user_change_password">
{{ form_field(form) }}
<div>
- <input type="submit" value="{% trans 'Change password' from 'FOSUserBundle' %}" />
+ <input type="submit" value="{% trans 'user.change_password.submit' from 'FOSUserBundle' %}" />
</div>
</form>
@@ -1,4 +1,2 @@
{% set email = user.getEmail() %}
-{% trans from 'FOSUserBundle' %}
-An email has been sent to %email%. It contains an activation link you must click to activate your account.
-{% endtrans %}
+{% trans "user.check_confirmation_email.message" from 'FOSUserBundle' %}
@@ -3,8 +3,6 @@
{% block content %}
{% set email = user.getEmail() %}
<p>
-{% trans from 'FOSUserBundle' %}
-An email has been sent to %email%. It contains an link you must click to reset your password.
-{% endtrans %}
+{% trans "user.check_resetting_email.message" from 'FOSUserBundle' %}
</p>
{% endblock %}
@@ -1,11 +1,2 @@
{% set username = user.getUsername() %}
-{% trans from 'FOSUserBundle' %}
- Welcome %username%!
- Hello %username%!
-
- To finish validating your account - please visit %confirmationUrl%
-
- Regards,
-
- the Team.
-{% endtrans %}
+{% trans "user.email.confirmation" from 'FOSUserBundle' %}
@@ -1,6 +1,4 @@
{% extends "FOSUserBundle::layout.html.twig" %}
{% set username = user.getUsername() %}
-{% trans from 'FOSUserBundle' %}
- Congrats %username%, your account is now confirmed.
-{% endtrans %}
+{% trans "user.confirmed.message" from 'FOSUserBundle' %}
@@ -1,7 +1,7 @@
-{% form_theme form form.getOption('theme') %}
+{% form_theme form 'FOSUserBundle::form.html.twig' %}
<form action="{{ path('fos_user_user_update', {'username': username} ) }}" {{ form_enctype(form) }} method="POST" class="fos_user_user_edit">
{{ form_field(form) }}
<div>
- <input type="submit" value="{% trans 'Update user' from 'FOSUserBundle' %}" />
+ <input type="submit" value="{% trans 'user.edit.submit' from 'FOSUserBundle' %}" />
</div>
</form>
@@ -1,7 +1,7 @@
-{% form_theme form form.getOption('theme') %}
+{% form_theme form 'FOSUserBundle::form.html.twig' %}
<form action="{{ path('fos_user_user_create') }}" {{ form_enctype(form) }} method="POST" class="fos_user_user_new">
{{ form_field(form) }}
<div>
- <input type="submit" value="{% trans 'Create user' from 'FOSUserBundle' %}" />
+ <input type="submit" value="{% trans 'user.new.submit' from 'FOSUserBundle' %}" />
</div>
</form>
@@ -1,5 +1,5 @@
{% extends "FOSUserBundle::layout.html.twig" %}
{% block content %}
-The password for this user has already been requested within the last 24 hours.
-{% endblock content %}
+{% trans "user.password_already_requested" from 'FOSUserBundle' %}
+{% endblock content %}
@@ -1,9 +1,9 @@
<form action="{{ path('fos_user_user_send_resetting_email') }}" method="POST" class="fos_user_user_request_reset_password">
<div>
- <label for="username">Username:</label>
+ <label for="username">{% trans 'user.password_request_reset.username' from 'FOSUserBundle' %}</label>
<input type="text" id="username" name="username" />
</div>
<div>
- <input type="submit" value="{% trans 'Reset password' from 'FOSUserBundle' %}" />
+ <input type="submit" value="{% trans 'user.password_request_reset.submit' from 'FOSUserBundle' %}" />
</div>
</form>
@@ -1,7 +1,7 @@
-{% form_theme form form.getOption('theme') %}
+{% form_theme form 'FOSUserBundle::form.html.twig' %}
<form action="{{ path('fos_user_user_reset_password_update', {'token': token}) }}" {{ form_enctype(form) }} method="POST" class="fos_user_user_reset_password">
{{ form_field(form) }}
<div>
- <input type="submit" value="{% trans 'Change password' from 'FOSUserBundle' %}" />
+ <input type="submit" value="{% trans 'user.reset_password.submit' from 'FOSUserBundle' %}" />
</div>
</form>
@@ -1,11 +1,2 @@
{% set username = user.getUsername() %}
-{% trans from 'FOSUserBundle' %}
- Welcome %username%!
- Hello %username%!
-
- To reset your password - please visit %confirmationUrl%
-
- Regards,
-
- the Team.
-{% endtrans %}
+{% trans 'user.email.resetting_password' from 'FOSUserBundle' %}
@@ -1,4 +1,4 @@
<div class="fos_user_user_show">
- <p>{% trans "Username" from 'FOSUserBundle' %}: {{ user.getUsername() }}</p>
- <p>{% trans "Email" from 'FOSUserBundle' %}: {{ user.getEmail() }}</p>
+ <p>{% trans "user.show.username" from 'FOSUserBundle' %}: {{ user.getUsername() }}</p>
+ <p>{% trans "user.show.email" from 'FOSUserBundle' %}: {{ user.getEmail() }}</p>
</div>
@@ -0,0 +1,5 @@
+{% form_theme form form.getOption('theme') %}
+
+{% block label %}
+ <label for="{{ field.id }}">{% trans field.id from 'FOSUserBundle' %}</label>
+{% endblock label %}
@@ -7,14 +7,14 @@
<div>
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
<a href="{{ path('fos_user_user_show', {'username': app.user.getUsername}) }}">
- {% trans 'Logged in as %username%' with { '%username%': app.user.getUsername() } from 'FOSUserBundle' %}
+ {% trans 'layout.logged_in_as' with { '%username%': app.user.getUsername() } from 'FOSUserBundle' %}
</a> |
<a href="{{ path('_security_logout') }}">
- {% trans 'Logout' from 'FOSUserBundle' %}
+ {% trans 'layout.logout' from 'FOSUserBundle' %}
</a>
{% else %}
- <a href="{{ path('_security_login') }}">{% trans 'Login' from 'FOSUserBundle' %}</a> |
- <a href="{{ path('fos_user_user_new') }}">{% trans 'Register' from 'FOSUserBundle' %}</a>
+ <a href="{{ path('_security_login') }}">{% trans 'layout.login' from 'FOSUserBundle' %}</a> |
+ <a href="{{ path('fos_user_user_new') }}">{% trans 'layout.register' from 'FOSUserBundle' %}</a>
{% endif %}
</div>

0 comments on commit c295419

Please sign in to comment.