From 3ebdab23a9cb320f15f32a13592ed3190570af22 Mon Sep 17 00:00:00 2001
From: Xavier J <xjulien@octo.com>
Date: Wed, 24 Aug 2016 15:32:41 +0200
Subject: [PATCH] Enable french local on rich textarea

---
 app/assets/javascripts/bootstrap_wysihtml5.js | 2 +-
 app/assets/stylesheets/application.scss       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/bootstrap_wysihtml5.js b/app/assets/javascripts/bootstrap_wysihtml5.js
index 479404c3c..4f1ed7bcf 100644
--- a/app/assets/javascripts/bootstrap_wysihtml5.js
+++ b/app/assets/javascripts/bootstrap_wysihtml5.js
@@ -3,6 +3,6 @@ $(document).on('page:load', wysihtml5_active);
 
 function wysihtml5_active (){
     $('.wysihtml5').each(function(i, elem) {
-        $(elem).wysihtml5({ toolbar:{ "fa": true, "link": false } });
+        $(elem).wysihtml5({ toolbar:{ "fa": true, "link": false, "color": true }, "locale": "fr-FR" });
     });
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 8f625624f..cb7b0123c 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -18,10 +18,10 @@
  *= require leaflet
  *= require font-awesome
  *= require franceconnect
+ *= require bootstrap-wysihtml5
  */
 @import "bootstrap-sprockets";
 @import "bootstrap";
-@import "bootstrap-wysihtml5/bootstrap3-wysihtml5";
 
 body {
   background-color: rgb(255, 255, 255);