Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge pull request #230 from foodcoop-rostock/workaround-possible-wikicloth-bug

Browse source 
Rescue on WikiCloth exception
This commit is contained in:
wvengen 2013-12-23 01:51:27 -08:00
commit d7f624a089
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/locales/de.yml
View file

@ -1167,6 +1167,7 @@ de:
title_list: Seiten-Liste title_list: Seiten-Liste
body: body:
title_toc: Inhalt title_toc: Inhalt
wikicloth_exception: "Entschuldigung, ein Fehler ist beim Anzeigen der Wikiseite aufgetreten: »%{msg}«. Bearbeiten der Seite kann helfen, diesen Fehler zu beseitigen."
create: create:
notice: Seite wurde angelegt notice: Seite wurde angelegt
cshow: cshow:

1
config/locales/en.yml
View file

@ -1171,6 +1171,7 @@ en:
title_list: List of pages title_list: List of pages
body: body:
title_toc: Content title_toc: Content
wikicloth_exception: "I'm sorry to report that an error occured when interpreting the wiki page: %{msg}. Please try to fix it, and save the page again."
create: create:
notice: Page was created notice: Page was created
cshow: cshow:

2
lib/foodsoft_wiki/app/helpers/pages_helper.rb
View file

@ -4,6 +4,8 @@ module PagesHelper
def wikified_body(body, title = nil) def wikified_body(body, title = nil)
render_opts = {:locale => I18n.locale} # workaround for wikicloth 0.8.0 https://github.com/nricciar/wikicloth/pull/59 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(render_opts).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 end
def link_to_wikipage(page, text = nil) def link_to_wikipage(page, text = nil)