From 8866b28d9b6306baee84729b86f8673b8e9a9f4b Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Wed, 9 Sep 2015 20:43:38 +0200
Subject: [PATCH] Translated boolean labels when using "toggle" fields

---
 Resources/translations/EasyAdminBundle.en.xlf  | 18 ++++++++++--------
 Resources/translations/EasyAdminBundle.fr.xlf  | 18 ++++++++++--------
 Resources/views/css/admin.css.twig             | 15 ++++++++++++++-
 .../views/default/field_boolean.html.twig      |  7 ++++---
 Resources/views/default/field_toggle.html.twig | 10 ++++++++--
 5 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/Resources/translations/EasyAdminBundle.en.xlf b/Resources/translations/EasyAdminBundle.en.xlf
index c9b09a0e0c..e977f1a855 100644
--- a/Resources/translations/EasyAdminBundle.en.xlf
+++ b/Resources/translations/EasyAdminBundle.en.xlf
@@ -92,6 +92,16 @@
                 <target><![CDATA[<strong>%start%</strong> - <strong>%end%</strong> of <strong>%results%</strong>]]></target>
             </trans-unit>
 
+            <!-- labels -->
+            <trans-unit id="label.true">
+                <source>label.true</source>
+                <target>Yes</target>
+            </trans-unit>
+            <trans-unit id="label.false">
+                <source>label.false</source>
+                <target>No</target>
+            </trans-unit>
+
             <!-- misc. elements -->
             <trans-unit id="header.close">
                 <source>header.close</source>
@@ -121,14 +131,6 @@
                 <source>errors</source>
                 <target>Error|Errors</target>
             </trans-unit>
-            <trans-unit id="boolean.true">
-                <source>boolean.true</source>
-                <target>Yes</target>
-            </trans-unit>
-            <trans-unit id="boolean.false">
-                <source>boolean.false</source>
-                <target>No</target>
-            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/EasyAdminBundle.fr.xlf b/Resources/translations/EasyAdminBundle.fr.xlf
index cc9029a7bc..7a3a96f52f 100644
--- a/Resources/translations/EasyAdminBundle.fr.xlf
+++ b/Resources/translations/EasyAdminBundle.fr.xlf
@@ -92,6 +92,16 @@
                 <target><![CDATA[<strong>%start%</strong> - <strong>%end%</strong> sur <strong>%results%</strong>]]></target>
             </trans-unit>
 
+            <!-- labels -->
+            <trans-unit id="label.true">
+                <source>label.true</source>
+                <target>Oui</target>
+            </trans-unit>
+            <trans-unit id="label.false">
+                <source>label.false</source>
+                <target>Non</target>
+            </trans-unit>
+
             <!-- misc. elements -->
             <trans-unit id="header.close">
                 <source>header.close</source>
@@ -121,14 +131,6 @@
                 <source>errors</source>
                 <target>Erreur|Erreurs</target>
             </trans-unit>
-            <trans-unit id="boolean.true">
-                <source>boolean.true</source>
-                <target>Oui</target>
-            </trans-unit>
-            <trans-unit id="boolean.false">
-                <source>boolean.false</source>
-                <target>Non</target>
-            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/views/css/admin.css.twig b/Resources/views/css/admin.css.twig
index ba45898bf4..6d3d0b6316 100644
--- a/Resources/views/css/admin.css.twig
+++ b/Resources/views/css/admin.css.twig
@@ -184,8 +184,9 @@ div.flash-error strong {
 }
 .label {
     color: {{ colors.white }};
+    display: inline-block;
     font-size: 11px;
-    padding: 2px 4px;
+    padding: 4px;
     text-transform: uppercase;
 }
 .label-success {
@@ -201,12 +202,19 @@ div.flash-error strong {
     color: {{ colors.text }};
 }
 
+/* this makes boolean labels to be of the same width for most languages */
+.boolean .label,
+.toggle .label {
+    min-width: 33px;
+}
+
 /* Switches / toggles
    ------------------------------------------------------------------------- */
 .toggle .btn {
     border-radius: 3px;
     font-size: 11px;
     font-weight: bold;
+    text-transform: uppercase;
 }
 .toggle .toggle.btn-success {
     border-color: {{ colors.success }};
@@ -239,6 +247,11 @@ div.flash-error strong {
     margin-top: 1px;
     margin-right: 5px;
 }
+.toggle .toggle-on.btn-xs,
+.toggle .toggle-off.btn-xs {
+    padding-left: 4px;
+    text-align: center;
+}
 
 /* Badges
    ------------------------------------------------------------------------- */
diff --git a/Resources/views/default/field_boolean.html.twig b/Resources/views/default/field_boolean.html.twig
index 22ccbd9fe6..0e93c68634 100644
--- a/Resources/views/default/field_boolean.html.twig
+++ b/Resources/views/default/field_boolean.html.twig
@@ -1,6 +1,7 @@
 {% trans_default_domain "EasyAdminBundle" %}
+
 {% if value == true %}
-    <span class="label label-success">{{ 'boolean.true'|trans }}</span>
+    <span class="label label-success">{{ 'label.true'|trans }}</span>
 {% else %}
-    <span class="label label-danger">{{ 'boolean.false'|trans }}</span>
-{% endif %}
\ No newline at end of file
+    <span class="label label-danger">{{ 'label.false'|trans }}</span>
+{% endif %}
diff --git a/Resources/views/default/field_toggle.html.twig b/Resources/views/default/field_toggle.html.twig
index 7e493cc0c4..5b4eed62de 100644
--- a/Resources/views/default/field_toggle.html.twig
+++ b/Resources/views/default/field_toggle.html.twig
@@ -1,8 +1,14 @@
+{% trans_default_domain "EasyAdminBundle" %}
+
 {% if view == 'show' %}
-    <span class="label label-{{ value == true ? 'success' : 'danger' }}">{{ value == true ? 'YES' : 'NO' }}</span>
+    {% if value == true %}
+        <span class="label label-success">{{ 'label.true'|trans }}</span>
+    {% else %}
+        <span class="label label-danger">{{ 'label.false'|trans }}</span>
+    {% endif %}
 {% else %}
     <input type="checkbox" {{ value == true ? 'checked' : '' }}
        data-toggle="toggle" data-size="mini"
        data-onstyle="success" data-offstyle="danger"
-       data-on="YES" data-off="NO">
+       data-on="{{ 'label.true'|trans }}" data-off="{{ 'label.false'|trans }}">
 {% endif %}