From 6ab92ddbac84f87dc598016de45845a26818dd52 Mon Sep 17 00:00:00 2001 From: Alexis Metaireau Date: Mon, 3 Sep 2018 20:54:07 +0200 Subject: [PATCH] Add a handler when pages aren't found. (#379) Fixes #356 --- ihatemoney/messages.pot | 6 +++++ ihatemoney/run.py | 9 +++++-- ihatemoney/templates/404.html | 13 +++++++++++ ihatemoney/templates/layout.html | 22 +++++++++--------- .../translations/fr/LC_MESSAGES/messages.mo | Bin 9909 -> 10180 bytes .../translations/fr/LC_MESSAGES/messages.po | 11 ++++++--- 6 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 ihatemoney/templates/404.html diff --git a/ihatemoney/messages.pot b/ihatemoney/messages.pot index bc8a8f39..bd4dcc49 100644 --- a/ihatemoney/messages.pot +++ b/ihatemoney/messages.pot @@ -182,6 +182,12 @@ msgstr "" msgid "The bill has been modified" msgstr "" +msgid "Sorry, we were unable to find the page you've asked for." +msgstr "" + +msgid "The best thing to do is probably to get back to the main page." +msgstr "" + msgid "Back to the list" msgstr "" diff --git a/ihatemoney/run.py b/ihatemoney/run.py index 1a5ac17e..e9b3ce16 100644 --- a/ihatemoney/run.py +++ b/ihatemoney/run.py @@ -2,7 +2,7 @@ import os import os.path import warnings -from flask import Flask, g, request, session +from flask import Flask, g, request, session, render_template from flask_babel import Babel from flask_mail import Mail from flask_migrate import Migrate, upgrade, stamp @@ -102,6 +102,10 @@ def validate_configuration(app): ) +def page_not_found(e): + return render_template('404.html', root="main"), 404 + + def create_app(configuration=None, instance_path='/etc/ihatemoney', instance_relative_config=True): app = Flask( @@ -121,8 +125,9 @@ def create_app(configuration=None, instance_path='/etc/ihatemoney', validate_configuration(app) app.register_blueprint(web_interface) app.register_blueprint(api) + app.register_error_handler(404, page_not_found) - # Configure the application + # Configure the a, root="main"pplication setup_database(app) mail = Mail() diff --git a/ihatemoney/templates/404.html b/ihatemoney/templates/404.html new file mode 100644 index 00000000..7e282c2e --- /dev/null +++ b/ihatemoney/templates/404.html @@ -0,0 +1,13 @@ +{% extends "layout.html" %} + +{% block body %} + +
+
+ {{ _("The best thing to do is probably to get back to the main page.")}} +
+{% endblock %} diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html index cb36a6fe..3523ef7b 100644 --- a/ihatemoney/templates/layout.html +++ b/ihatemoney/templates/layout.html @@ -32,13 +32,13 @@ diff --git a/ihatemoney/translations/fr/LC_MESSAGES/messages.mo b/ihatemoney/translations/fr/LC_MESSAGES/messages.mo index 3fa8d8f4c52f34ffbdb3e90d8579f61864b1ce5a..ab8a831618f68d3f7c23b560196812096c4c9bb8 100644 GIT binary patch delta 2505 zcmYM!e@sg$HTLH_gj-=3kjO7Iq@VIENzU=e0xEpo{;qiWcS zBCic0M**}z3bzs`_G{&{Tfy2 zWn73qqT<~0%pxmwpa@mq1E@|kq02qy2?lC;09APqb>2nY_%bTMFsgN@QA=_bmFPuO zLO-CMyMfv>K5o_$Ek$*%5(}{gYq2$x^&esIDkqd#HDxMrJu2`P)Prq!7uu-S4d8kl z!9{olHR0c=R_Bnlg%voBTd)ypXiFUX@ge*HDwp$W?YFeRK>?otsTR)IDzWO z4OF6jzL?W2#vraj?Tw>o;VAMkU-G5STt^l37v|$Fmw_tJr%!SPYSWc^R-x8-J>G{K zu>qe(y>_Qj1^kYhcpe*o?wfK{2kTLBn{XLEf{MS}yY9vqC?gj&(TkpkP@Cw8cYOr4 zM-oWR<|Jx@k5B>6qbmFgwfm>N^Rsh}+3#Z?pb~t8Y*ok@(qY&9%0NF9nJjP$Y2!+ltd2~=w@p%P3Xx+=*=b#Mc!kS5gT+JTDu4C?toRA)a#C3*o} zJ@6d^weBC(8m6*S7@929gcV59<}obCZd3(tqAEX*N@xrf=M1Vd=TM!yikk2@REPa! zrv!8J=|9DqYL3*RM^Tk;NA2ov{b5?F~^ign)kjmQ$;W11N#KnH4qFlz1kP@C-~@AyEUlWc* z`pc}R96k}piihm>pku|tR%cfzV8wPh)*gGOWA%sQCB2SiN4uSX)ftXdBx^HseYH+B z#ywr3oq8e=wz{I$o=CWz82vi4(}`K_c1O3y3e{tGg>J`7Zkm5IZFX&WWwo_tZC%ys zh{NmC2jA;q-N0c+?7!P9z-f4TlJBN3EbelhWR}WA*9=yVn`8 z0#1(|3QQ&{lHK`pe6^2oY9`HXw0#cu9u(F=VqB@;4_$l zH5kMdn1e4lH{u*K-`=4ymK&d7E`EWU;5??`Wt@OlPyyb;bo>YNF@@R3V{D#`>65hPnZ>BHm0(^#b|KP;;2AskU8xYoQWGyrG4Ms??OF)7M1BYs7x>5 zMEnUg&n@Q=ssbrQrvyDzC8Fqa&lb{9$*WPB*P{B@qaJKTO|T19x=z%VoJIwD9u?4! zsBza(XXZ9)i-u8|=Q6kmL--k1=CJ>YsGkl^cn3A%U#I~A(k{eIRLP1kgv(J2)T2tf z13m1(K|F_5_%YEp<86EnU#2V?--S`^&7=Mi8vS%A!!e|q4xA7R^sQl81JH9v+2}R z8N7yCxEZOgwWBI`9JN3XPQ@=#^IvuM`%wW6qSo<$ca0?K&^&Yx1UX4M6M4wmHVL&r zDQdz+s0^2)PWx)tzXjU@W;;;<{#P)XNSLTq;kBs03tO>9?|%yos%IBb3to5jqZS@O zZNWpFf>|7hB^W_H-+-)TO{mQGptf)y&clOPhTo%}Pa+>1<|~)=EuWL5J&oYV9}ZMW z<5-N#P?dQbwNM+9lzrs-&!QH-h{~`J^)?KkD)s>peh?BDkV^fdVVFU5*u;k{cohf z$F}pO1v`*n?Q1N>Yp4tYoG4|Ui3%u;ny3s_nT4pztwJrh4z+bnr~uzXai?ib>Kn*Rur zll6xE(HmFk7^EYK%khTCJC2be4j7(7MV?K0bf`)&ifd6NZAI<%QG5ZrQJE)Ehd7mg z1gcmeZpIRvg`GYP?fGR?WPc)Wpyd+24pjs_oQ>LoT2zK>P^DgnT4)pM`4+6gR$PkT zVKt^jMiW?pC0sY4D(HVeLlJhOUYj1&Av=dUOoONghurleR3I6ouRwB80TiINpxE^< zKyB$_)c6-s^VgxabQ5y6#@aU5aWb0d%)F46IFyqgNZcFuVR|rDS|0P}m&X@WB>aL2 nft1+XibQ+pt&BufI2Z`l)_bqlZ+N$POT(d0LlYC-o|o}I;g8pC diff --git a/ihatemoney/translations/fr/LC_MESSAGES/messages.po b/ihatemoney/translations/fr/LC_MESSAGES/messages.po index ccab28b1..b3e2fdbe 100644 --- a/ihatemoney/translations/fr/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/fr/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-07-16 23:26+0200\n" +"POT-Creation-Date: 2018-08-05 23:41+0200\n" "PO-Revision-Date: 2018-05-15 22:00+0200\n" "Last-Translator: Adrien CLERC <>\n" "Language: fr\n" @@ -16,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.5.3\n" +"Generated-By: Babel 2.6.0\n" msgid "Project name" msgstr "Nom de projet" @@ -210,6 +210,12 @@ msgstr "La facture a été supprimée" msgid "The bill has been modified" msgstr "La facture a été modifiée" +msgid "Sorry, we were unable to find the page you've asked for." +msgstr "Navré, nous ne trouvons pas la page que vous avez demandé." + +msgid "The best thing to do is probably to get back to the main page." +msgstr "Votre meilleure piste est probablement la page d'accueil." + msgid "Back to the list" msgstr "Retourner à la liste" @@ -488,4 +494,3 @@ msgstr "Solde" #~ msgid "Invite" #~ msgstr "Invitez" -