Browse Source

Add locale

jmontoyaa 8 years ago
parent
commit
fd11130275

+ 10 - 10
main/template/rainbow/layout/menu.tpl

@@ -12,7 +12,7 @@
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="menuone">
             <ul class="nav navbar-nav">
-                
+
                 {% if _u.logged == 1 %}
                     {% for items in menu %}
                         {% if items.key != 'profile' and items.key != 'dashboard' and items.key != 'admin' and items.key != 'agenda' %}
@@ -21,16 +21,16 @@
                         {% endif %}
                     {% endfor %}
                 {% endif %}
-                {% if _u.logged == 1 %}    
-                    <li class="item-menu menu-5"><a href="{{ _p.web }}web/app_dev.php/faq">{{ "FAQ"|get_lang }}</a></li>
+                {% if _u.logged == 1 %}
+                    <li class="item-menu menu-5"><a href="{{ _p.web }}web/app_dev.php/faq?_locale={{ document_language }}">{{ "FAQ"|get_lang }}</a></li>
                 {% endif %}
-                   
+
                 {% if _u.logged == 0 %}
                     <li class="item-menu menu-1"><a href="{{ _p.web }}">{{ "CampusHomepage"|get_lang }}</a></li>
-                    <li class="item-menu menu-2"><a href="{{ _p.web }}web/app_dev.php/faq">{{ "FAQ"|get_lang }}</a></li>
+                    <li class="item-menu menu-2"><a href="{{ _p.web }}web/app_dev.php/faq?_locale={{ document_language }}">{{ "FAQ"|get_lang }}</a></li>
                     <li class="item-menu menu-3"><a href="{{ _p.web }}main/auth/inscription.php">{{ "Subscription"|get_lang }}</a></li>
                     <li class="item-menu menu-4"><a href="#">{{ "Demo"|get_lang }}</a></li>
-                    <li class="item-menu menu-5"><a href="{{ _p.web }}web/app_dev.php/contact">{{ "Contact"|get_lang }}</a></li>
+                    <li class="item-menu menu-5"><a href="{{ _p.web }}web/app_dev.php/contact?_locale={{ document_language }}">{{ "Contact"|get_lang }}</a></li>
                 {% endif %}
             </ul>
            {% if _u.logged == 1 %}
@@ -38,7 +38,7 @@
                {% if user_notifications is not null %}
                <li><a href="{{ message_url }}">{{ user_notifications }}</a></li>
                {% endif %}
-               
+
                {% if _u.status != 6 %}
                 <li class="dropdown avatar-user">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
@@ -53,7 +53,7 @@
                             </div>
                         </li>
                         <li role="separator" class="divider"></li>
-                        
+
                         <li class="user-body">
                             <a href="{{ _p.web }}main/admin">
                                 <em class="fa fa-cog" aria-hidden="true"></em>
@@ -75,8 +75,8 @@
                         </li>
                     </ul>
                 </li>
-               
-               
+
+
                {% endif %}
             </ul>
             {% endif %}

+ 4 - 0
src/Chamilo/ContactBundle/Controller/ContactController.php

@@ -29,6 +29,10 @@ class ContactController extends Controller
      */
     public function indexAction(Request $request)
     {
+        $locale = $request->get('_locale');
+        $translator = $this->get('translator');
+        $translator->setLocale($locale);
+
         $type = new ContactType();
         /** @var User $user */
         $user = $this->getUser();

+ 4 - 2
src/Chamilo/CoreBundle/Menu/NavBuilder.php

@@ -57,6 +57,7 @@ class NavBuilder extends ContainerAware
     {
         $checker = $this->container->get('security.authorization_checker');
         $translator = $this->container->get('translator');
+        $locale = $this->container->get('request')->getLocale();
 
         $menu = $factory->createItem('root');
         $menu->setChildrenAttribute('class', 'nav navbar-nav');
@@ -122,6 +123,7 @@ class NavBuilder extends ContainerAware
                 'FAQ',
                 [
                     'route' => 'faq_index',
+                    'routeParameters' => ['_locale' => $locale]
                 ]
             )->setAttribute('class', 'item-menu menu-5');
 
@@ -141,7 +143,6 @@ class NavBuilder extends ContainerAware
         }
 
         if (!$checker->isGranted('IS_AUTHENTICATED_FULLY')) {
-
             $menu->addChild(
                 $translator->trans('Subscription'),
                 array(
@@ -165,7 +166,8 @@ class NavBuilder extends ContainerAware
             $menu->addChild(
                 $translator->trans('Contact'),
                 array(
-                    'route' => 'contact'
+                    'route' => 'contact',
+                    'routeParameters' => ['_locale' => $locale]
                 )
             )->setAttribute('class', 'item-menu menu-5');
         }

+ 6 - 1
src/Chamilo/FaqBundle/Controller/FaqController.php

@@ -8,6 +8,7 @@ use Chamilo\FaqBundle\Entity\QuestionRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Chamilo\FaqBundle\Entity\Category;
 use Chamilo\FaqBundle\Entity\Question;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Class FaqController
@@ -26,8 +27,12 @@ class FaqController extends Controller
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function indexAction($categorySlug, $questionSlug)
+    public function indexAction($categorySlug, $questionSlug, Request $request)
     {
+        $locale = $request->get('_locale');
+        $translator = $this->get('translator');
+        $translator->setLocale($locale);
+
         if (!$categorySlug || !$questionSlug) {
             $redirect = $this->generateRedirectToDefaultSelection($categorySlug, $questionSlug);
             if ($redirect) {