From 79814f9ce58acdb777d8bc0ce58ce96e200f6caa Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sun, 1 Feb 2015 21:47:10 +0100 Subject: [PATCH] Add exception template And fix not_found rendering --- lib/Vroom/I18N/en.pm | 5 ++--- lib/Vroom/I18N/fr.pm | 4 ++-- templates/default/exception.html.ep | 4 ++++ templates/default/not_found.html.ep | 6 +++--- 4 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 templates/default/exception.html.ep diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm index 4e6335b..62be7f0 100644 --- a/lib/Vroom/I18N/en.pm +++ b/lib/Vroom/I18N/en.pm @@ -326,9 +326,8 @@ our %Lexicon = ( "ABOUT_THANKS" => "VROOM uses the following components, so, thanks to their respective authors :-)", "ABOUT_MUSICS" => "Also thanks to the authors of songs used", "FROM_AUTHOR" => "from", - "PAGE_NOT_FOUND" => "This page does not exist" - - + "PAGE_NOT_FOUND" => "This page does not exist", + "SERVER_ERROR" => "Sorry for the inconvinience" ); 1; diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm index bd90843..d6b6b4e 100644 --- a/lib/Vroom/I18N/fr.pm +++ b/lib/Vroom/I18N/fr.pm @@ -358,8 +358,8 @@ our %Lexicon = ( "ABOUT_THANKS" => "VROOM utilise les composants suivants, merci donc aux auteurs respectifs :-)", "ABOUT_MUSICS" => "Merci également aux auteurs des morceaux de musique utilisés", "FROM_AUTHOR" => "de", - "PAGE_NOT_FOUND" => "Cette page n'existe pas" - + "PAGE_NOT_FOUND" => "Cette page n'existe pas", + "SERVER_ERROR" => "Veuille nous excuser" ); 1; diff --git a/templates/default/exception.html.ep b/templates/default/exception.html.ep new file mode 100644 index 0000000..617c76e --- /dev/null +++ b/templates/default/exception.html.ep @@ -0,0 +1,4 @@ +% stash msg => $self->l('SERVER_ERROR'); +% stash err => 'server_error'; +% stash room => ''; +%=include 'error' diff --git a/templates/default/not_found.html.ep b/templates/default/not_found.html.ep index 44fcf16..e5722d3 100644 --- a/templates/default/not_found.html.ep +++ b/templates/default/not_found.html.ep @@ -1,4 +1,4 @@ -%= stash msg => $self->l('PAGE_NOT_FOUND') -%= stash err => 'not_found' -%= stash room => '' +% stash msg => $self->l('PAGE_NOT_FOUND'); +% stash err => 'not_found'; +% stash room => ''; %=include 'error'