Rescue on WikiCloth exception

This commit is contained in:
Julius 2013-12-22 12:17:02 +01:00
parent df9cff0eee
commit 496a250495
3 changed files with 4 additions and 0 deletions

View file

@ -1167,6 +1167,7 @@ de:
title_list: Seiten-Liste
body:
title_toc: Inhalt
wikicloth_exception: <span class="alert alert-error">Entschuldigung, ein Fehler ist aufgetreten. Möglicherweise ist ein ungewöhnlicher Text die Ursache. Bearbeiten der Seite kann helfen, diesen Fehler zu beseitigen.</span>
create:
notice: Seite wurde angelegt
cshow:

View file

@ -1171,6 +1171,7 @@ en:
title_list: List of pages
body:
title_toc: Content
wikicloth_exception: <span class="alert alert-error">An error occured. Sorry for that. It might be that the wiki syntax has been used in an unusual way. Please try to edit the page to get rid of this error.</span>
create:
notice: Page was created
cshow:

View file

@ -4,6 +4,8 @@ module PagesHelper
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
rescue
t('.wikicloth_exception').html_safe # try the following with line breaks: === one === == two == = three =
end
def link_to_wikipage(page, text = nil)