Add default_locale and translator fallbacks locales

[airbundle] / Resources / views / body.html.twig

diff --git a/Resources/views/body.html.twig b/Resources/views/body.html.twig
index fbfefbe12091d70eb3173f634982c8f22737bade..f551bc999803b9856511796e9e3ca8a92f61199e 100644 (file)
--- a/Resources/views/body.html.twig
+++ b/Resources/views/body.html.twig
@@ -22,14 +22,18 @@
                {% endif %}
        {% endfor %}
        {# stylesheet '//fonts.googleapis.com/css?family=Irish+Grover' '//fonts.googleapis.com/css?family=La+Belle+Aurore' '@RapsysAirBundle/Resources/public/css/{reset,screen}.css' #}
                {% endif %}
        {% endfor %}
        {# stylesheet '//fonts.googleapis.com/css?family=Irish+Grover' '//fonts.googleapis.com/css?family=La+Belle+Aurore' '@RapsysAirBundle/Resources/public/css/{reset,screen}.css' #}

-       {% stylesheet '@rapsys_air_bundle/css/{reset,droidsans,screen}.css' %}
-               <link rel="stylesheet" type="text/css" href="{{ asset_url }}" />
-       {% endstylesheet %}
+       {% stopwatch 'stylesheet' %}
+               {% stylesheet '@rapsys_air_bundle/css/{reset,droidsans,screen}.css' %}
+                       <link rel="stylesheet" type="text/css" href="{{ asset_url }}" />
+               {% endstylesheet %}
+       {% endstopwatch %}

 {% endblock %}
 {% block javascripts %}
 {% endblock %}
 {% block javascripts %}

-       {#{% javascript '@RapsysAir/js/*.js' %}
-               <script type="text/javascript" src="{{ asset_url }}"></script>
-       {% endjavascript %}#}
+       {% stopwatch 'javascript' %}
+               {#{% javascript '@RapsysAir/js/*.js' %}
+                       <script type="text/javascript" src="{{ asset_url }}"></script>
+               {% endjavascript %}#}
+       {% endstopwatch %}

 {% endblock %}
 {% block title %}{{ title }}{% endblock %}
 {% block body %}
 {% endblock %}
 {% block title %}{{ title }}{% endblock %}
 {% block body %}


@@ -42,7 +46,7 @@
                                        <a href="{{ path('rapsys_air_location') }}">{% trans %}Locations{% endtrans %}</a>
                                        <a href="{{ path('rapsys_air_user') }}">{% trans %}Users{% endtrans %}</a>
                                        <a href="{{ path('rapsys_air_contact') }}">{% trans %}Contact{% endtrans %}</a>
                                        <a href="{{ path('rapsys_air_location') }}">{% trans %}Locations{% endtrans %}</a>
                                        <a href="{{ path('rapsys_air_user') }}">{% trans %}Users{% endtrans %}</a>
                                        <a href="{{ path('rapsys_air_contact') }}">{% trans %}Contact{% endtrans %}</a>

-                                       <a href="{{ path('rapsys_air_policy') }}">{% trans %}Policy{% endtrans %}</a>
+                                       <a href="{{ path('rapsys_air_regulation') }}">{% trans %}Regulation{% endtrans %}</a>

                                        {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
                                                <a href="{{ path('rapsys_user_logout') }}">{% trans %}Logout{% endtrans %}</a>
                                        {% else %}
                                        {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
                                                <a href="{{ path('rapsys_user_logout') }}">{% trans %}Logout{% endtrans %}</a>
                                        {% else %}