diff options
| author | elijah <elijah@riseup.net> | 2013-10-28 18:44:21 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-10-28 18:44:21 -0700 |
| commit | f691ad87516043aaf7a5f1f55f82d4c1713be7a4 (patch) | |
| tree | d287db8f8adf9df32bcf07c3a21bae2fd3379c0e /app | |
| parent | 25e8050ed8f9c627493b51f8e9c9a730c71ddcd4 (diff) | |
fixed numerous bugs relating to localization
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/pages_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/errors/error.html.haml | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a9a25f0..ee53415 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -47,7 +47,8 @@ class ApplicationController < ActionController::Base ## RENDERING ## - def render_500 + def render_500(msg=nil) + @message = msg render :template => 'errors/error', :status => 500 end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 3e76092..933aed7 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -5,6 +5,9 @@ class PagesController < ApplicationController layout :choose_layout rescue_from ActionView::MissingTemplate, :with => :render_404 rescue_from PageNotFound, :with => :render_404 + rescue_from Encoding::CompatibilityError do |exception| + render_500(exception.to_s) + end def show @page = site.find_pages(params[:page]) diff --git a/app/views/errors/error.html.haml b/app/views/errors/error.html.haml index 7f16eb5..45948ef 100644 --- a/app/views/errors/error.html.haml +++ b/app/views/errors/error.html.haml @@ -1,3 +1,6 @@ .dialog %h1 - We're sorry, but something went wrong.
\ No newline at end of file + We're sorry, but something went wrong. + %blockquote + - if @message + = h @message
\ No newline at end of file |