explaination message in case of 404/410 errors for idx controller

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 7e0301539129575891f1c6ae7c3e1e26c3d82b7a..0207587bf89633f4ab6cf0461cf33091b91d6eff 100644 (file)
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -6,7 +6,6 @@ class ErrorController extends Zend_Controller_Action
 {
     protected function httpError($code) {
         $this->getResponse()->setHttpResponseCode($code);
-        $this->view->message = Zend_Http_Response::responseCodeAsText($code);
     }
 
     public function init() {

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 0817fe65c973250a0bc04d6bd5d81f8bcd6436aa..6ce7eb21f614e249472afe7fbc9a2dd019b274c0 100644 (file)
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -51,8 +51,10 @@ class IdxController extends Zend_Controller_Action
             $path = new Syj_Model_Path();
             if (!$pathMapper->findByUrl($url, $path)) {
                 if (is_numeric($url) and $pathMapper->hasexisted($url)) {
+                    $this->view->message = $this->view->translate("route has been deleted");
                     throw new Syj_Exception_NotFound('Gone', 410);
                 } else {
+                    $this->view->message = $this->view->translate("route does not exist");
                     throw new Syj_Exception_NotFound('Not Found', 404);
                 }
             }

diff --git a/application/languages/lang_en.po b/application/languages/lang_en.po
index 6e87cc996a4b214a25ed863d14cc34cd55f1ea00..1413a236f3b1f054268571a88df4339fcef5c1f8 100644 (file)
--- a/application/languages/lang_en.po
+++ b/application/languages/lang_en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: syj\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-15 15:04+0200\n"
+"POT-Creation-Date: 2010-08-15 16:32+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: arno <arno@renevier.net>\n"
 "Language-Team: arno <arno@renevier.net>\n"
@@ -18,15 +18,15 @@ msgstr ""
 "X-Poedit-Bookmarks: 5,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "X-Poedit-SearchPath-0: application\n"
 
-#: application/views/scripts/error/error.phtml:4
+#: application/views/scripts/error/error.phtml:5
 msgid "An error occurred"
 msgstr "An error occurred"
 
-#: application/views/scripts/error/error.phtml:26
+#: application/views/scripts/error/error.phtml:35
 msgid "Please try again later"
 msgstr "Please try again later"
 
-#: application/views/scripts/error/error.phtml:28
+#: application/views/scripts/error/error.phtml:37
 #: application/views/scripts/pending/password_cancel.phtml:15
 #: application/views/scripts/pending/creation_validate.phtml:15
 #: application/views/scripts/pending/creation_cancel.phtml:15
@@ -63,12 +63,12 @@ msgid "When you have finished a path, press \"save\", button."
 msgstr "When you have finished a path, press \"save\", button."
 
 #: application/views/scripts/idx/index.phtml:26
-#: application/controllers/IdxController.php:146
+#: application/controllers/IdxController.php:148
 msgid "duplicate"
 msgstr "duplicate"
 
 #: application/views/scripts/idx/index.phtml:28
-#: application/controllers/IdxController.php:144
+#: application/controllers/IdxController.php:146
 msgid "edit"
 msgstr "edit"
 
@@ -92,32 +92,32 @@ msgstr "create an account"
 msgid "Whith an account, you can manage and modify your routes"
 msgstr "Whith an account, you can manage and modify your routes"
 
-#: application/views/scripts/termsofuse/index.phtml:3
+#: application/views/scripts/termsofuse/index.phtml:5
 msgid "Show Your Journey is a site whose goal is to allow anyone to publish routes, for example, hiking itinerary, bicycle trip, travel itinerary or whatever."
 msgstr "Show Your Journey is a site whose goal is to allow anyone to publish routes, for example, hiking itinerary, bicycle trip, travel itinerary or whatever."
 
-#: application/views/scripts/termsofuse/index.phtml:7
+#: application/views/scripts/termsofuse/index.phtml:9
 msgid "In order to publish a route, you must first create an account. A valid email is asked for, and ip address of account creation is stored on the server. Those informations will not be divulged to anyone without the user explicit permission."
 msgstr "In order to publish a route, you must first create an account. A valid email is asked for, and ip address of account creation is stored on the server. Those informations will not be divulged to anyone without the user explicit permission."
 
-#: application/views/scripts/termsofuse/index.phtml:11
+#: application/views/scripts/termsofuse/index.phtml:13
 msgid "When you create a route, you accept that it's free for any use. This means you accept that anyone can reuse, reproduce, or republish your itinerary, or a modified version of it for any purpose. This also means you need to get appropriate permissions from the creator if you want to upload a route you didn't create yourself."
 msgstr "When you create a route, you accept that it's free for any use. This means you accept that anyone can reuse, reproduce, or republish your itinerary, or a modified version of it for any purpose. This also means you need to get appropriate permissions from the creator if you want to upload a route you didn't create yourself."
 
-#: application/views/scripts/termsofuse/index.phtml:15
+#: application/views/scripts/termsofuse/index.phtml:17
 msgid "Show Your Journey is not responsible for the accuracy of the routes published. It's the user responsibility to check that a route is accessible and safe."
 msgstr "Show Your Journey is not responsible for the accuracy of the routes published. It's the user responsibility to check that a route is accessible and safe."
 
-#: application/views/scripts/termsofuse/index.phtml:19
+#: application/views/scripts/termsofuse/index.phtml:21
 msgid "Show Your Journey service is provided \"as is\" with no guarantee for accuracy or accessibility."
 msgstr "Show Your Journey service is provided \"as is\" with no guarantee for accuracy or accessibility."
 
-#: application/views/scripts/termsofuse/index.phtml:23
+#: application/views/scripts/termsofuse/index.phtml:25
 msgid "Sources of the software running the website are <a href=\"http://dev.renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The map used to display the routes comes from <a href=\"http://www.openstreetmap.org/\">openstreetmap</a>."
 msgstr "Sources of the software running the website are <a href=\"http://dev.renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The map used to display the routes comes from <a href=\"http://www.openstreetmap.org/\">openstreetmap</a>."
 
 #: application/views/scripts/newpwd/success.phtml:4
-#: application/controllers/IdxController.php:137
+#: application/controllers/IdxController.php:139
 msgid "A link to reset your password has been emailed to you"
 msgstr "A link to reset your password has been emailed to you"
 
@@ -362,7 +362,7 @@ msgstr ""
 "Syj team"
 
 #: application/controllers/LoginController.php:100
-#: application/controllers/IdxController.php:127
+#: application/controllers/IdxController.php:129
 msgid "you must enter a login name"
 msgstr "you must enter a login name"
 
@@ -411,14 +411,14 @@ msgstr "Value is required and can't be empty"
 msgid "Invalid email"
 msgstr "Invalid email"
 
-#: application/controllers/ErrorController.php:56
+#: application/controllers/ErrorController.php:55
 msgid "Oups, something went wrong"
 msgstr "Oups, something went wrong"
 
-#: application/controllers/TermsofuseController.php:12
+#: application/controllers/TermsofuseController.php:10
 #: application/layouts/scripts/footer.phtml:87
-#: application/forms/Geom.php:24
-#: application/forms/User.php:43
+#: application/forms/Geom.php:25
+#: application/forms/User.php:44
 msgid "terms of use"
 msgstr "terms of use"
 
@@ -432,27 +432,27 @@ msgid "There is no undo. Delete this route definitively ?"
 msgstr "There is no undo. Delete this route definitively ?"
 
 #: application/controllers/ListController.php:36
-#: application/controllers/IdxController.php:124
+#: application/controllers/IdxController.php:126
 msgid "server could not be reached"
 msgstr "server could not be reached"
 
 #: application/controllers/ListController.php:37
-#: application/controllers/IdxController.php:121
+#: application/controllers/IdxController.php:123
 msgid "server did not understood request. That's probably caused by a bug in SYJ"
 msgstr "server did not understood request. That's probably caused by a bug in SYJ"
 
 #: application/controllers/ListController.php:38
-#: application/controllers/IdxController.php:122
+#: application/controllers/IdxController.php:124
 msgid "route not referenced on the server. It has probably been deleted."
 msgstr "route not referenced on the server. It has probably been deleted."
 
 #: application/controllers/ListController.php:39
-#: application/controllers/IdxController.php:125
+#: application/controllers/IdxController.php:127
 msgid "there was a server error"
 msgstr "there was a server error"
 
 #: application/controllers/ListController.php:40
-#: application/controllers/IdxController.php:126
+#: application/controllers/IdxController.php:128
 msgid "there was an unknown error"
 msgstr "there was an unknown error"
 
@@ -470,12 +470,12 @@ msgid "Wrong password"
 msgstr "Wrong password"
 
 #: application/controllers/AccountController.php:44
-#: application/controllers/IdxController.php:135
+#: application/controllers/IdxController.php:137
 msgid "an user is already registered with this email"
 msgstr "an user is already registered with this email"
 
 #: application/controllers/AccountController.php:72
-#: application/controllers/IdxController.php:131
+#: application/controllers/IdxController.php:133
 #: application/forms/Account.php:40
 msgid "Password do not match"
 msgstr "Password do not match"
@@ -492,77 +492,85 @@ msgid "You have made no change"
 msgstr "You have made no change"
 
 #: application/controllers/IdxController.php:32
-#: application/controllers/IdxController.php:82
+#: application/controllers/IdxController.php:84
 #, php-format
 msgid "route by <strong>%s</strong>"
 msgstr "route by <strong>%s</strong>"
 
-#: application/controllers/IdxController.php:114
-#: application/controllers/IdxController.php:140
+#: application/controllers/IdxController.php:54
+msgid "route has been deleted"
+msgstr "route has been deleted"
+
+#: application/controllers/IdxController.php:57
+msgid "route does not exist"
+msgstr "route does not exist"
+
+#: application/controllers/IdxController.php:116
+#: application/controllers/IdxController.php:142
 msgid "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 msgstr "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 
-#: application/controllers/IdxController.php:120
+#: application/controllers/IdxController.php:122
 msgid "save took place successfully"
 msgstr "save took place successfully"
 
-#: application/controllers/IdxController.php:123
+#: application/controllers/IdxController.php:125
 msgid "similar path seems to already exist. Please do not create two exactly identical paths"
 msgstr "similar path seems to already exist. Please do not create two exactly identical paths"
 
-#: application/controllers/IdxController.php:128
+#: application/controllers/IdxController.php:130
 msgid "Login correct"
 msgstr "Login correct"
 
-#: application/controllers/IdxController.php:129
+#: application/controllers/IdxController.php:131
 msgid "Wrong login/password"
 msgstr "Wrong login/password"
 
-#: application/controllers/IdxController.php:130
+#: application/controllers/IdxController.php:132
 msgid "you must enter a password"
 msgstr "you must enter a password"
 
-#: application/controllers/IdxController.php:132
+#: application/controllers/IdxController.php:134
 msgid "You must accept terms of use"
 msgstr "You must accept terms of use"
 
-#: application/controllers/IdxController.php:133
+#: application/controllers/IdxController.php:135
 msgid "you must enter an email"
 msgstr "you must enter an email"
 
-#: application/controllers/IdxController.php:134
+#: application/controllers/IdxController.php:136
 msgid "invalid email"
 msgstr "invalid email"
 
-#: application/controllers/IdxController.php:136
+#: application/controllers/IdxController.php:138
 msgid "Account created"
 msgstr "Account created"
 
-#: application/controllers/IdxController.php:138
+#: application/controllers/IdxController.php:140
 msgid "Now, you can retry to save"
 msgstr "Now, you can retry to save"
 
-#: application/controllers/IdxController.php:139
+#: application/controllers/IdxController.php:141
 msgid "route by"
 msgstr "route by"
 
-#: application/controllers/IdxController.php:141
+#: application/controllers/IdxController.php:143
 msgid "checking availibilty"
 msgstr "checking availibilty"
 
-#: application/controllers/IdxController.php:142
+#: application/controllers/IdxController.php:144
 msgid "available pseudo"
 msgstr "available pseudo"
 
-#: application/controllers/IdxController.php:143
+#: application/controllers/IdxController.php:145
 msgid "unavailable pseudo"
 msgstr "unavailable pseudo"
 
-#: application/controllers/IdxController.php:145
+#: application/controllers/IdxController.php:147
 msgid "create"
 msgstr "create"
 
-#: application/controllers/IdxController.php:147
+#: application/controllers/IdxController.php:149
 msgid "You have an unsaved route"
 msgstr "You have an unsaved route"
 
@@ -612,13 +620,13 @@ msgstr "Send a message"
 msgid "optional title for this journey"
 msgstr "optional title for this journey"
 
-#: application/forms/Geom.php:25
-#: application/forms/User.php:44
+#: application/forms/Geom.php:27
+#: application/forms/User.php:46
 #, php-format
 msgid "I've read and accepted %s"
 msgstr "I've read and accepted %s"
 
-#: application/forms/Geom.php:33
+#: application/forms/Geom.php:35
 #: application/forms/Pending/ValidateCreation.php:17
 msgid "save"
 msgstr "save"
@@ -654,7 +662,7 @@ msgstr "user name"
 msgid "After creating your account, you will receive a confirmation email. You have 7 days to confirm otherwise, your account and your routes will all be deleted."
 msgstr "After creating your account, you will receive a confirmation email. You have 7 days to confirm otherwise, your account and your routes will all be deleted."
 
-#: application/forms/User.php:56
+#: application/forms/User.php:58
 msgid "create account"
 msgstr "create account"
 
@@ -693,8 +701,6 @@ msgstr "To cancel account creation, press following button. The account and all
 #~ msgstr "pseudo not available"
 #~ msgid "pseudo must only contain letters, digits, dots or underscores"
 #~ msgstr "pseudo must only contain letters, digits, dots or underscores"
-#~ msgid "route has been deleted from the server."
-#~ msgstr "route has been deleted from the server."
 #~ msgid "You need to login before retrying to save"
 #~ msgstr "You need to login before retrying to save"
 #~ msgid "You need to have cookies enabled to login to SYJ"

diff --git a/application/languages/lang_fr.po b/application/languages/lang_fr.po
index cc221a994e0200c674106b0481468825d96dc2f7..05f7bcefcf610c29b8ca951d0bdbfc0bb5982689 100644 (file)
--- a/application/languages/lang_fr.po
+++ b/application/languages/lang_fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: syj\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-15 15:04+0200\n"
+"POT-Creation-Date: 2010-08-15 16:32+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: arno <arno@renevier.net>\n"
 "Language-Team: arno <arno@renevier.net>\n"
@@ -18,15 +18,15 @@ msgstr ""
 "X-Poedit-Bookmarks: -1,-1,-1,-1,13,-1,-1,-1,-1,-1\n"
 "X-Poedit-SearchPath-0: application\n"
 
-#: application/views/scripts/error/error.phtml:4
+#: application/views/scripts/error/error.phtml:5
 msgid "An error occurred"
 msgstr "Il s'est produit une erreur"
 
-#: application/views/scripts/error/error.phtml:26
+#: application/views/scripts/error/error.phtml:35
 msgid "Please try again later"
 msgstr "Veuillez réessayer plus tard"
 
-#: application/views/scripts/error/error.phtml:28
+#: application/views/scripts/error/error.phtml:37
 #: application/views/scripts/pending/password_cancel.phtml:15
 #: application/views/scripts/pending/creation_validate.phtml:15
 #: application/views/scripts/pending/creation_cancel.phtml:15
@@ -63,12 +63,12 @@ msgid "When you have finished a path, press \"save\", button."
 msgstr "Lorsque vous avez fini votre tracé, pressez le bouton \"enregistrer\"."
 
 #: application/views/scripts/idx/index.phtml:26
-#: application/controllers/IdxController.php:146
+#: application/controllers/IdxController.php:148
 msgid "duplicate"
 msgstr "dupliquer"
 
 #: application/views/scripts/idx/index.phtml:28
-#: application/controllers/IdxController.php:144
+#: application/controllers/IdxController.php:146
 msgid "edit"
 msgstr "modifier"
 
@@ -92,32 +92,32 @@ msgstr "créer un compte"
 msgid "Whith an account, you can manage and modify your routes"
 msgstr "Avec un compte, vous pourrez gérer et modifier vos itinéraires"
 
-#: application/views/scripts/termsofuse/index.phtml:3
+#: application/views/scripts/termsofuse/index.phtml:5
 msgid "Show Your Journey is a site whose goal is to allow anyone to publish routes, for example, hiking itinerary, bicycle trip, travel itinerary or whatever."
 msgstr "Show Your Journey est un site dont le but est de permettre à quiconque de publier des itinéraires, par exemples, des itinéraires de randonnées, des trajets cyclistes, des itinéraires de voyages, ou n'importe quoi d'autre."
 
-#: application/views/scripts/termsofuse/index.phtml:7
+#: application/views/scripts/termsofuse/index.phtml:9
 msgid "In order to publish a route, you must first create an account. A valid email is asked for, and ip address of account creation is stored on the server. Those informations will not be divulged to anyone without the user explicit permission."
 msgstr "Pour publier un itinéraire, vous devez tout d'abord créer un compte. Un email valide est demandé, et l'adresse ip de création du compte est enregistrée sur le serveur. Ces informations ne seront divulguées à personne sans la permission explicite de l'utilisateur."
 
-#: application/views/scripts/termsofuse/index.phtml:11
+#: application/views/scripts/termsofuse/index.phtml:13
 msgid "When you create a route, you accept that it's free for any use. This means you accept that anyone can reuse, reproduce, or republish your itinerary, or a modified version of it for any purpose. This also means you need to get appropriate permissions from the creator if you want to upload a route you didn't create yourself."
 msgstr "Lorsque vous créez un itinéraire, vous acceptez qu'il soit utilisable sans restriction. Cela veut dire que n'importe qui peut réutiliser, reproduire ou redistribuer votre itinéraire, ou une version modifiée de celui-ci, et pour n'importe quel usage. Cela veut également dire que vous devez obtenir les autorisations nécessaires si vous voulez publier un itinéraire dont vous n'êtes pas l'auteur."
 
-#: application/views/scripts/termsofuse/index.phtml:15
+#: application/views/scripts/termsofuse/index.phtml:17
 msgid "Show Your Journey is not responsible for the accuracy of the routes published. It's the user responsibility to check that a route is accessible and safe."
 msgstr "Show Your Journey n'est pas responsable de l'exactitude des itinéraires publiés. Il appartient à l'utilisateur de vérifier qu'un chemin est praticable et sécurisé."
 
-#: application/views/scripts/termsofuse/index.phtml:19
+#: application/views/scripts/termsofuse/index.phtml:21
 msgid "Show Your Journey service is provided \"as is\" with no guarantee for accuracy or accessibility."
 msgstr "Show Your Journey est proposé sans garantie de fiabilité ou de disponibilité."
 
-#: application/views/scripts/termsofuse/index.phtml:23
+#: application/views/scripts/termsofuse/index.phtml:25
 msgid "Sources of the software running the website are <a href=\"http://dev.renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The map used to display the routes comes from <a href=\"http://www.openstreetmap.org/\">openstreetmap</a>."
 msgstr "Les sources du logiciel qui fait tourner le site web sont <a href=\"http://dev.renevier.net/?p=syj.git\">disponibles publiquement</a> sous une licence agpl. La carte utilisée pour l'affichage des itinéraires vient d'<a href=\"http://www.openstreetmap.org/\">openstreetmap</a>."
 
 #: application/views/scripts/newpwd/success.phtml:4
-#: application/controllers/IdxController.php:137
+#: application/controllers/IdxController.php:139
 msgid "A link to reset your password has been emailed to you"
 msgstr "Un email contenant un lien pour réinitialiser votre mot de passe vous a été envoyé"
 
@@ -364,7 +364,7 @@ msgstr ""
 "L'équipe de Syj"
 
 #: application/controllers/LoginController.php:100
-#: application/controllers/IdxController.php:127
+#: application/controllers/IdxController.php:129
 msgid "you must enter a login name"
 msgstr "vous devez entrer un nom d'utilisateur"
 
@@ -413,14 +413,14 @@ msgstr "Le champ est requis, et ne doit pas être vide"
 msgid "Invalid email"
 msgstr "Email invalide"
 
-#: application/controllers/ErrorController.php:56
+#: application/controllers/ErrorController.php:55
 msgid "Oups, something went wrong"
 msgstr "Oups, il y a eu un souci"
 
-#: application/controllers/TermsofuseController.php:12
+#: application/controllers/TermsofuseController.php:10
 #: application/layouts/scripts/footer.phtml:87
-#: application/forms/Geom.php:24
-#: application/forms/User.php:43
+#: application/forms/Geom.php:25
+#: application/forms/User.php:44
 msgid "terms of use"
 msgstr "conditions d'utilisation"
 
@@ -434,27 +434,27 @@ msgid "There is no undo. Delete this route definitively ?"
 msgstr "Vous ne pourrez pas annuler. Supprimer l'itinéraire définitivement ?"
 
 #: application/controllers/ListController.php:36
-#: application/controllers/IdxController.php:124
+#: application/controllers/IdxController.php:126
 msgid "server could not be reached"
 msgstr "serveur inaccessible"
 
 #: application/controllers/ListController.php:37
-#: application/controllers/IdxController.php:121
+#: application/controllers/IdxController.php:123
 msgid "server did not understood request. That's probably caused by a bug in SYJ"
 msgstr "Le serveur n'a pas compris la requête. Il s'agit probablement d'un bug dans SYJ"
 
 #: application/controllers/ListController.php:38
-#: application/controllers/IdxController.php:122
+#: application/controllers/IdxController.php:124
 msgid "route not referenced on the server. It has probably been deleted."
 msgstr "chemin non référencé sur le serveur. Il a probablement été supprimé."
 
 #: application/controllers/ListController.php:39
-#: application/controllers/IdxController.php:125
+#: application/controllers/IdxController.php:127
 msgid "there was a server error"
 msgstr "Il s'est produit une erreur serveur"
 
 #: application/controllers/ListController.php:40
-#: application/controllers/IdxController.php:126
+#: application/controllers/IdxController.php:128
 msgid "there was an unknown error"
 msgstr "Il s'est produit une erreur inconnue"
 
@@ -472,12 +472,12 @@ msgid "Wrong password"
 msgstr "Mauvais mot de passe"
 
 #: application/controllers/AccountController.php:44
-#: application/controllers/IdxController.php:135
+#: application/controllers/IdxController.php:137
 msgid "an user is already registered with this email"
 msgstr "il y'a déjà un utilisateur enregistré avec cet email"
 
 #: application/controllers/AccountController.php:72
-#: application/controllers/IdxController.php:131
+#: application/controllers/IdxController.php:133
 #: application/forms/Account.php:40
 msgid "Password do not match"
 msgstr "Les mots de passe ne correspondent pas"
@@ -494,77 +494,85 @@ msgid "You have made no change"
 msgstr "Vous n'avez fait aucun changement"
 
 #: application/controllers/IdxController.php:32
-#: application/controllers/IdxController.php:82
+#: application/controllers/IdxController.php:84
 #, php-format
 msgid "route by <strong>%s</strong>"
 msgstr "tracé par <strong>%s</strong>"
 
-#: application/controllers/IdxController.php:114
-#: application/controllers/IdxController.php:140
+#: application/controllers/IdxController.php:54
+msgid "route has been deleted"
+msgstr "l'itinéraire a été supprimé"
+
+#: application/controllers/IdxController.php:57
+msgid "route does not exist"
+msgstr "L'itinéraire n'existe pas"
+
+#: application/controllers/IdxController.php:116
+#: application/controllers/IdxController.php:142
 msgid "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 msgstr "Carte par <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 
-#: application/controllers/IdxController.php:120
+#: application/controllers/IdxController.php:122
 msgid "save took place successfully"
 msgstr "La sauvegarde s'est déroulée correctement"
 
-#: application/controllers/IdxController.php:123
+#: application/controllers/IdxController.php:125
 msgid "similar path seems to already exist. Please do not create two exactly identical paths"
 msgstr "Il semble qu'il y ait déjà un chemin similaire. Veuillez ne pas créer deux chemins exactement identiques"
 
-#: application/controllers/IdxController.php:128
+#: application/controllers/IdxController.php:130
 msgid "Login correct"
 msgstr "Vous êtes connectés"
 
-#: application/controllers/IdxController.php:129
+#: application/controllers/IdxController.php:131
 msgid "Wrong login/password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: application/controllers/IdxController.php:130
+#: application/controllers/IdxController.php:132
 msgid "you must enter a password"
 msgstr "vous devez entrer un mot de passe"
 
-#: application/controllers/IdxController.php:132
+#: application/controllers/IdxController.php:134
 msgid "You must accept terms of use"
 msgstr "Vous devez accepter les conditions d'utilisation"
 
-#: application/controllers/IdxController.php:133
+#: application/controllers/IdxController.php:135
 msgid "you must enter an email"
 msgstr "vous devez entrer un email"
 
-#: application/controllers/IdxController.php:134
+#: application/controllers/IdxController.php:136
 msgid "invalid email"
 msgstr "email invalide"
 
-#: application/controllers/IdxController.php:136
+#: application/controllers/IdxController.php:138
 msgid "Account created"
 msgstr "Compte créé"
 
-#: application/controllers/IdxController.php:138
+#: application/controllers/IdxController.php:140
 msgid "Now, you can retry to save"
 msgstr "Maintenant, vous pouvez réessayer de sauvegarder"
 
-#: application/controllers/IdxController.php:139
+#: application/controllers/IdxController.php:141
 msgid "route by"
 msgstr "tracé par"
 
-#: application/controllers/IdxController.php:141
+#: application/controllers/IdxController.php:143
 msgid "checking availibilty"
 msgstr "vérification de la disponibilité"
 
-#: application/controllers/IdxController.php:142
+#: application/controllers/IdxController.php:144
 msgid "available pseudo"
 msgstr "pseudo disponible"
 
-#: application/controllers/IdxController.php:143
+#: application/controllers/IdxController.php:145
 msgid "unavailable pseudo"
 msgstr "pseudo non disponible"
 
-#: application/controllers/IdxController.php:145
+#: application/controllers/IdxController.php:147
 msgid "create"
 msgstr "créér"
 
-#: application/controllers/IdxController.php:147
+#: application/controllers/IdxController.php:149
 msgid "You have an unsaved route"
 msgstr "Vous avez un itinéraire non sauvegardé"
 
@@ -614,13 +622,13 @@ msgstr "Envoyer un message"
 msgid "optional title for this journey"
 msgstr "titre facultatif pour ce trajet"
 
-#: application/forms/Geom.php:25
-#: application/forms/User.php:44
+#: application/forms/Geom.php:27
+#: application/forms/User.php:46
 #, php-format
 msgid "I've read and accepted %s"
 msgstr "J'ai lu et accepté les %s"
 
-#: application/forms/Geom.php:33
+#: application/forms/Geom.php:35
 #: application/forms/Pending/ValidateCreation.php:17
 msgid "save"
 msgstr "enregistrer"
@@ -656,7 +664,7 @@ msgstr "nom d'utilisateur"
 msgid "After creating your account, you will receive a confirmation email. You have 7 days to confirm otherwise, your account and your routes will all be deleted."
 msgstr "Après la création de votre compte, vous recevrez un mail de confirmation. Vous avez 7 jours pour confirmer sinon, votre compte et tous vos tracés seront supprimés."
 
-#: application/forms/User.php:56
+#: application/forms/User.php:58
 msgid "create account"
 msgstr "créer le compte"
 

diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index 085621b91e914252b5e0f68582fe956f1f11f766..b602f5ddbcdd6638912c8cc423390806eb975866 100644 (file)
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -1,8 +1,17 @@
 <?php
     $this->redirectLinks = false;
 ?>
-  <h1><?php echo $this->translate('An error occurred')?></h1>
-  <h2><?php echo $this->message ?></h2>
+
+<h1><?php echo $this->translate('An error occurred')?></h1>
+<h2><?php
+  $code = Zend_Controller_Front::getInstance()->getResponse()->getHttpResponseCode();
+  printf('%d: %s', $code, Zend_Http_Response::responseCodeAsText($code));
+?>
+</h2>
+
+    <?php if (isset ($this->message)) {
+        echo '<p>' . $this->message . '</p>';
+    }?>
 
   <?php if (isset($this->exception)): ?>