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

Show clearer error message on WikiCloth exception

Browse source
This commit is contained in:
Julius 2013-12-22 23:34:54 +01:00
parent 42e983f7ee
commit 3bf1392251
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/locales/de.yml
View file

@ -1167,7 +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 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: create:
notice: Seite wurde angelegt notice: Seite wurde angelegt
cshow: cshow:

2
config/locales/en.yml
View file

@ -1171,7 +1171,7 @@ en:
title_list: List of pages title_list: List of pages
body: body:
title_toc: Content 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: create:
notice: Page was created notice: Page was created
cshow: cshow:

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

@ -4,8 +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 rescue => e
"<span class='alert alert-error'>#{t '.wikicloth_exception'}</span>".html_safe # try the following with line breaks: === one === == two == = three = "<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)