Merge pull request #331 from kamiramix/develop

Florian Eckerstorfer · Florian Eckerstorfer · commit 38655d185490 · 2016-01-22T15:25:19.000+01:00
Translate menu labels
diff --git a/Resources/views/Menu/bootstrap.html.twig b/Resources/views/Menu/bootstrap.html.twig
@@ -188,4 +188,4 @@
 
 {% block spanElement %}<span{{ attributes(item.labelAttributes) }}>{{ block('label') }}</span>{% endblock %}
 
-{% block label %}{% if options.allow_safe_labels and item.getExtra('safe_label', false) %}{{ item.label|raw|parse_icons }}{% else %}{{ item.label|parse_icons }}{% endif %}{% endblock %}
+{% block label %}{% if options.allow_safe_labels and item.getExtra('safe_label', false) %}{{ item.label|trans(item.getExtra('translation_params', {}), item.getExtra('translation_domain', 'messages'))|raw|parse_icons }}{% else %}{{ item.label|trans(item.getExtra('translation_params', {}), item.getExtra('translation_domain', 'messages'))|parse_icons }}{% endif %}{% endblock %}

Original file line number	Diff line number	Diff line change
`@@ -188,4 +188,4 @@`
`188`	`188`
`189`	`189`	`{% block spanElement %}<span{{ attributes(item.labelAttributes) }}>{{ block('label') }}</span>{% endblock %}`
`190`	`190`
`191`		`-{% block label %}{% if options.allow_safe_labels and item.getExtra('safe_label', false) %}{{ item.label\|raw\|parse_icons }}{% else %}{{ item.label\|parse_icons }}{% endif %}{% endblock %}`
	`191`	`+{% block label %}{% if options.allow_safe_labels and item.getExtra('safe_label', false) %}{{ item.label\|trans(item.getExtra('translation_params', {}), item.getExtra('translation_domain', 'messages'))\|raw\|parse_icons }}{% else %}{{ item.label\|trans(item.getExtra('translation_params', {}), item.getExtra('translation_domain', 'messages'))\|parse_icons }}{% endif %}{% endblock %}`