Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Translation #38

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Translation #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75bfd7e
Translate login page
Johann-S Dec 25, 2015
576a32c
Translate front page
Johann-S Dec 25, 2015
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
35 changes: 35 additions & 0 deletions app/Resources/translations/messages.en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="file.ext">
<body>
<trans-unit id="1">
<source>Sign in</source>
<target>Sign in</target>
</trans-unit>
<trans-unit id="2">
<source>Sign out</source>
<target>Sign out</target>
</trans-unit>
<trans-unit id="3">
<source>Rights</source>
<target>all rights reserved.</target>
</trans-unit>
<trans-unit id="4">
<source>Admin</source>
<target>Admin</target>
</trans-unit>
<trans-unit id="5">
<source>Register</source>
<target>Register</target>
</trans-unit>
<trans-unit id="6">
<source>About</source>
<target>About</target>
</trans-unit>
<trans-unit id="7">
<source>Home</source>
<target>Home</target>
</trans-unit>
</body>
</file>
</xliff>
35 changes: 35 additions & 0 deletions app/Resources/translations/messages.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="file.ext">
<body>
<trans-unit id="1">
<source>Sign in</source>
<target>Connexion</target>
</trans-unit>
<trans-unit id="2">
<source>Sign out</source>
<target>Déconnection</target>
</trans-unit>
<trans-unit id="3">
<source>Rights</source>
<target>tous droits réservés.</target>
</trans-unit>
<trans-unit id="4">
<source>Admin</source>
<target>Administration</target>
</trans-unit>
<trans-unit id="5">
<source>Register</source>
<target>Inscription</target>
</trans-unit>
<trans-unit id="6">
<source>About</source>
<target>A propos</target>
</trans-unit>
<trans-unit id="7">
<source>Home</source>
<target>Accueil</target>
</trans-unit>
</body>
</file>
</xliff>
24 changes: 17 additions & 7 deletions app/Resources/views/base.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,43 @@
<ul class="nav navbar-nav col-sm-5">
<li class="nav-item active">
<a class="nav-link" href="{{ path('front_homepage') }}">
Accueil <span class="sr-only">(current)</span>
{% trans %}Home{% endtrans %} <span class="sr-only">(current)</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Medias</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">A propos</a>
<a class="nav-link" href="#">
{% trans %}About{% endtrans %}
</a>
</li>
{% if not is_granted('IS_AUTHENTICATED_REMEMBERED') %}
<li class="nav-item">
<a class="nav-link" href="{{ path('user_registration') }}">Inscription</a>
<a class="nav-link" href="{{ path('user_registration') }}">
{% trans %}Register{% endtrans %}
</a>
</li>
{% endif %}
{% if is_granted('ROLE_ADMIN') %}
<li class="nav-item">
<a class="nav-link" href="{{ path('admin_homepage') }}">Administration</a>
<a class="nav-link" href="{{ path('admin_homepage') }}">
{% trans %}Admin{% endtrans %}
</a>
</li>
{% endif %}
</ul>
<ul class="nav navbar-nav pull-right">
<li class="nav-item">
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
<span id="spanConnected">{{ app.user.username }} - </span>
<a class="nav-link" style="display: inline-block;" href="{{ path('fos_user_security_logout') }}">Déconnection</a>
<a class="nav-link" style="display: inline-block;" href="{{ path('fos_user_security_logout') }}">
{% trans %}Sign out{% endtrans %}
</a>
{% else %}
<a class="nav-link" href="{{ path('fos_user_security_login') }}">Connexion</a>
<a class="nav-link" href="{{ path('fos_user_security_login') }}">
{% trans %}Sign in{% endtrans %}
</a>
{% endif %}
</li>
</ul>
Expand All @@ -55,7 +65,7 @@
</div>
<footer class="footer bg-primary-front-page">
<div id="footerContainer" class="container">
<p class="text-muted">© 2015 - ownMc all rights reserved.</p>
<p class="text-muted">© 2015 - ownMc {% trans %}Rights{% endtrans %}</p>
</div>
</footer>
<script src="{{ asset('js/libs/jquery.min.js') }}"></script>
Expand Down
4 changes: 2 additions & 2 deletions app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ parameters:

framework:
#esi: ~
#translator: { fallbacks: ["%locale%"] }
default_locale: en
translator: { fallbacks: [en] }
secret: "%secret%"
router:
resource: "%kernel.root_dir%/config/routing.yml"
Expand All @@ -22,7 +23,6 @@ framework:
templating:
engines: ['twig']
#assets_version: SomeVersionScheme
default_locale: "%locale%"
trusted_hosts: ~
trusted_proxies: ~
session:
Expand Down
27 changes: 27 additions & 0 deletions src/UserBundle/Resources/translations/messages.en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="file.ext">
<body>
<trans-unit id="1">
<source>Username</source>
<target>Username</target>
</trans-unit>
<trans-unit id="2">
<source>Password</source>
<target>Password</target>
</trans-unit>
<trans-unit id="3">
<source>Remember me</source>
<target>Remember me</target>
</trans-unit>
<trans-unit id="4">
<source>Sign in</source>
<target>Sign in</target>
</trans-unit>
<trans-unit id="5">
<source>Error sign in</source>
<target>An error ocurred during the sign in process</target>
</trans-unit>
</body>
</file>
</xliff>
20 changes: 18 additions & 2 deletions src/UserBundle/Resources/translations/messages.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,24 @@
<file source-language="en" datatype="plaintext" original="file.ext">
<body>
<trans-unit id="1">
<source>Symfony2 is great</source>
<target>J'aime Symfony2</target>
<source>Username</source>
<target>Identifiant</target>
</trans-unit>
<trans-unit id="2">
<source>Password</source>
<target>Mot de passe</target>
</trans-unit>
<trans-unit id="3">
<source>Remember me</source>
<target>Se souvenir de moi</target>
</trans-unit>
<trans-unit id="4">
<source>Sign in</source>
<target>Connection</target>
</trans-unit>
<trans-unit id="5">
<source>Error sign in</source>
<target>Une erreur est survenue ou votre demande d'inscription n'a pas été validé.</target>
</trans-unit>
</body>
</file>
Expand Down
20 changes: 15 additions & 5 deletions src/UserBundle/Resources/views/Security/login.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
<div class="row">
{% if error %}
<div class="alert alert-danger center-block" role="alert" style="width: 500px;">
<p><i class="fa fa-warning"></i> Une erreur est survenue ou votre demande d'inscription n'a pas été validé.</p>
<p>
<i class="fa fa-warning"></i>
{% trans %}Error sign in{% endtrans %}
</p>
</div>
{% endif %}

Expand All @@ -14,14 +17,18 @@
<input type="hidden" name="_csrf_token" value="{{ csrf_token }}" />

<div id="formGpUsername" class="form-group row">
<label for="username" class="col-sm-3 form-control-label">Login</label>
<label for="username" class="col-sm-3 form-control-label">
{% trans %}Username{% endtrans %}
</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="username" name="_username" value="{{ last_username }}" />
</div>
</div>

<div id="formGpPassword" class="form-group row">
<label for="password" class="col-sm-3 form-control-label">Mot de passe</label>
<label for="password" class="col-sm-3 form-control-label">
{% trans %}Password{% endtrans %}
</label>
<div class="col-sm-9">
<input type="password" class="form-control" id="password" name="_password" />
</div>
Expand All @@ -32,7 +39,8 @@
<div class="col-sm-9">
<div class="checkbox">
<label>
<input type="checkbox" id="remember_me" name="_remember_me" value="on"> Se souvenir de moi
<input type="checkbox" id="remember_me" name="_remember_me" value="on">
{% trans %}Remember me{% endtrans %}
</label>
</div>
</div>
Expand All @@ -41,7 +49,9 @@
<div class="form-group row">
<label class="col-sm-3"></label>
<div class="col-sm-9">
<button type="submit" id="btnSubmit" name="_submit" class="btn btn-primary">Connexion</button>
<button type="submit" id="btnSubmit" name="_submit" class="btn btn-primary">
{% trans %}Sign in{% endtrans %}
</button>
</div>
</div>
</form>
Expand Down