Skip to content

Commit

Permalink
i18n for standard error message
Browse files Browse the repository at this point in the history
  • Loading branch information
fschwahn committed Nov 16, 2011
1 parent db7bd7c commit 66e7526
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
en:
errship:
standard: 'An unknown error has occurred, or you have reached this page by mistake.'
'404':
title: 'This page does not exist.'
description: 'It could have moved, or someone (maybe you!) mistyped the URL.'
Expand Down
2 changes: 1 addition & 1 deletion lib/errship.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def render_404_error(exception = nil, errship_scope = false)
# A blank page with just the layout and flash message, which can be redirected to when
# all else fails.
def errship_standard(errship_scope = false)
flash[:error] ||= 'An unknown error has occurred, or you have reached this page by mistake.'
flash[:error] ||= I18n.t('errship.standard')
render :template => '/errship/standard.html.erb',
:layout => 'application',
:locals => { :status_code => 500, :errship_scope => errship_scope },
Expand Down

0 comments on commit 66e7526

Please sign in to comment.