From 8e04074cd3db24c934f274b0a97fb8ffcdad8232 Mon Sep 17 00:00:00 2001
From: Benjamin Meichsner <benjamin.meichsner@aboutsource.net>
Date: Tue, 23 Sep 2014 19:04:23 +0200
Subject: [PATCH] Fixed I18n.locale bu in wiki page.

---
 lib/foodsoft_wiki/app/helpers/pages_helper.rb | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/foodsoft_wiki/app/helpers/pages_helper.rb b/lib/foodsoft_wiki/app/helpers/pages_helper.rb
index 1f7605e5..6f93837e 100644
--- a/lib/foodsoft_wiki/app/helpers/pages_helper.rb
+++ b/lib/foodsoft_wiki/app/helpers/pages_helper.rb
@@ -6,8 +6,11 @@ module PagesHelper
   end
 
   def wikified_body(body, title = nil)
-    render_opts = {:locale => I18n.locale} # workaround for wikicloth 0.8.0 https://github.com/nricciar/wikicloth/pull/59
-    WikiCloth.new({:data => body+"\n", :link_handler => Wikilink.new, :params => {:referer => title}}).to_html(render_opts).html_safe
+    WikiCloth.new(:data => body+"\n",
+                  :link_handler => Wikilink.new,
+                  :params => {:referer => title})
+                  .to_html(wikicloth_render_options)
+                  .html_safe
   rescue => e
     "<span class='alert alert-error'>#{t('.wikicloth_exception', :msg => e)}</span>".html_safe # try the following with line breaks: === one === == two == = three =
   end
@@ -44,11 +47,12 @@ module PagesHelper
 
       toc << "*" * number + " #{name}\n"
     end
-    logger.debug toc.inspect
-    unless toc.blank?
-      toc = WikiCloth.new({:data => toc, :link_handler => Wikilink.new}).to_html
 
-      toc.gsub(/<li>([^<>\n]*)/) do
+    unless toc.blank?
+      WikiCloth.new(:data => toc,
+                    :link_handler => Wikilink.new)
+                    .to_html(wikicloth_render_options)
+                    .gsub(/<li>([^<>\n]*)/) do
         name = $1
         anchor = name.gsub(/\s/, '_').gsub(/[^a-zA-Z_]/, '')
         "<li><a href='##{anchor}'>#{name.truncate(20)}</a>"
@@ -69,4 +73,10 @@ module PagesHelper
     token = TokenVerifier.new(['wiki', 'all']).generate
     all_pages_url({:format => 'rss', :token => token}.merge(options))
   end
+
+  private
+
+  def wikicloth_render_options
+    {:locale => I18n.locale} # workaround for wikicloth 0.8.0 https://github.com/nricciar/wikicloth/pull/59
+  end
 end