Show clearer error message on WikiCloth exception
This commit is contained in:
parent
42e983f7ee
commit
3bf1392251
3 changed files with 4 additions and 4 deletions
|
@ -1167,7 +1167,7 @@ de:
|
|||
title_list: Seiten-Liste
|
||||
body:
|
||||
title_toc: Inhalt
|
||||
wikicloth_exception: Entschuldigung, ein Fehler ist aufgetreten. Möglicherweise ist ein ungewöhnlicher Text die Ursache. Bearbeiten der Seite kann helfen, diesen Fehler zu beseitigen.
|
||||
wikicloth_exception: "Entschuldigung, ein Fehler ist beim Anzeigen der Wikiseite aufgetreten: »%{msg}«. Bearbeiten der Seite kann helfen, diesen Fehler zu beseitigen."
|
||||
create:
|
||||
notice: Seite wurde angelegt
|
||||
cshow:
|
||||
|
|
|
@ -1171,7 +1171,7 @@ en:
|
|||
title_list: List of pages
|
||||
body:
|
||||
title_toc: Content
|
||||
wikicloth_exception: 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.
|
||||
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:
|
||||
notice: Page was created
|
||||
cshow:
|
||||
|
|
|
@ -4,8 +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
|
||||
"<span class='alert alert-error'>#{t '.wikicloth_exception'}</span>".html_safe # try the following with line breaks: === one === == two == = three =
|
||||
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
|
||||
|
||||
def link_to_wikipage(page, text = nil)
|
||||
|
|
Loading…
Reference in a new issue