From 82790998d46ef2c4017262a854e8c9c93c66001d Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 21 Dec 2016 22:52:23 +0100
Subject: [PATCH] DE translations

---
 app/bootstrap.php.d/30-trans.php        |  2 +-
 app/locales/de.yml                      | 82 ++++++++++++-------------
 src/Gist/Model/User.php                 |  2 +-
 src/Gist/Resources/views/base.html.twig |  7 +--
 4 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/app/bootstrap.php.d/30-trans.php b/app/bootstrap.php.d/30-trans.php
index 0528878..527de85 100644
--- a/app/bootstrap.php.d/30-trans.php
+++ b/app/bootstrap.php.d/30-trans.php
@@ -11,7 +11,7 @@ use Symfony\Component\HttpFoundation\Cookie;
 $app->register(new TranslationServiceProvider(), array(
     'locale' => 'en',
     'locale_fallback' => 'en',
-    'locales' => array('en', 'fr', 'es'/*, 'de'*/), 
+    'locales' => array('en', 'fr', 'es', 'de'),
 ));
 
 $app['translator'] = $app->extend('translator', function ($translator, $app) {
diff --git a/app/locales/de.yml b/app/locales/de.yml
index 20095b4..9655ec0 100644
--- a/app/locales/de.yml
+++ b/app/locales/de.yml
@@ -4,83 +4,83 @@ app:
 
     menu:
         home:
-            title: 'Accueil'
+            title: 'Home'
         about:
-            title: 'À propos'
+            title: 'Über uns'
         my:
             login:
-                title: 'Connexion'
+                title: 'Anmelden'
             logout:
-                title: 'Déconnexion'
+                title: 'Abmelden'
             register:
-                title: 'S''inscrire'
+                title: 'Konto öffnen'
             my:
-                title: 'Mon compte'
+                title: 'Mein Konto'
 
 my:
-    title: 'Mes Gists'
-    nothing: 'Rien pour le moment !'
+    title: 'Meine Gists'
+    nothing: 'Nichts zu finden (momentan)!'
 
 gist:
-    untitled: 'Sans titre'
+    untitled: 'Ohne Titel'
     404:
-        title: 'Arf...'
-        message: "Ce gist n'existe pas."
+        title: 'Tja...'
+        message: 'Dieser Gist existiert nicht.'
     action:
-        view: 'Afficher'
-        history: 'Révision(s)'
+        view: 'Anzeigen'
+        history: 'Commit(s)'
         raw: 'RAW'
-        download: 'Télécharger'
-        clone: 'Clôner'
-        embed: 'Insérer : '
-        add: 'Ajouter'
+        download: 'Herunterladen'
+        clone: 'Klonen'
+        embed: 'Einfügen:'
+        add: 'Hinzufügen'
 
 date:
-    format: 'd/m/Y H\hi s\s'
+    format: 'Y-m-d h:i:s'
 
 footer:
-    text: '<p>Propulsé par <a href="https://gitnet.fr/deblan/gist">GIST</a>, c''est libre :) - <a href="https://gitnet.fr/deblan/gist#api">API</a></p>'
+    text: '<p>Powered by <a href="https://gitnet.fr/deblan/gist">GIST</a>, it''s open source :) - <a href="https://gitnet.fr/deblan/gist#api">API</a></p>'
 
 login:
     login:
-        title: 'Identification'
-        invalid: 'Nom d''utilisateur ou mot de passe incorrect.'
+        title: 'Login'
+        invalid: 'Anmeldung festgeschlagen.'
         form:
             username:
-                placeholder: 'Nom d''utilisateur'
+                placeholder: 'Benutzername'
             password:
-                placeholder: 'Mot de passe'
+                placeholder: 'Passwort'
             remember_me:
-                label: 'Se souvenir de moi'
+                label: 'Remember me'
     register:
-        title: 'Nouveau compte'
-        already_exists: 'Ce nom d''utilisateur est déjà enregistré'
-        registred: 'Félicitation, votre compte a bien été créé !'
+        title: 'New account'
+        already_exists: 'This username is already registred!'
+        registred: 'Congratulations, your account is created!'
         form:
             username:
-                placeholder: 'Nom d''utilisateur'
+                placeholder: 'Username'
             password:
-                placeholder: 'Mot de passe'
+                placeholder: 'Password'
 
 form:
     error:
-        not_blank: 'Vous devez saisir cette donnée.'
+        not_blank: 'This value should not be blank bro!'
     title:
-        placeholder: 'Titre'
+        placeholder: 'Titel'
     cipher:
-        label: 'Chiffrer : %value%'
+        label: 'Cipher: %value%'
         choice:
-            anyway: 'Peu importe'
-            yes: 'Oui'
-            no: 'Non'
-    submit: 'Envoyer'
-    filter: 'Filtrer'
+            anyway: 'Anyway'
+            yes: 'Yes'
+            no: 'No'
+    submit: 'Senden'
+    filter: 'Filter'
     success:
-        gist: 'Votre Gist a bien a été supprimé.'
+        gist: 'Gist removed.'
     type:
-        label: 'Langage : %value%'
+        label: 'Language: %value%'
         choice:
-            all: 'Tous'
+            all: 'All'
             html: 'HTML'
             xml: 'XML'
             css: 'CSS'
@@ -94,4 +94,4 @@ form:
             python: 'PYTHON'
             bash: 'BASH'
             actionscript3: 'ACTION SCRIPT'
-            text: 'TEXTE'
+            text: 'TEXT'
diff --git a/src/Gist/Model/User.php b/src/Gist/Model/User.php
index 7282af1..e8c7629 100644
--- a/src/Gist/Model/User.php
+++ b/src/Gist/Model/User.php
@@ -6,7 +6,7 @@ use Gist\Model\Base\User as BaseUser;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Connection\ConnectionInterface;
-.
+
 /**
  * Class User.
  *
diff --git a/src/Gist/Resources/views/base.html.twig b/src/Gist/Resources/views/base.html.twig
index cdd2e9d..fedafa1 100644
--- a/src/Gist/Resources/views/base.html.twig
+++ b/src/Gist/Resources/views/base.html.twig
@@ -36,7 +36,7 @@
                                     {{ 'app.menu.home.title'|trans }}
                                 </a>
                             </li>
-							
+
 							{% if user %}
 								<li>
 									<a href="{{ path('my') }}">
@@ -71,8 +71,7 @@
                         </ul>
                         {% block langs %}
                             <p class="navbar-text navbar-right">
-                                {# {% for locale, flag in {'en': 'gb', 'fr': 'fr', 'es': 'es', 'de': 'de'} %} #}
-                                {% for locale, flag in {'en': 'gb', 'fr': 'fr', 'es': 'es'} %}
+                                {% for locale, flag in {'en': 'gb', 'fr': 'fr', 'es': 'es', 'de': 'de'} %}
                                     <a class="lang btn btn-xs cipher-link" href="{{ path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')|merge({_locale: locale})) }}">
                                         <span class="flag-icon flag-icon-{{ flag }}"></span>
                                     </a>
@@ -92,7 +91,7 @@
                 <footer>
                     {{ 'footer.text'|trans|raw }}
                 </footer>
-            {% endblock %}    
+            {% endblock %}
         </div>
         {% block js %}
             <script src="{{ web_path }}components/jquery/dist/jquery.min.js"></script>