Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feature #444 Translated boolean labels when using "toggle" fields (ja…
…viereguiluz) This PR was squashed before being merged into the master branch (closes #444). Discussion ---------- Translated boolean labels when using "toggle" fields This is related to #443 but it translates boolean labels also when using "toggle" fields. Besides, the boolean labels are now of the same width (for most languages at least), which improves the overall design: English toggle: ![toggle_en](https://cloud.githubusercontent.com/assets/73419/9771020/b0bcae90-5733-11e5-80f7-cf1a4b6c87d7.png) French toggle: ![toggle_fr](https://cloud.githubusercontent.com/assets/73419/9771026/b376963c-5733-11e5-858c-bef163f95cdc.png) English label; ![label_en](https://cloud.githubusercontent.com/assets/73419/9771031/b7cfaf66-5733-11e5-9e4d-847820cd9e14.png) French label: ![label_fr](https://cloud.githubusercontent.com/assets/73419/9771027/b588d14c-5733-11e5-904b-881804bfe30c.png) Commits ------- 8866b28 Translated boolean labels when using "toggle" fields
- Loading branch information
Showing
5 changed files
with
46 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 %} | ||
<span class="label label-danger">{{ 'label.false'|trans }}</span> | ||
{% endif %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 %} |