diff --git a/public/img/flags/en.svg b/public/img/flags/en.svg
new file mode 100644
index 0000000..d98b6cc
--- /dev/null
+++ b/public/img/flags/en.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icon-css-gb" viewBox="0 0 640 480">
+  <defs>
+    <clipPath id="a">
+      <path fill-opacity=".7" d="M-85.3 0h682.6v512H-85.3z"/>
+    </clipPath>
+  </defs>
+  <g clip-path="url(#a)" transform="translate(80) scale(.94)">
+    <g stroke-width="1pt">
+      <path fill="#012169" d="M-256 0H768v512H-256z"/>
+      <path fill="#fff" d="M-256 0v57.2L653.5 512H768v-57.2L-141.5 0H-256zM768 0v57.2L-141.5 512H-256v-57.2L653.5 0H768z"/>
+      <path fill="#fff" d="M170.7 0v512h170.6V0H170.7zM-256 170.7v170.6H768V170.7H-256z"/>
+      <path fill="#c8102e" d="M-256 204.8v102.4H768V204.8H-256zM204.8 0v512h102.4V0H204.8zM-256 512L85.3 341.3h76.4L-179.7 512H-256zm0-512L85.3 170.7H9L-256 38.2V0zm606.4 170.7L691.7 0H768L426.7 170.7h-76.3zM768 512L426.7 341.3H503l265 132.5V512z"/>
+    </g>
+  </g>
+</svg>
diff --git a/public/img/flags/fr.svg b/public/img/flags/fr.svg
new file mode 100644
index 0000000..712c8a5
--- /dev/null
+++ b/public/img/flags/fr.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icon-css-fr" viewBox="0 0 640 480">
+  <g fill-rule="evenodd" stroke-width="1pt">
+    <path fill="#fff" d="M0 0h640v480H0z"/>
+    <path fill="#00267f" d="M0 0h213.3v480H0z"/>
+    <path fill="#f31830" d="M426.7 0H640v480H426.7z"/>
+  </g>
+</svg>
diff --git a/src/Controller/FediPlanController.php b/src/Controller/FediPlanController.php
index d30e9d9..633fe88 100644
--- a/src/Controller/FediPlanController.php
+++ b/src/Controller/FediPlanController.php
@@ -28,7 +28,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
 /**
- * @Route("/{_locale}", defaults={"_locale":"en"})
+ * @Route("/{_locale}", defaults={"_locale":"en"}, requirements={"_locale": "en|fr"})
  */
 class FediPlanController extends AbstractController
 {
@@ -41,7 +41,8 @@ class FediPlanController extends AbstractController
     {
 
         if ($authorizationChecker->isGranted('IS_AUTHENTICATED_FULLY')){
-            return $this->redirect($this->generateUrl('schedule'));
+            $local = $request->getSession()->get('_locale');
+            return $this->redirect($this->generateUrl('schedule',['_locale' => $local]));
         }
         $client = new Client();
         $flow->bind($client);
diff --git a/templates/fediplan/schedule.html.twig b/templates/fediplan/schedule.html.twig
index 1b10e76..384f8ff 100644
--- a/templates/fediplan/schedule.html.twig
+++ b/templates/fediplan/schedule.html.twig
@@ -169,7 +169,7 @@
                         <!-- The fileinput-button span is used to style the file input field as button -->
                         <span class="btn btn-success fileinput-button">
               <i class="glyphicon glyphicon-plus"></i>
-              <span>Add files...</span>
+              <span>{{ 'page.schedule.form.add_files'|trans }}</span>
               <input type="file" name="file"  />
             </span>
                         <button type="submit" class="btn btn-primary start">
diff --git a/templates/nav.html.twig b/templates/nav.html.twig
index 3eb8de4..88b3ba2 100644
--- a/templates/nav.html.twig
+++ b/templates/nav.html.twig
@@ -32,6 +32,16 @@
                 <li class="nav-item">
                     <a class="nav-link" href="https://fedilab.app/page/donations/" tabindex="-1" >{{ 'common.support_my_work'|trans }}</a>
                 </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
+                        {% set flagLink = "img/flags/"~app.request.locale~".svg" %}
+                        <img src="{{ asset(flagLink) }}" alt="language">
+                    </a>
+                    <div class="dropdown-menu">
+                        <a class="dropdown-item" href="{{ path(app.request.attributes.get('_route'), {'_locale':'en' }) }}">English</a>
+                        <a class="dropdown-item"  href="{{ path(app.request.attributes.get('_route'), {'_locale':'fr' }) }}">Français</a>
+                    </div>
+                </li>
             </ul>
         </div>
     </nav>
diff --git a/translations/fediplan.en.yaml b/translations/fediplan.en.yaml
index 4cd794e..4c98f44 100644
--- a/translations/fediplan.en.yaml
+++ b/translations/fediplan.en.yaml
@@ -67,4 +67,5 @@ page:
       sensitive: Sensitive
       scheduled_at: Scheduled at
       send: Send
+      add_files: Add files...