diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-06-25 09:07:58 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-06-25 09:07:58 +0400 |
| commit | 7bbf3052d1e34cc280a391d21b1086e328774b40 (patch) | |
| tree | 8d93b4b8749f86db1bf770b3df06c7221aeb7bbe /plugins/SegmentEditor | |
| parent | 1c83deaa3ef5e981456692a5c611f2fe587437de (diff) | |
Reverting my commit where I removed all |raw per @halfdan feedback
Instead we should manually add the missing |raw...
Refs #4019
Diffstat (limited to 'plugins/SegmentEditor')
| -rw-r--r-- | plugins/SegmentEditor/templates/getSelector.twig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/SegmentEditor/templates/getSelector.twig b/plugins/SegmentEditor/templates/getSelector.twig index 70529272de..6a3d4f4ff7 100644 --- a/plugins/SegmentEditor/templates/getSelector.twig +++ b/plugins/SegmentEditor/templates/getSelector.twig @@ -68,13 +68,13 @@ <div class="segment-or">{{ 'SegmentEditor_OperatorOR'|translate }}</div> <div class="segment-add-or"><div> {% set orCondition %}<span>{{ 'SegmentEditor_OperatorOR'|translate }}</span>{% endset %} - <a href="#"> + {{ 'SegmentEditor_AddANDorORCondition'|translate(orCondition) }} </a> + <a href="#"> + {{ 'SegmentEditor_AddANDorORCondition'|translate(orCondition)|raw }} </a> </div> </div> <div class="segment-and">{{ 'SegmentEditor_OperatorAND'|translate }}</div> <div class="segment-add-row"><div> {% set andCondition %}<span>{{ 'SegmentEditor_OperatorAND'|translate }}</span>{% endset %} - <a href="#">+ {{ 'SegmentEditor_AddANDorORCondition'|translate(andCondition) }}</a> + <a href="#">+ {{ 'SegmentEditor_AddANDorORCondition'|translate(andCondition)|raw }}</a> </div> </div> <div style="position: absolute; z-index:999; width:1040px;" class="segment-element"> @@ -148,6 +148,6 @@ </div> <script type="text/javascript"> -var availableSegments = {{ savedSegmentsJson }}; -var segmentTranslations = {{ segmentTranslations }}; +var availableSegments = {{ savedSegmentsJson|raw }}; +var segmentTranslations = {{ segmentTranslations|raw }}; </script> |