From: Arno Renevier Date: Fri, 16 Dec 2011 20:31:33 +0000 (+0100) Subject: add mapquest layer back X-Git-Tag: v0.4~9 X-Git-Url: https://dev.renevier.net/?p=syj.git;a=commitdiff_plain;h=c06c7fd6e6f26d31abb8d7c9a9f9e3f2d5b27d5c add mapquest layer back --- diff --git a/.gitmodules b/.gitmodules index 26fad1a..dea91ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "public/simplebox"] path = public/simplebox url = git://github.com/arenevier/simplebox.git +[submodule "public/store"] + path = public/store + url = git://github.com/cloudhead/store.js.git diff --git a/COPYING.TXT b/COPYING.TXT index 6128571..e83ada2 100644 --- a/COPYING.TXT +++ b/COPYING.TXT @@ -10,6 +10,9 @@ - pseudo.gif files has been generated with http://ajaxload.info/ generator and is free for use. +- layer-switcher-maximize-flipped.png is a flipped version of + layer-switcher-maximize.png from OpenLayers. As such it is licensed under a + modified BSD license. =============================================================================== diff --git a/application/configs/medias.ini b/application/configs/medias.ini index 6442a1d..49f0f2d 100644 --- a/application/configs/medias.ini +++ b/application/configs/medias.ini @@ -1,7 +1,7 @@ ; This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier, ; and is published under the AGPL license. */ [production] -scripts.idx = OpenLayers, ModifiablePath, prototype, simplebox, utils, syj +scripts.idx = OpenLayers, ModifiablePath, prototype, simplebox, utils, syj, store scripts.rawidx = OpenLayers, syjraw scripts.login = prototype, utils, login scripts.contact = prototype, utils, contact diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php index 4fc9aaf..9bfc6bf 100644 --- a/application/controllers/IdxController.php +++ b/application/controllers/IdxController.php @@ -144,6 +144,7 @@ class IdxController extends Zend_Controller_Action protected function _jsRawLocaleStrings() { $this->view->jslocales = array( 'osmAttribution' => __("Map by OpenStreetMap"), + 'mapquestAttribution' => __("Map by MapQuest, OpenStreetMap and contributors, CC-BY-SA"), ); } @@ -169,6 +170,7 @@ class IdxController extends Zend_Controller_Action 'canResubmit' => __("Now, you can retry to save"), 'routeBy' => __("route by"), 'osmAttribution' => __("Map by OpenStreetMap"), + 'mapquestAttribution' => __("Map by MapQuest, OpenStreetMap and contributors, CC-BY-SA"), 'pseudoChecking' => __("checking availibilty"), 'availablePseudo' => __("available pseudo"), 'unavailablePseudo' => __("unavailable pseudo"), diff --git a/application/languages/lang_en.po b/application/languages/lang_en.po index 2f21b34..bdd584a 100644 --- 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: 2011-09-08 16:25+0200\n" +"POT-Creation-Date: 2011-12-16 21:23+0100\n" "PO-Revision-Date: \n" "Last-Translator: arno \n" "Language-Team: arno \n" @@ -18,15 +18,272 @@ msgstr "" "X-Poedit-Bookmarks: 5,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" "X-Poedit-SearchPath-0: application\n" -#: application/validate/EmailAddress.php:13 -#: application/forms/Contact.php:32 +#: application/controllers/ErrorController.php:59 +msgid "Oups, something went wrong" +msgstr "Oups, something went wrong" + +#: application/controllers/FaqController.php:9 +#: application/views/scripts/faq/index.phtml:5 +msgid "Frequently asked questions" +msgstr "Frequently asked questions" + +#: application/controllers/ListController.php:14 +#: application/layouts/scripts/footer.phtml:52 +msgid "my routes" +msgstr "my routes" + +#: application/controllers/ListController.php:31 +msgid "There is no undo. Delete this route definitively ?" +msgstr "There is no undo. Delete this route definitively ?" + +#: application/controllers/ListController.php:32 +#: application/controllers/IdxController.php:156 +msgid "server could not be reached" +msgstr "server could not be reached" + +#: application/controllers/ListController.php:33 +#: application/controllers/IdxController.php:154 +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:34 +#: application/controllers/IdxController.php:155 +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:35 +#: application/controllers/IdxController.php:157 +msgid "there was a server error" +msgstr "there was a server error" + +#: application/controllers/ListController.php:36 +#: application/controllers/IdxController.php:158 +msgid "there was an unknown error" +msgstr "there was an unknown error" + +#: application/controllers/ListController.php:37 +msgid "route was successfully deleted" +msgstr "route was successfully deleted" + +#: application/controllers/IdxController.php:24 +#: application/controllers/IdxController.php:71 +#, php-format +msgid "route by %s" +msgstr "route by %s" + +#: application/controllers/IdxController.php:43 +msgid "route has been deleted" +msgstr "route has been deleted" + +#: application/controllers/IdxController.php:46 +msgid "route does not exist" +msgstr "route does not exist" + +#: application/controllers/IdxController.php:74 +#: application/controllers/IdxController.php:107 +msgid "website to share routes" +msgstr "website to share routes" + +#: application/controllers/IdxController.php:116 +#, php-format +msgid "File too large. File size must not exceed %s" +msgstr "File too large. File size must not exceed %s" + +#: application/controllers/IdxController.php:118 +msgid "Invalid file" +msgstr "Invalid file" + +#: application/controllers/IdxController.php:146 +#: application/controllers/IdxController.php:172 +msgid "Map by OpenStreetMap" +msgstr "Map by OpenStreetMap" + +#: application/controllers/IdxController.php:147 +#: application/controllers/IdxController.php:173 +msgid "" +"Map by MapQuest, OpenStreetMap " +"and contributors, CC-BY-SA" +msgstr "" + +#: application/controllers/IdxController.php:153 +msgid "save took place successfully" +msgstr "save took place successfully" + +#: application/controllers/IdxController.php:159 +#: application/controllers/LoginController.php:89 +msgid "you must enter a login name" +msgstr "you must enter a login name" + +#: application/controllers/IdxController.php:160 +msgid "Login correct" +msgstr "Login correct" + +#: application/controllers/IdxController.php:161 +msgid "Wrong login/password" +msgstr "Wrong login/password" + +#: application/controllers/IdxController.php:162 +msgid "you must enter a password" +msgstr "you must enter a password" + +#: application/controllers/IdxController.php:163 +#: application/controllers/AccountController.php:69 +#: application/forms/Account.php:40 +msgid "Password do not match" +msgstr "Password do not match" + +#: application/controllers/IdxController.php:164 +msgid "You must accept terms of use" +msgstr "You must accept terms of use" + +#: application/controllers/IdxController.php:165 +msgid "you must enter an email" +msgstr "you must enter an email" + +#: application/controllers/IdxController.php:166 +msgid "invalid email" +msgstr "invalid email" + +#: application/controllers/IdxController.php:167 +#: application/controllers/AccountController.php:41 +msgid "an user is already registered with this email" +msgstr "an user is already registered with this email" + +#: application/controllers/IdxController.php:168 +msgid "Account created" +msgstr "Account created" + +#: application/controllers/IdxController.php:169 +#: application/views/scripts/newpwd/success.phtml:4 +msgid "A link to reset your password has been emailed to you" +msgstr "A link to reset your password has been emailed to you" + +#: application/controllers/IdxController.php:170 +msgid "Now, you can retry to save" +msgstr "Now, you can retry to save" + +#: application/controllers/IdxController.php:171 +msgid "route by" +msgstr "route by" + +#: application/controllers/IdxController.php:174 +msgid "checking availibilty" +msgstr "checking availibilty" + +#: application/controllers/IdxController.php:175 +msgid "available pseudo" +msgstr "available pseudo" + +#: application/controllers/IdxController.php:176 +msgid "unavailable pseudo" +msgstr "unavailable pseudo" + +#: application/controllers/IdxController.php:177 +#: application/views/scripts/idx/index.phtml:115 +msgid "edit" +msgstr "edit" + +#: application/controllers/IdxController.php:178 +msgid "create" +msgstr "create" + +#: application/controllers/IdxController.php:179 +#: application/views/scripts/idx/index.phtml:113 +msgid "duplicate" +msgstr "duplicate" + +#: application/controllers/IdxController.php:180 +msgid "You have an unsaved route" +msgstr "You have an unsaved route" + +#: application/controllers/IdxController.php:181 +#: application/controllers/AccountController.php:68 +#: application/controllers/ContactController.php:119 +#: application/controllers/NewpwdController.php:66 +msgid "Value is required" +msgstr "Value is required" + +#: application/controllers/IdxController.php:182 +msgid "no result" +msgstr "no result" + +#: application/controllers/IdxController.php:183 +msgid "could not analyze file content" +msgstr "could not analyze file content" + +#: application/controllers/AccountController.php:13 +#: application/layouts/scripts/footer.phtml:38 +msgid "my account" +msgstr "my account" + +#: application/controllers/AccountController.php:28 +msgid "Wrong password" +msgstr "Wrong password" + +#: application/controllers/AccountController.php:70 +#: application/forms/Account.php:33 application/forms/User.php:20 +#, php-format +msgid "At least %d characters" +msgstr "At least %d characters" + +#: application/controllers/AccountController.php:71 +msgid "You have made no change" +msgstr "You have made no change" + +#: application/controllers/TermsofuseController.php:9 +#: application/forms/User.php:44 application/forms/Geom.php:39 +#: application/layouts/scripts/footer.phtml:86 +msgid "terms of use" +msgstr "terms of use" + +#: application/controllers/ContactController.php:11 +msgid "contact form" +msgstr "contact form" + +#: application/controllers/ContactController.php:110 +msgid "Hi," +msgstr "Hi," + #: application/controllers/ContactController.php:120 +#: application/forms/Contact.php:32 application/validate/EmailAddress.php:13 msgid "Invalid email" msgstr "Invalid email" -#: application/forms/Newpwd.php:28 +#: application/controllers/PendingController.php:31 +msgid "account validated" +msgstr "account validated" + +#: application/controllers/PendingController.php:38 +msgid "account deleted" +msgstr "account deleted" + +#: application/controllers/PendingController.php:42 +msgid "account creation validation" +msgstr "account creation validation" + +#: application/controllers/PendingController.php:52 +msgid "password changed" +msgstr "password changed" + +#: application/controllers/PendingController.php:60 +msgid "request canceled" +msgstr "request canceled" + +#: application/controllers/PendingController.php:64 +msgid "password reset validation" +msgstr "password reset validation" + +#: application/controllers/LoginController.php:8 +#: application/forms/Login.php:23 application/views/scripts/idx/index.phtml:49 +#: application/layouts/scripts/footer.phtml:73 +msgid "login" +msgstr "login" + +#: application/forms/Newpwd.php:28 application/forms/Account.php:27 #: application/forms/User.php:36 -#: application/forms/Account.php:27 msgid "email" msgstr "email" @@ -63,57 +320,14 @@ msgstr "Send" msgid "Send a message" msgstr "Send a message" -#: application/forms/User.php:10 -msgid "only letters, numbers, underscores or dots" -msgstr "only letters, numbers, underscores or dots" - -#: application/forms/User.php:12 -msgid "user name" -msgstr "user name" - -#: application/forms/User.php:20 -#: application/forms/Account.php:33 -#: application/controllers/AccountController.php:70 +#: application/forms/Pending/ValidateCreation.php:11 #, php-format -msgid "At least %d characters" -msgstr "At least %d characters" - -#: application/forms/User.php:23 -#: application/forms/Account.php:35 -#: application/forms/Login.php:10 -msgid "password" -msgstr "password" - -#: application/forms/User.php:30 -#: application/forms/Account.php:42 -msgid "confirm password" -msgstr "confirm password" - -#: application/forms/User.php:37 -msgid "After creating your account, you will receive a confirmation email. You have 7 days to confirm otherwise, your account will be deleted." -msgstr "After creating your account, you will receive a confirmation email. You have 7 days to confirm otherwise, your account will be deleted." - -#: application/forms/User.php:44 -#: application/forms/Geom.php:39 -#: application/layouts/scripts/footer.phtml:86 -#: application/controllers/TermsofuseController.php:9 -msgid "terms of use" -msgstr "terms of use" - -#: application/forms/User.php:46 -#: application/forms/Geom.php:41 -#, php-format -msgid "I've read and accepted %s" -msgstr "I've read and accepted %s" - -#: application/forms/User.php:59 -msgid "create account" -msgstr "create account" - -#: application/forms/Pending/ValidateCreation.php:11 -#, php-format -msgid "Someone, probably you, has registered an account %s with email address %s on syj. To confirm this account creation, validate with following button." -msgstr "Someone, probably you, has registered an account %s with email address %s on syj. To confirm this account creation, validate with following button." +msgid "" +"Someone, probably you, has registered an account %s with email address %s on " +"syj. To confirm this account creation, validate with following button." +msgstr "" +"Someone, probably you, has registered an account %s with email address %s on " +"syj. To confirm this account creation, validate with following button." #: application/forms/Pending/ValidateCreation.php:17 #: application/forms/Geom.php:50 @@ -126,27 +340,42 @@ msgid "delete" msgstr "delete" #: application/forms/Pending/ValidateCreation.php:24 -msgid "To cancel account creation, press following button. The account and all its data will be deleted." -msgstr "To cancel account creation, press following button. The account and all its data will be deleted." +msgid "" +"To cancel account creation, press following button. The account and all its " +"data will be deleted." +msgstr "" +"To cancel account creation, press following button. The account and all its " +"data will be deleted." #: application/forms/Pending/ResetPassword.php:11 #, php-format -msgid "Hi %s. Someone, probably you, has asked to reset password for your account. To get a new password, validate with following button." -msgstr "Hi %s. Someone, probably you, has asked to reset password for your account. To get a new password, validate with following button." +msgid "" +"Hi %s. Someone, probably you, has asked to reset password for your account. " +"To get a new password, validate with following button." +msgstr "" +"Hi %s. Someone, probably you, has asked to reset password for your account. " +"To get a new password, validate with following button." #: application/forms/Pending/ResetPassword.php:23 msgid "cancel request" msgstr "cancel request" #: application/forms/Pending/ResetPassword.php:24 -msgid "To cancel this request, press following button. Your password will not change." -msgstr "To cancel this request, press following button. Your password will not change." +msgid "" +"To cancel this request, press following button. Your password will not " +"change." +msgstr "" +"To cancel this request, press following button. Your password will not " +"change." -#: application/forms/Account.php:40 -#: application/controllers/IdxController.php:162 -#: application/controllers/AccountController.php:69 -msgid "Password do not match" -msgstr "Password do not match" +#: application/forms/Account.php:35 application/forms/User.php:23 +#: application/forms/Login.php:10 +msgid "password" +msgstr "password" + +#: application/forms/Account.php:42 application/forms/User.php:30 +msgid "confirm password" +msgstr "confirm password" #: application/forms/Account.php:48 msgid "current password" @@ -156,6 +385,31 @@ msgstr "current password" msgid "modify my informations" msgstr "modify my informations" +#: application/forms/User.php:10 +msgid "only letters, numbers, underscores or dots" +msgstr "only letters, numbers, underscores or dots" + +#: application/forms/User.php:12 +msgid "user name" +msgstr "user name" + +#: application/forms/User.php:37 +msgid "" +"After creating your account, you will receive a confirmation email. You have " +"7 days to confirm otherwise, your account will be deleted." +msgstr "" +"After creating your account, you will receive a confirmation email. You have " +"7 days to confirm otherwise, your account will be deleted." + +#: application/forms/User.php:46 application/forms/Geom.php:41 +#, php-format +msgid "I've read and accepted %s" +msgstr "I've read and accepted %s" + +#: application/forms/User.php:59 +msgid "create account" +msgstr "create account" + #: application/forms/Login.php:9 msgid "user" msgstr "user" @@ -168,13 +422,6 @@ msgstr "remember me" msgid "I forgot my password" msgstr "I forgot my password" -#: application/forms/Login.php:23 -#: application/views/scripts/idx/index.phtml:49 -#: application/layouts/scripts/footer.phtml:73 -#: application/controllers/LoginController.php:8 -msgid "login" -msgstr "login" - #: application/forms/Geom.php:17 msgid "Draw journey on the map or choose one from a file" msgstr "Draw journey on the map or choose one from a file" @@ -183,162 +430,31 @@ msgstr "Draw journey on the map or choose one from a file" msgid "optional title for this journey" msgstr "optional title for this journey" -#: application/models/Pending/ValidateCreation.php:15 -msgid "[SYJ] Please validate your account" -msgstr "[SYJ] Please validate your account" - -#: application/models/Pending/ValidateCreation.php:16 -msgid "" -"Hi %user%, and welcome on syj\n" -"\n" -"Your account is currently active, but you need to confirm your inscription by\n" -"following this link:\n" -"%hashurl%\n" -"\n" -"If you do not not confirm your inscription within 7 days, your account will be\n" -"deleted.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" -msgstr "" -"Hi %user%, and welcome on syj\n" -"\n" -"Your account is currently active, but you need to confirm your inscription by\n" -"following this link:\n" -"%hashurl%\n" -"\n" -"If you do not not confirm your inscription within 7 days, your account will be\n" -"deleted.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" - -#: application/models/Pending/ValidateCreation.php:34 -msgid "[SYJ] Reminder: Validate your account" -msgstr "[SYJ] Reminder: Validate your account" - -#: application/models/Pending/ValidateCreation.php:35 -msgid "" -"Hi %user%,\n" -"\n" -"You need to validate your account on syj since 6 days. Otherwise, your\n" -"account will be deleted tomorrow. Please follow this link:\n" -"%hashurl%\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" -msgstr "" -"Hi %user%,\n" -"\n" -"You need to validate your account on syj since 6 days. Otherwise, your\n" -"account will be deleted tomorrow. Please follow this link:\n" -"%hashurl%\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" - -#: application/models/Pending/ValidateCreation.php:51 -msgid "[SYJ] Account deactivated" -msgstr "[SYJ] Account deactivated" - -#: application/models/Pending/ValidateCreation.php:52 -msgid "" -"Hi %user%,\n" -"\n" -"You have not validated your syj account on time. Therefore, your account have\n" -"been deleted. Nevertheless, you can still create a new account.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Regards,\n" -"\n" -"Syj team" -msgstr "" -"Hi %user%,\n" -"\n" -"You have not validated your syj account on time. Therefore, your account have\n" -"been deleted. Nevertheless, you can still create a new account.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Regards,\n" -"\n" -"Syj team" - -#: application/models/Pending/ResetPassword.php:19 -msgid "[SYJ] Reset your password" -msgstr "[SYJ] Reset your password" - -#: application/models/Pending/ResetPassword.php:20 -msgid "" -"Hi %user%,\n" -"\n" -"Someone, probably you, has asked to reset your password. If you want to reset\n" -"your password, please follow this link:\n" -"%hashurl%\n" -"\n" -"If you do not not confirm within 2 days, your password will not be reset.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" -msgstr "" -"Hi %user%,\n" -"\n" -"Someone, probably you, has asked to reset your password. If you want to reset\n" -"your password, please follow this link:\n" -"%hashurl%\n" -"\n" -"If you do not not confirm within 2 days, your password will not be reset.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" +# This is language name. translate english to the name of your language. For example: "deutsch" or "français" +#: application/views/helpers/LocaleSwitcher.php:17 +msgid "english" +msgstr "english" -#: application/models/Path.php:61 -#, php-format -msgid "route number %d" -msgstr "route number %d" +#: application/views/helpers/LogoutLink.php:9 +#: application/layouts/scripts/footer.phtml:66 +msgid "logout" +msgstr "logout" #: application/views/helpers/Returnto.php:22 #: application/views/helpers/Returnto.php:25 #: application/views/helpers/Returnto.php:28 -#: application/views/scripts/pending/creation_cancel.phtml:14 #: application/views/scripts/pending/creation_validate.phtml:14 +#: application/views/scripts/pending/creation_cancel.phtml:14 #: application/views/scripts/pending/password_cancel.phtml:14 msgid "You can now" msgstr "You can now" #: application/views/helpers/Returnto.php:23 #: application/views/helpers/Returnto.php:31 -#: application/views/scripts/error/error.phtml:37 -#: application/views/scripts/pending/creation_cancel.phtml:15 #: application/views/scripts/pending/creation_validate.phtml:15 +#: application/views/scripts/pending/creation_cancel.phtml:15 #: application/views/scripts/pending/password_cancel.phtml:15 +#: application/views/scripts/error/error.phtml:37 msgid "go to main page" msgstr "go to main page" @@ -352,53 +468,121 @@ msgstr "go back to %s" msgid "or you can" msgstr "or you can" -# This is language name. translate english to the name of your language. For example: "deutsch" or "français" -#: application/views/helpers/LocaleSwitcher.php:17 -msgid "english" -msgstr "english" +#: application/views/scripts/account/success.phtml:4 +msgid "Your account was modified successfully" +msgstr "Your account was modified successfully" -#: application/views/helpers/LogoutLink.php:9 -#: application/layouts/scripts/footer.phtml:66 -msgid "logout" -msgstr "logout" +#: application/views/scripts/pending/index.phtml:16 +msgid "If you need more informations, please" +msgstr "If you need more informations, please" -#: application/views/scripts/faq/index.phtml:5 -#: application/controllers/FaqController.php:9 -msgid "Frequently asked questions" -msgstr "Frequently asked questions" +#: application/views/scripts/pending/index.phtml:17 +msgid "contact us" +msgstr "contact us" -#: application/views/scripts/faq/index.phtml:6 -msgid "What's syj?" -msgstr "What's syj?" +#: application/views/scripts/pending/creation_validate.phtml:12 +msgid "You have validated your account." +msgstr "You have validated your account." -#: application/views/scripts/faq/index.phtml:7 -msgid "Syj is a website to share routes. You draw a route on a map background, and then, you get an link to share it. You can then show clever bicycle rides, your last hiking, or any route you want." -msgstr "Syj is a website to share routes. You draw a route on a map background, and then, you get an link to share it. You can then show clever bicycle rides, your last hiking, or any route you want." +#: application/views/scripts/pending/creation_cancel.phtml:12 +msgid "You have canceled the account." +msgstr "You have canceled the account." -#: application/views/scripts/faq/index.phtml:9 -msgid "How do I modify a route?" -msgstr "How do I modify a route?" +#: application/views/scripts/pending/password_cancel.phtml:12 +msgid "You have canceled the request." +msgstr "You have canceled the request." -#: application/views/scripts/faq/index.phtml:10 +#: application/views/scripts/pending/password_validate.phtml:17 +msgid "log in" +msgstr "log in" + +#: application/views/scripts/pending/password_validate.phtml:15 #, php-format -msgid "When you're editing a route, you can drag and drop a point to move it. If you want to delete it, you need to press the Shift key. While you hold the button, points will have an icon%s over them. Clicking that icon will delete the point." -msgstr "When you're editing a route, you can drag and drop a point to move it. If you want to delete it, you need to press the Shift key. While you hold the button, points will have an icon%s over them. Clicking that icon will delete the point." +msgid "" +"Your new password is now %s. You can %s with this new " +"password. Don't forget to change it again to a personal password as soon as " +"possible." +msgstr "" +"Your new password is now %s. You can %s with this new " +"password. Don't forget to change it again to a personal password as soon as " +"possible." -#: application/views/scripts/faq/index.phtml:12 -msgid "Why should I create a account?" -msgstr "Why should I create a account?" +#: application/views/scripts/contact/index.phtml:8 +#, php-format +msgid "" +"There was an unkwown message when sending the message. Please try again " +"later, or send a mail directly to %s" +msgstr "" +"There was an unkwown message when sending the message. Please try again " +"later, or send a mail directly to %s" -#: application/views/scripts/faq/index.phtml:13 -msgid "You can create routes without a account. But if you want to modify your routes afterwards, you need to be registered when creating the route." -msgstr "You can create routes without a account. But if you want to modify your routes afterwards, you need to be registered when creating the route." +#: application/views/scripts/contact/success.phtml:4 +msgid "Email was send successfully" +msgstr "Email was send successfully" -#: application/views/scripts/faq/index.phtml:15 -msgid "Is it possible to have my route \"attach\" nearby paths?" -msgstr "Is it possible to have my route \"attach\" nearby paths?" +#: 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/faq/index.phtml:16 -msgid "When you create a route with syj, you must draw each point on the map. If your route follows an existing path, you still need to draw the layer manually: syj will not try to attach nearby existing paths. There are three main reasons. One bad reason: it would a lot of work to implement. And two good reasons: syj uses OpenStreetMap as a background map, and the map is still unfinished in many areas. Also, depending on your route, you may wish to attach to motorways, footways, biycle lanes, railways, …. If you are in a place with lot of differents routes, it would be nearly impossible to always choose the right way." -msgstr "When you create a route with syj, you must draw each point on the map. If your route follows an existing path, you still need to draw the layer manually: syj will not try to attach nearby existing paths. There are three main reasons. One bad reason: it would a lot of work to implement. And two good reasons: syj uses OpenStreetMap as a background map, and the map is still unfinished in many areas. Also, depending on your route, you may wish to attach to motorways, footways, biycle lanes, railways, …. If you are in a place with lot of differents routes, it would be nearly impossible to always choose the right way." +#: 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: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: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: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:25 +msgid "" +"Sources of the software running the website are publicly available under a agpl license. The " +"map used to display the routes comes from openstreetmap." +msgstr "" +"Sources of the software running the website are publicly available under a agpl license. The " +"map used to display the routes comes from openstreetmap." #: application/views/scripts/error/error.phtml:5 msgid "An error occurred" @@ -408,6 +592,77 @@ msgstr "An error occurred" msgid "Please try again later" msgstr "Please try again later" +#: application/views/scripts/faq/index.phtml:6 +msgid "What's syj?" +msgstr "What's syj?" + +#: application/views/scripts/faq/index.phtml:7 +msgid "" +"Syj is a website to share " +"routes. You draw a route on a map background, and then, you get an link to " +"share it. You can then show clever bicycle rides, your last hiking, or any " +"route you want." +msgstr "" +"Syj is a website to share " +"routes. You draw a route on a map background, and then, you get an link to " +"share it. You can then show clever bicycle rides, your last hiking, or any " +"route you want." + +#: application/views/scripts/faq/index.phtml:9 +msgid "How do I modify a route?" +msgstr "How do I modify a route?" + +#: application/views/scripts/faq/index.phtml:10 +#, php-format +msgid "" +"When you're editing a route, you can drag and drop a point to move it. If " +"you want to delete it, you need to press the Shift key. While you hold the " +"button, points will have an icon%s over them. Clicking that icon will delete " +"the point." +msgstr "" +"When you're editing a route, you can drag and drop a point to move it. If " +"you want to delete it, you need to press the Shift key. While you hold the " +"button, points will have an icon%s over them. Clicking that icon will delete " +"the point." + +#: application/views/scripts/faq/index.phtml:12 +msgid "Why should I create a account?" +msgstr "Why should I create a account?" + +#: application/views/scripts/faq/index.phtml:13 +msgid "" +"You can create routes without a account. But if you want to modify your " +"routes afterwards, you need to be registered when creating the route." +msgstr "" +"You can create routes without a account. But if you want to modify your " +"routes afterwards, you need to be registered when creating the route." + +#: application/views/scripts/faq/index.phtml:15 +msgid "Is it possible to have my route \"attach\" nearby paths?" +msgstr "Is it possible to have my route \"attach\" nearby paths?" + +#: application/views/scripts/faq/index.phtml:16 +msgid "" +"When you create a route with syj, you must draw each point on the map. If " +"your route follows an existing path, you still need to draw the layer " +"manually: syj will not try to attach nearby existing paths. There are three " +"main reasons. One bad reason: it would a lot of work to implement. And two " +"good reasons: syj uses OpenStreetMap as a background map, and the map is " +"still unfinished in many areas. Also, depending on your route, you may wish " +"to attach to motorways, footways, biycle lanes, railways, …. If you " +"are in a place with lot of differents routes, it would be nearly impossible " +"to always choose the right way." +msgstr "" +"When you create a route with syj, you must draw each point on the map. If " +"your route follows an existing path, you still need to draw the layer " +"manually: syj will not try to attach nearby existing paths. There are three " +"main reasons. One bad reason: it would a lot of work to implement. And two " +"good reasons: syj uses OpenStreetMap as a background map, and the map is " +"still unfinished in many areas. Also, depending on your route, you may wish " +"to attach to motorways, footways, biycle lanes, railways, …. If you " +"are in a place with lot of differents routes, it would be nearly impossible " +"to always choose the right way." + #: application/views/scripts/idx/raw.phtml:8 #: application/views/scripts/idx/index.phtml:8 #: application/views/scripts/list/index.phtml:8 @@ -415,12 +670,19 @@ msgid "SYJ needs javascript. Please activate scripts in your browser." msgstr "SYJ needs javascript. Please activate scripts in your browser." #: application/views/scripts/idx/index.phtml:21 -msgid "To create a journey, press \"start a route\" button, then click on the map to add points. To delete a point, hold shift pressed while clicking on it." -msgstr "To create a journey, press \"start a route\" button, then click on the map to add points. To delete a point, hold shift pressed while clicking on it." +msgid "" +"To create a journey, press \"start a route\" button, then " +"click on the map to add points. To delete a point, hold shift pressed while " +"clicking on it." +msgstr "" +"To create a journey, press \"start a route\" button, then " +"click on the map to add points. To delete a point, hold shift pressed while " +"clicking on it." #: application/views/scripts/idx/index.phtml:23 msgid "You can zoom and move the map with the controls in the top left corner." -msgstr "You can zoom and move the map with the controls in the top left corner." +msgstr "" +"You can zoom and move the map with the controls in the top left corner." #: application/views/scripts/idx/index.phtml:25 msgid "When you have finished a path, press \"create\", button." @@ -431,7 +693,7 @@ msgid "route length" msgstr "route length" #: application/views/scripts/idx/index.phtml:51 -#: application/views/scripts/idx/index.phtml:169 +#: application/views/scripts/idx/index.phtml:170 msgid "create an account" msgstr "create an account" @@ -452,75 +714,32 @@ msgstr "direct link" msgid "export" msgstr "export" -#: application/views/scripts/idx/index.phtml:91 #: application/views/scripts/idx/index.phtml:92 +#: application/views/scripts/idx/index.phtml:93 msgid "kml export" msgstr "kml export" -#: application/views/scripts/idx/index.phtml:98 #: application/views/scripts/idx/index.phtml:99 +#: application/views/scripts/idx/index.phtml:100 msgid "gpx export" msgstr "gpx export" -#: application/views/scripts/idx/index.phtml:112 -#: application/controllers/IdxController.php:177 -msgid "duplicate" -msgstr "duplicate" - -#: application/views/scripts/idx/index.phtml:114 -#: application/controllers/IdxController.php:175 -msgid "edit" -msgstr "edit" - -#: application/views/scripts/idx/index.phtml:118 +#: application/views/scripts/idx/index.phtml:119 msgid "Search a place" msgstr "Search a place" -#: application/views/scripts/idx/index.phtml:122 +#: application/views/scripts/idx/index.phtml:123 msgid "Ok" msgstr "Ok" -#: application/views/scripts/idx/index.phtml:128 +#: application/views/scripts/idx/index.phtml:129 msgid "start a route" msgstr "start a route" -#: application/views/scripts/idx/index.phtml:140 +#: application/views/scripts/idx/index.phtml:141 msgid "more results" msgstr "more results" -#: 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: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: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: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: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:25 -msgid "Sources of the software running the website are publicly available under a agpl license. The map used to display the routes comes from openstreetmap." -msgstr "Sources of the software running the website are publicly available under a agpl license. The map used to display the routes comes from openstreetmap." - -#: application/views/scripts/contact/success.phtml:4 -msgid "Email was send successfully" -msgstr "Email was send successfully" - -#: application/views/scripts/contact/index.phtml:8 -#, php-format -msgid "There was an unkwown message when sending the message. Please try again later, or send a mail directly to %s" -msgstr "There was an unkwown message when sending the message. Please try again later, or send a mail directly to %s" - #: application/views/scripts/list/index.phtml:13 #: application/layouts/scripts/footer.phtml:16 msgid "create a route" @@ -551,257 +770,171 @@ msgstr "last page" msgid "modify or duplicate" msgstr "modify or duplicate" -#: application/views/scripts/account/success.phtml:4 -msgid "Your account was modified successfully" -msgstr "Your account was modified successfully" +#: application/models/Pending/ValidateCreation.php:15 +msgid "[SYJ] Please validate your account" +msgstr "[SYJ] Please validate your account" -#: application/views/scripts/newpwd/success.phtml:4 -#: application/controllers/IdxController.php:168 -msgid "A link to reset your password has been emailed to you" -msgstr "A link to reset your password has been emailed to you" +#: application/models/Pending/ValidateCreation.php:16 +msgid "" +"Hi %user%, and welcome on syj\n" +"\n" +"Your account is currently active, but you need to confirm your inscription " +"by\n" +"following this link:\n" +"%hashurl%\n" +"\n" +"If you do not not confirm your inscription within 7 days, your account will " +"be\n" +"deleted.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" +msgstr "" +"Hi %user%, and welcome on syj\n" +"\n" +"Your account is currently active, but you need to confirm your inscription " +"by\n" +"following this link:\n" +"%hashurl%\n" +"\n" +"If you do not not confirm your inscription within 7 days, your account will " +"be\n" +"deleted.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" -#: application/views/scripts/pending/creation_cancel.phtml:12 -msgid "You have canceled the account." -msgstr "You have canceled the account." +#: application/models/Pending/ValidateCreation.php:34 +msgid "[SYJ] Reminder: Validate your account" +msgstr "[SYJ] Reminder: Validate your account" -#: application/views/scripts/pending/creation_validate.phtml:12 -msgid "You have validated your account." -msgstr "You have validated your account." +#: application/models/Pending/ValidateCreation.php:35 +msgid "" +"Hi %user%,\n" +"\n" +"You need to validate your account on syj since 6 days. Otherwise, your\n" +"account will be deleted tomorrow. Please follow this link:\n" +"%hashurl%\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" +msgstr "" +"Hi %user%,\n" +"\n" +"You need to validate your account on syj since 6 days. Otherwise, your\n" +"account will be deleted tomorrow. Please follow this link:\n" +"%hashurl%\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" -#: application/views/scripts/pending/password_validate.phtml:17 -msgid "log in" -msgstr "log in" +#: application/models/Pending/ValidateCreation.php:51 +msgid "[SYJ] Account deactivated" +msgstr "[SYJ] Account deactivated" -#: application/views/scripts/pending/password_validate.phtml:15 -#, php-format -msgid "Your new password is now %s. You can %s with this new password. Don't forget to change it again to a personal password as soon as possible." -msgstr "Your new password is now %s. You can %s with this new password. Don't forget to change it again to a personal password as soon as possible." +#: application/models/Pending/ValidateCreation.php:52 +msgid "" +"Hi %user%,\n" +"\n" +"You have not validated your syj account on time. Therefore, your account " +"have\n" +"been deleted. Nevertheless, you can still create a new account.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Regards,\n" +"\n" +"Syj team" +msgstr "" +"Hi %user%,\n" +"\n" +"You have not validated your syj account on time. Therefore, your account " +"have\n" +"been deleted. Nevertheless, you can still create a new account.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Regards,\n" +"\n" +"Syj team" -#: application/views/scripts/pending/password_cancel.phtml:12 -msgid "You have canceled the request." -msgstr "You have canceled the request." +#: application/models/Pending/ResetPassword.php:19 +msgid "[SYJ] Reset your password" +msgstr "[SYJ] Reset your password" -#: application/views/scripts/pending/index.phtml:16 -msgid "If you need more informations, please" -msgstr "If you need more informations, please" +#: application/models/Pending/ResetPassword.php:20 +msgid "" +"Hi %user%,\n" +"\n" +"Someone, probably you, has asked to reset your password. If you want to " +"reset\n" +"your password, please follow this link:\n" +"%hashurl%\n" +"\n" +"If you do not not confirm within 2 days, your password will not be reset.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" +msgstr "" +"Hi %user%,\n" +"\n" +"Someone, probably you, has asked to reset your password. If you want to " +"reset\n" +"your password, please follow this link:\n" +"%hashurl%\n" +"\n" +"If you do not not confirm within 2 days, your password will not be reset.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" -#: application/views/scripts/pending/index.phtml:17 -msgid "contact us" -msgstr "contact us" +#: application/models/Path.php:61 +#, php-format +msgid "route number %d" +msgstr "route number %d" #: application/layouts/scripts/footer.phtml:27 msgid "contact" msgstr "contact" -#: application/layouts/scripts/footer.phtml:38 -#: application/controllers/AccountController.php:13 -msgid "my account" -msgstr "my account" - -#: application/layouts/scripts/footer.phtml:52 -#: application/controllers/ListController.php:14 -msgid "my routes" -msgstr "my routes" - #: application/layouts/scripts/footer.phtml:96 msgid "help" msgstr "help" -#: application/controllers/PendingController.php:31 -msgid "account validated" -msgstr "account validated" - -#: application/controllers/PendingController.php:38 -msgid "account deleted" -msgstr "account deleted" - -#: application/controllers/PendingController.php:42 -msgid "account creation validation" -msgstr "account creation validation" - -#: application/controllers/PendingController.php:52 -msgid "password changed" -msgstr "password changed" - -#: application/controllers/PendingController.php:60 -msgid "request canceled" -msgstr "request canceled" - -#: application/controllers/PendingController.php:64 -msgid "password reset validation" -msgstr "password reset validation" - -#: application/controllers/NewpwdController.php:66 -#: application/controllers/IdxController.php:179 -#: application/controllers/ContactController.php:119 -#: application/controllers/AccountController.php:68 -msgid "Value is required" -msgstr "Value is required" - -#: application/controllers/IdxController.php:24 -#: application/controllers/IdxController.php:71 -#, php-format -msgid "route by %s" -msgstr "route by %s" - -#: application/controllers/IdxController.php:43 -msgid "route has been deleted" -msgstr "route has been deleted" - -#: application/controllers/IdxController.php:46 -msgid "route does not exist" -msgstr "route does not exist" - -#: application/controllers/IdxController.php:74 -#: application/controllers/IdxController.php:107 -msgid "website to share routes" -msgstr "website to share routes" - -#: application/controllers/IdxController.php:116 -#, php-format -msgid "File too large. File size must not exceed %s" -msgstr "File too large. File size must not exceed %s" - -#: application/controllers/IdxController.php:118 -msgid "Invalid file" -msgstr "Invalid file" - -#: application/controllers/IdxController.php:146 -#: application/controllers/IdxController.php:171 -msgid "Map by OpenStreetMap" -msgstr "Map by OpenStreetMap" - -#: application/controllers/IdxController.php:152 -msgid "save took place successfully" -msgstr "save took place successfully" - -#: application/controllers/IdxController.php:153 -#: application/controllers/ListController.php:33 -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/IdxController.php:154 -#: application/controllers/ListController.php:34 -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/IdxController.php:155 -#: application/controllers/ListController.php:32 -msgid "server could not be reached" -msgstr "server could not be reached" - -#: application/controllers/IdxController.php:156 -#: application/controllers/ListController.php:35 -msgid "there was a server error" -msgstr "there was a server error" - -#: application/controllers/IdxController.php:157 -#: application/controllers/ListController.php:36 -msgid "there was an unknown error" -msgstr "there was an unknown error" - -#: application/controllers/IdxController.php:158 -#: application/controllers/LoginController.php:89 -msgid "you must enter a login name" -msgstr "you must enter a login name" - -#: application/controllers/IdxController.php:159 -msgid "Login correct" -msgstr "Login correct" - -#: application/controllers/IdxController.php:160 -msgid "Wrong login/password" -msgstr "Wrong login/password" - -#: application/controllers/IdxController.php:161 -msgid "you must enter a password" -msgstr "you must enter a password" - -#: application/controllers/IdxController.php:163 -msgid "You must accept terms of use" -msgstr "You must accept terms of use" - -#: application/controllers/IdxController.php:164 -msgid "you must enter an email" -msgstr "you must enter an email" - -#: application/controllers/IdxController.php:165 -msgid "invalid email" -msgstr "invalid email" - -#: application/controllers/IdxController.php:166 -#: application/controllers/AccountController.php:41 -msgid "an user is already registered with this email" -msgstr "an user is already registered with this email" - -#: application/controllers/IdxController.php:167 -msgid "Account created" -msgstr "Account created" - -#: application/controllers/IdxController.php:169 -msgid "Now, you can retry to save" -msgstr "Now, you can retry to save" - -#: application/controllers/IdxController.php:170 -msgid "route by" -msgstr "route by" - -#: application/controllers/IdxController.php:172 -msgid "checking availibilty" -msgstr "checking availibilty" - -#: application/controllers/IdxController.php:173 -msgid "available pseudo" -msgstr "available pseudo" - -#: application/controllers/IdxController.php:174 -msgid "unavailable pseudo" -msgstr "unavailable pseudo" - -#: application/controllers/IdxController.php:176 -msgid "create" -msgstr "create" - -#: application/controllers/IdxController.php:178 -msgid "You have an unsaved route" -msgstr "You have an unsaved route" - -#: application/controllers/IdxController.php:180 -msgid "no result" -msgstr "no result" - -#: application/controllers/IdxController.php:181 -msgid "could not analyze file content" -msgstr "could not analyze file content" - -#: application/controllers/ContactController.php:11 -msgid "contact form" -msgstr "contact form" - -#: application/controllers/ContactController.php:110 -msgid "Hi," -msgstr "Hi," - -#: application/controllers/ListController.php:31 -msgid "There is no undo. Delete this route definitively ?" -msgstr "There is no undo. Delete this route definitively ?" - -#: application/controllers/ListController.php:37 -msgid "route was successfully deleted" -msgstr "route was successfully deleted" - -#: application/controllers/AccountController.php:28 -msgid "Wrong password" -msgstr "Wrong password" - -#: application/controllers/AccountController.php:71 -msgid "You have made no change" -msgstr "You have made no change" - -#: application/controllers/ErrorController.php:59 -msgid "Oups, something went wrong" -msgstr "Oups, something went wrong" - #~ msgid "Welcome on Syj." #~ msgstr "Welcome on Syj." diff --git a/application/languages/lang_fr.po b/application/languages/lang_fr.po index 224e774..c1ba2a4 100644 --- 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: 2011-09-08 16:25+0200\n" +"POT-Creation-Date: 2011-12-16 21:23+0100\n" "PO-Revision-Date: \n" "Last-Translator: arno \n" "Language-Team: arno \n" @@ -18,15 +18,275 @@ msgstr "" "X-Poedit-Bookmarks: -1,-1,-1,-1,13,-1,-1,-1,-1,-1\n" "X-Poedit-SearchPath-0: application\n" -#: application/validate/EmailAddress.php:13 -#: application/forms/Contact.php:32 +#: application/controllers/ErrorController.php:59 +msgid "Oups, something went wrong" +msgstr "Oups, il y a eu un souci" + +#: application/controllers/FaqController.php:9 +#: application/views/scripts/faq/index.phtml:5 +msgid "Frequently asked questions" +msgstr "Foire aux questions" + +#: application/controllers/ListController.php:14 +#: application/layouts/scripts/footer.phtml:52 +msgid "my routes" +msgstr "mes itinéraires" + +#: application/controllers/ListController.php:31 +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:32 +#: application/controllers/IdxController.php:156 +msgid "server could not be reached" +msgstr "serveur inaccessible" + +#: application/controllers/ListController.php:33 +#: application/controllers/IdxController.php:154 +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:34 +#: application/controllers/IdxController.php:155 +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:35 +#: application/controllers/IdxController.php:157 +msgid "there was a server error" +msgstr "Il s'est produit une erreur serveur" + +#: application/controllers/ListController.php:36 +#: application/controllers/IdxController.php:158 +msgid "there was an unknown error" +msgstr "Il s'est produit une erreur inconnue" + +#: application/controllers/ListController.php:37 +msgid "route was successfully deleted" +msgstr "l'itinéraire a été correctement supprimé" + +#: application/controllers/IdxController.php:24 +#: application/controllers/IdxController.php:71 +#, php-format +msgid "route by %s" +msgstr "tracé par %s" + +#: application/controllers/IdxController.php:43 +msgid "route has been deleted" +msgstr "l'itinéraire a été supprimé" + +#: application/controllers/IdxController.php:46 +msgid "route does not exist" +msgstr "L'itinéraire n'existe pas" + +#: application/controllers/IdxController.php:74 +#: application/controllers/IdxController.php:107 +msgid "website to share routes" +msgstr "site de partage d'itinéraires" + +#: application/controllers/IdxController.php:116 +#, php-format +msgid "File too large. File size must not exceed %s" +msgstr "Fichier trop gros. La taille ne doit pas dépasser %s" + +#: application/controllers/IdxController.php:118 +msgid "Invalid file" +msgstr "Fichier invalide" + +#: application/controllers/IdxController.php:146 +#: application/controllers/IdxController.php:172 +msgid "Map by OpenStreetMap" +msgstr "Carte par OpenStreetMap" + +#: application/controllers/IdxController.php:147 +#: application/controllers/IdxController.php:173 +msgid "" +"Map by MapQuest, OpenStreetMap " +"and contributors, CC-BY-SA" +msgstr "Carte par MapQuest, OpenStreetMap et contributeurs, CC-BY-SA" + +#: application/controllers/IdxController.php:153 +msgid "save took place successfully" +msgstr "La sauvegarde s'est déroulée correctement" + +#: application/controllers/IdxController.php:159 +#: application/controllers/LoginController.php:89 +msgid "you must enter a login name" +msgstr "vous devez entrer un nom d'utilisateur" + +#: application/controllers/IdxController.php:160 +msgid "Login correct" +msgstr "Vous êtes connecté" + +#: application/controllers/IdxController.php:161 +msgid "Wrong login/password" +msgstr "Mauvais nom d'utilisateur ou mot de passe" + +#: application/controllers/IdxController.php:162 +msgid "you must enter a password" +msgstr "vous devez entrer un mot de passe" + +#: application/controllers/IdxController.php:163 +#: application/controllers/AccountController.php:69 +#: application/forms/Account.php:40 +msgid "Password do not match" +msgstr "Les mots de passe ne correspondent pas" + +#: application/controllers/IdxController.php:164 +msgid "You must accept terms of use" +msgstr "Vous devez accepter les conditions d'utilisation" + +#: application/controllers/IdxController.php:165 +msgid "you must enter an email" +msgstr "vous devez entrer un email" + +#: application/controllers/IdxController.php:166 +msgid "invalid email" +msgstr "email invalide" + +#: application/controllers/IdxController.php:167 +#: application/controllers/AccountController.php:41 +msgid "an user is already registered with this email" +msgstr "il y'a déjà un utilisateur enregistré avec cet email" + +#: application/controllers/IdxController.php:168 +msgid "Account created" +msgstr "Compte créé" + +#: application/controllers/IdxController.php:169 +#: application/views/scripts/newpwd/success.phtml:4 +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é" + +#: application/controllers/IdxController.php:170 +msgid "Now, you can retry to save" +msgstr "Maintenant, vous pouvez réessayer de sauvegarder" + +#: application/controllers/IdxController.php:171 +msgid "route by" +msgstr "tracé par" + +#: application/controllers/IdxController.php:174 +msgid "checking availibilty" +msgstr "vérification de la disponibilité" + +#: application/controllers/IdxController.php:175 +msgid "available pseudo" +msgstr "pseudo disponible" + +#: application/controllers/IdxController.php:176 +msgid "unavailable pseudo" +msgstr "pseudo non disponible" + +#: application/controllers/IdxController.php:177 +#: application/views/scripts/idx/index.phtml:115 +msgid "edit" +msgstr "modifier" + +#: application/controllers/IdxController.php:178 +msgid "create" +msgstr "créér" + +#: application/controllers/IdxController.php:179 +#: application/views/scripts/idx/index.phtml:113 +msgid "duplicate" +msgstr "dupliquer" + +#: application/controllers/IdxController.php:180 +msgid "You have an unsaved route" +msgstr "Vous avez un itinéraire non sauvegardé" + +#: application/controllers/IdxController.php:181 +#: application/controllers/AccountController.php:68 +#: application/controllers/ContactController.php:119 +#: application/controllers/NewpwdController.php:66 +msgid "Value is required" +msgstr "Le champ est requis" + +#: application/controllers/IdxController.php:182 +msgid "no result" +msgstr "pas de résultat" + +#: application/controllers/IdxController.php:183 +msgid "could not analyze file content" +msgstr "impossible d'analyser le contenu du fichier" + +#: application/controllers/AccountController.php:13 +#: application/layouts/scripts/footer.phtml:38 +msgid "my account" +msgstr "mon compte" + +#: application/controllers/AccountController.php:28 +msgid "Wrong password" +msgstr "Mauvais mot de passe" + +#: application/controllers/AccountController.php:70 +#: application/forms/Account.php:33 application/forms/User.php:20 +#, php-format +msgid "At least %d characters" +msgstr "Au moins %d caractères" + +#: application/controllers/AccountController.php:71 +msgid "You have made no change" +msgstr "Vous n'avez fait aucun changement" + +#: application/controllers/TermsofuseController.php:9 +#: application/forms/User.php:44 application/forms/Geom.php:39 +#: application/layouts/scripts/footer.phtml:86 +msgid "terms of use" +msgstr "conditions d'utilisation" + +#: application/controllers/ContactController.php:11 +msgid "contact form" +msgstr "formulaire de contact" + +#: application/controllers/ContactController.php:110 +msgid "Hi," +msgstr "Bonjour," + #: application/controllers/ContactController.php:120 +#: application/forms/Contact.php:32 application/validate/EmailAddress.php:13 msgid "Invalid email" msgstr "Email invalide" -#: application/forms/Newpwd.php:28 +#: application/controllers/PendingController.php:31 +msgid "account validated" +msgstr "compte validé" + +#: application/controllers/PendingController.php:38 +msgid "account deleted" +msgstr "Compte supprimé" + +#: application/controllers/PendingController.php:42 +msgid "account creation validation" +msgstr "validation de la création du compte" + +#: application/controllers/PendingController.php:52 +msgid "password changed" +msgstr "mot de passe modifié" + +#: application/controllers/PendingController.php:60 +msgid "request canceled" +msgstr "requête annulée" + +#: application/controllers/PendingController.php:64 +msgid "password reset validation" +msgstr "validation de la réinitialisation du mot de passe" + +#: application/controllers/LoginController.php:8 +#: application/forms/Login.php:23 application/views/scripts/idx/index.phtml:49 +#: application/layouts/scripts/footer.phtml:73 +msgid "login" +msgstr "connexion" + +#: application/forms/Newpwd.php:28 application/forms/Account.php:27 #: application/forms/User.php:36 -#: application/forms/Account.php:27 msgid "email" msgstr "email" @@ -63,57 +323,15 @@ msgstr "Envoyer" msgid "Send a message" msgstr "Envoyer un message" -#: application/forms/User.php:10 -msgid "only letters, numbers, underscores or dots" -msgstr "seulement des lettres, des chiffres, des soulignés ou des points" - -#: application/forms/User.php:12 -msgid "user name" -msgstr "nom d'utilisateur" - -#: application/forms/User.php:20 -#: application/forms/Account.php:33 -#: application/controllers/AccountController.php:70 +#: application/forms/Pending/ValidateCreation.php:11 #, php-format -msgid "At least %d characters" -msgstr "Au moins %d caractères" - -#: application/forms/User.php:23 -#: application/forms/Account.php:35 -#: application/forms/Login.php:10 -msgid "password" -msgstr "mot de passe" - -#: application/forms/User.php:30 -#: application/forms/Account.php:42 -msgid "confirm password" -msgstr "confirmation du mot de passe" - -#: application/forms/User.php:37 -msgid "After creating your account, you will receive a confirmation email. You have 7 days to confirm otherwise, your account will 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 sera supprimé." - -#: application/forms/User.php:44 -#: application/forms/Geom.php:39 -#: application/layouts/scripts/footer.phtml:86 -#: application/controllers/TermsofuseController.php:9 -msgid "terms of use" -msgstr "conditions d'utilisation" - -#: application/forms/User.php:46 -#: application/forms/Geom.php:41 -#, php-format -msgid "I've read and accepted %s" -msgstr "J'ai lu et accepté les %s" - -#: application/forms/User.php:59 -msgid "create account" -msgstr "créer le compte" - -#: application/forms/Pending/ValidateCreation.php:11 -#, php-format -msgid "Someone, probably you, has registered an account %s with email address %s on syj. To confirm this account creation, validate with following button." -msgstr "Quelqu'un, probablement vous, a enregistré un compte %s avec l'adresse email %s sur syj. Pour confirmer la création du compte, validez avec le bouton suivant." +msgid "" +"Someone, probably you, has registered an account %s with email address %s on " +"syj. To confirm this account creation, validate with following button." +msgstr "" +"Quelqu'un, probablement vous, a enregistré un compte %s avec l'adresse email " +"%s sur syj. Pour confirmer la création du compte, validez avec le bouton " +"suivant." #: application/forms/Pending/ValidateCreation.php:17 #: application/forms/Geom.php:50 @@ -126,27 +344,43 @@ msgid "delete" msgstr "supprimer" #: application/forms/Pending/ValidateCreation.php:24 -msgid "To cancel account creation, press following button. The account and all its data will be deleted." -msgstr "Pour annuler la création du compte, pressez le bouton suivant. Le compte ainsi que toutes ses données seront supprimés." +msgid "" +"To cancel account creation, press following button. The account and all its " +"data will be deleted." +msgstr "" +"Pour annuler la création du compte, pressez le bouton suivant. Le compte " +"ainsi que toutes ses données seront supprimés." #: application/forms/Pending/ResetPassword.php:11 #, php-format -msgid "Hi %s. Someone, probably you, has asked to reset password for your account. To get a new password, validate with following button." -msgstr "Bonjour %s. Quelqu'un, probablement vous, a demandé de réinitialiser le mot de passe de votre compte. Pour avoir un nouveau mot de passe, validez avec le bouton suivant." +msgid "" +"Hi %s. Someone, probably you, has asked to reset password for your account. " +"To get a new password, validate with following button." +msgstr "" +"Bonjour %s. Quelqu'un, probablement vous, a demandé de réinitialiser le mot " +"de passe de votre compte. Pour avoir un nouveau mot de passe, validez avec " +"le bouton suivant." #: application/forms/Pending/ResetPassword.php:23 msgid "cancel request" msgstr "annuler la requête" #: application/forms/Pending/ResetPassword.php:24 -msgid "To cancel this request, press following button. Your password will not change." -msgstr "Pour annuler la requête, pressez le bouton suivant. Votre mot de passe ne sera pas changé." +msgid "" +"To cancel this request, press following button. Your password will not " +"change." +msgstr "" +"Pour annuler la requête, pressez le bouton suivant. Votre mot de passe ne " +"sera pas changé." -#: application/forms/Account.php:40 -#: application/controllers/IdxController.php:162 -#: application/controllers/AccountController.php:69 -msgid "Password do not match" -msgstr "Les mots de passe ne correspondent pas" +#: application/forms/Account.php:35 application/forms/User.php:23 +#: application/forms/Login.php:10 +msgid "password" +msgstr "mot de passe" + +#: application/forms/Account.php:42 application/forms/User.php:30 +msgid "confirm password" +msgstr "confirmation du mot de passe" #: application/forms/Account.php:48 msgid "current password" @@ -156,6 +390,31 @@ msgstr "mot de passe actuel" msgid "modify my informations" msgstr "modifier mes informations" +#: application/forms/User.php:10 +msgid "only letters, numbers, underscores or dots" +msgstr "seulement des lettres, des chiffres, des soulignés ou des points" + +#: application/forms/User.php:12 +msgid "user name" +msgstr "nom d'utilisateur" + +#: application/forms/User.php:37 +msgid "" +"After creating your account, you will receive a confirmation email. You have " +"7 days to confirm otherwise, your account will 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 sera supprimé." + +#: application/forms/User.php:46 application/forms/Geom.php:41 +#, php-format +msgid "I've read and accepted %s" +msgstr "J'ai lu et accepté les %s" + +#: application/forms/User.php:59 +msgid "create account" +msgstr "créer le compte" + #: application/forms/Login.php:9 msgid "user" msgstr "utilisateur" @@ -168,13 +427,6 @@ msgstr "se souvenir de moi" msgid "I forgot my password" msgstr "J'ai oublié mon mot de passe" -#: application/forms/Login.php:23 -#: application/views/scripts/idx/index.phtml:49 -#: application/layouts/scripts/footer.phtml:73 -#: application/controllers/LoginController.php:8 -msgid "login" -msgstr "connexion" - #: application/forms/Geom.php:17 msgid "Draw journey on the map or choose one from a file" msgstr "Tracez l'itinéraire sur la carte ou choisissez un fichier" @@ -183,165 +435,30 @@ msgstr "Tracez l'itinéraire sur la carte ou choisissez un fichier" msgid "optional title for this journey" msgstr "titre facultatif pour ce trajet" -#: application/models/Pending/ValidateCreation.php:15 -msgid "[SYJ] Please validate your account" -msgstr "[SYJ] Veuillez valider la création du compte" - -#: application/models/Pending/ValidateCreation.php:16 -msgid "" -"Hi %user%, and welcome on syj\n" -"\n" -"Your account is currently active, but you need to confirm your inscription by\n" -"following this link:\n" -"%hashurl%\n" -"\n" -"If you do not not confirm your inscription within 7 days, your account will be\n" -"deleted.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" -msgstr "" -"Bonjour %user%, et bienvenue sur syj\n" -"\n" -"Votre compte est actif, mais vous devez confirmer votre inscription en\n" -"suivant ce lien:\n" -"%hashurl%\n" -"\n" -"Si vous ne confirmez pas votre inscription d'ici 7 jours, votre compte sera\n" -"supprimé.\n" -"\n" -"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous contacter,\n" -"merci d'utiliser le formulaire à l'adresse suivante:\n" -"%contacturl%\n" -"\n" -"Merci,\n" -"\n" -"l'équipe de Syj" - -#: application/models/Pending/ValidateCreation.php:34 -msgid "[SYJ] Reminder: Validate your account" -msgstr "[SYJ] Rappel: Validation de votre compte" - -#: application/models/Pending/ValidateCreation.php:35 -msgid "" -"Hi %user%,\n" -"\n" -"You need to validate your account on syj since 6 days. Otherwise, your\n" -"account will be deleted tomorrow. Please follow this link:\n" -"%hashurl%\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" -msgstr "" -"Bonjour %user%,\n" -"\n" -"Votre compte est en attente de validation depuis 6 jours. Si vous ne le\n" -"validez pas, il sera supprimé demain. Merci de suivre ce lien:\n" -"%hashurl%\n" -"\n" -"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous contacter,\n" -"merci d'utiliser le formulaire à l'adresse suivante:\n" -"%contacturl%\n" -"\n" -"Merci\n" -"\n" -"L'équipe de Syj" - -#: application/models/Pending/ValidateCreation.php:51 -msgid "[SYJ] Account deactivated" -msgstr "[SYJ] Compte désactivé" - -#: application/models/Pending/ValidateCreation.php:52 -msgid "" -"Hi %user%,\n" -"\n" -"You have not validated your syj account on time. Therefore, your account have\n" -"been deleted. Nevertheless, you can still create a new account.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Regards,\n" -"\n" -"Syj team" -msgstr "" -"Bonjour %user%,\n" -"\n" -"Vous n'avez pas validé votre compte à temps. Votre compte a donc été supprimé.\n" -"Vous pouvez toujours recréer un nouveau compte.\n" -"\n" -"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous contacter,\n" -"merci d'utiliser le formulaire à l'adresse suivante:\n" -"%contacturl%\n" -"\n" -"L'équipe de Syj" - -#: application/models/Pending/ResetPassword.php:19 -msgid "[SYJ] Reset your password" -msgstr "[SYJ] Réinitialisation de votre mot de passe" - -#: application/models/Pending/ResetPassword.php:20 -msgid "" -"Hi %user%,\n" -"\n" -"Someone, probably you, has asked to reset your password. If you want to reset\n" -"your password, please follow this link:\n" -"%hashurl%\n" -"\n" -"If you do not not confirm within 2 days, your password will not be reset.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" -msgstr "" -"Bonjour %user%,\n" -"\n" -"Quelqu'un, probablement vous, a demandé à réinitialiser votre mot de\n" -"passe. Si vous voulez le réinitialiser, veuillez suivre ce lien:\n" -"%hashurl%\n" -"\n" -"Si vous n'avez pas confirmé d'ici 2 jours, votre mot de passe ne sera pas\n" -"réinitialisé.\n" -"\n" -"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous contacter,\n" -"merci d'utiliser le formulaire à l'adresse suivante:\n" -"%contacturl%\n" -"\n" -"Merci,\n" -"\n" -"l'équipe de Syj" +#: application/views/helpers/LocaleSwitcher.php:17 +msgid "english" +msgstr "français" -#: application/models/Path.php:61 -#, php-format -msgid "route number %d" -msgstr "itinéraire numéro %d" +#: application/views/helpers/LogoutLink.php:9 +#: application/layouts/scripts/footer.phtml:66 +msgid "logout" +msgstr "déconnexion" #: application/views/helpers/Returnto.php:22 #: application/views/helpers/Returnto.php:25 #: application/views/helpers/Returnto.php:28 -#: application/views/scripts/pending/creation_cancel.phtml:14 #: application/views/scripts/pending/creation_validate.phtml:14 +#: application/views/scripts/pending/creation_cancel.phtml:14 #: application/views/scripts/pending/password_cancel.phtml:14 msgid "You can now" msgstr "Vous pouvez maintenant" #: application/views/helpers/Returnto.php:23 #: application/views/helpers/Returnto.php:31 -#: application/views/scripts/error/error.phtml:37 -#: application/views/scripts/pending/creation_cancel.phtml:15 #: application/views/scripts/pending/creation_validate.phtml:15 +#: application/views/scripts/pending/creation_cancel.phtml:15 #: application/views/scripts/pending/password_cancel.phtml:15 +#: application/views/scripts/error/error.phtml:37 msgid "go to main page" msgstr "aller à la page d'accueil" @@ -355,52 +472,122 @@ msgstr "retourner à %s" msgid "or you can" msgstr "ou vous pouvez" -#: application/views/helpers/LocaleSwitcher.php:17 -msgid "english" -msgstr "français" +#: application/views/scripts/account/success.phtml:4 +msgid "Your account was modified successfully" +msgstr "Votre compte a bien été modifié." -#: application/views/helpers/LogoutLink.php:9 -#: application/layouts/scripts/footer.phtml:66 -msgid "logout" -msgstr "déconnexion" +#: application/views/scripts/pending/index.phtml:16 +msgid "If you need more informations, please" +msgstr "Si vous avez besoin de plus d'informations, veuillez" -#: application/views/scripts/faq/index.phtml:5 -#: application/controllers/FaqController.php:9 -msgid "Frequently asked questions" -msgstr "Foire aux questions" +#: application/views/scripts/pending/index.phtml:17 +msgid "contact us" +msgstr "nous contacter" -#: application/views/scripts/faq/index.phtml:6 -msgid "What's syj?" -msgstr "Qu'est-ce que syj ?" +#: application/views/scripts/pending/creation_validate.phtml:12 +msgid "You have validated your account." +msgstr "Vous avez validé votre compte." -#: application/views/scripts/faq/index.phtml:7 -msgid "Syj is a website to share routes. You draw a route on a map background, and then, you get an link to share it. You can then show clever bicycle rides, your last hiking, or any route you want." -msgstr "Syj est un site de partage d'itinéraires. Vous dessinez un itinéraire sur un fond de carte, et vous obtenez un lien pour le partager. Vous pouvez l'utiliser pour montrer des trajets de randonnée, des itinéraires cyclistes malins, ou n'importe quoi d'autre." +#: application/views/scripts/pending/creation_cancel.phtml:12 +msgid "You have canceled the account." +msgstr "Vous avez annulé le compte." -#: application/views/scripts/faq/index.phtml:9 -msgid "How do I modify a route?" -msgstr "Comment modifier un itinéraire ?" +#: application/views/scripts/pending/password_cancel.phtml:12 +msgid "You have canceled the request." +msgstr "Vous avez annulé la requête." -#: application/views/scripts/faq/index.phtml:10 +#: application/views/scripts/pending/password_validate.phtml:17 +msgid "log in" +msgstr "vous connecter" + +#: application/views/scripts/pending/password_validate.phtml:15 #, php-format -msgid "When you're editing a route, you can drag and drop a point to move it. If you want to delete it, you need to press the Shift key. While you hold the button, points will have an icon%s over them. Clicking that icon will delete the point." -msgstr "Lorsque vous éditez un itinéraire, vous pouvez le bouger en le glissant-déposant. Si vous voulez le supprimer, vous devez appuyer sur la touche Shift. Lorsque la touche est enfoncée, une icône%s va apparaître au-dessus des points. Cliquez sur l'icône pour supprimer un point." +msgid "" +"Your new password is now %s. You can %s with this new " +"password. Don't forget to change it again to a personal password as soon as " +"possible." +msgstr "" +"Votre nouveau mot de passe est %s. Vous pouvez %s avec le " +"nouveau mot de passe. N'oubliez pas de le rechanger le plus tôt possible " +"pour utiliser un mot de passe personnel." -#: application/views/scripts/faq/index.phtml:12 -msgid "Why should I create a account?" -msgstr "Pourquoi créer un compte ?" +#: application/views/scripts/contact/index.phtml:8 +#, php-format +msgid "" +"There was an unkwown message when sending the message. Please try again " +"later, or send a mail directly to %s" +msgstr "" +"Il s'est produit une erreur inconnue lors de l'envoi du message. Merci de " +"réessayer plus tard, ou d'écrire directement à %s" -#: application/views/scripts/faq/index.phtml:13 -msgid "You can create routes without a account. But if you want to modify your routes afterwards, you need to be registered when creating the route." -msgstr "Vous pouvez créer des itinéraires sans avoir de compte. Mais si vous voulez modifier les itinéraires que vous avez créé, vous devez avoir un compte lors de leur création." +#: application/views/scripts/contact/success.phtml:4 +msgid "Email was send successfully" +msgstr "L'email a été envoyé avec succès" -#: application/views/scripts/faq/index.phtml:15 -msgid "Is it possible to have my route \"attach\" nearby paths?" -msgstr "Est-ce que c'est possible d' Â« accrocher Â» les routes ?" +#: 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 exemple, des itinéraires de randonnées, des " +"trajets cyclistes, des itinéraires de voyages, ou n'importe quoi d'autre." -#: application/views/scripts/faq/index.phtml:16 -msgid "When you create a route with syj, you must draw each point on the map. If your route follows an existing path, you still need to draw the layer manually: syj will not try to attach nearby existing paths. There are three main reasons. One bad reason: it would a lot of work to implement. And two good reasons: syj uses OpenStreetMap as a background map, and the map is still unfinished in many areas. Also, depending on your route, you may wish to attach to motorways, footways, biycle lanes, railways, …. If you are in a place with lot of differents routes, it would be nearly impossible to always choose the right way." -msgstr "Lorsque vous créez un itinéraire avec syj, vous devez placer chaque point sur la carte. Si votre itinéraire suit un chemin, vous devez quand même dessiner la surcouche à la main : syj ne va pas chercher à accrocher les chemins proches. Il y a trois raisons principales à cela. Une mauvaise raison : cela demanderait beaucoup de travail à mettre en place. Et deux bonnes raisons : syj utilise OpenStreetMap comme fond de carte. Or, il y a beaucoup d'endroits où cette carte est incomplète. D'autre part, selon l'itinéraire, vous voudriez accrocher l'autoroute, ou bien les chemins piétons, ou les pistes cyclables, ou les rails de tramway, …. Si vous êtes dans un endroit avec différents types de routes, syj n'arrivera probablement pas à choisir la bonne route." +#: 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: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: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: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:25 +msgid "" +"Sources of the software running the website are publicly available under a agpl license. The " +"map used to display the routes comes from openstreetmap." +msgstr "" +"Les sources du logiciel qui fait tourner le site web sont disponibles publiquement sous une licence " +"agpl. La carte utilisée pour l'affichage des itinéraires vient d'openstreetmap." #: application/views/scripts/error/error.phtml:5 msgid "An error occurred" @@ -410,19 +597,103 @@ msgstr "Il s'est produit une erreur" msgid "Please try again later" msgstr "Veuillez réessayer plus tard" +#: application/views/scripts/faq/index.phtml:6 +msgid "What's syj?" +msgstr "Qu'est-ce que syj ?" + +#: application/views/scripts/faq/index.phtml:7 +msgid "" +"Syj is a website to share " +"routes. You draw a route on a map background, and then, you get an link to " +"share it. You can then show clever bicycle rides, your last hiking, or any " +"route you want." +msgstr "" +"Syj est un site de partage " +"d'itinéraires. Vous dessinez un itinéraire sur un fond de carte, et vous " +"obtenez un lien pour le partager. Vous pouvez l'utiliser pour montrer des " +"trajets de randonnée, des itinéraires cyclistes malins, ou n'importe quoi " +"d'autre." + +#: application/views/scripts/faq/index.phtml:9 +msgid "How do I modify a route?" +msgstr "Comment modifier un itinéraire ?" + +#: application/views/scripts/faq/index.phtml:10 +#, php-format +msgid "" +"When you're editing a route, you can drag and drop a point to move it. If " +"you want to delete it, you need to press the Shift key. While you hold the " +"button, points will have an icon%s over them. Clicking that icon will delete " +"the point." +msgstr "" +"Lorsque vous éditez un itinéraire, vous pouvez le bouger en le glissant-" +"déposant. Si vous voulez le supprimer, vous devez appuyer sur la touche " +"Shift. Lorsque la touche est enfoncée, une icône%s va apparaître au-dessus " +"des points. Cliquez sur l'icône pour supprimer un point." + +#: application/views/scripts/faq/index.phtml:12 +msgid "Why should I create a account?" +msgstr "Pourquoi créer un compte ?" + +#: application/views/scripts/faq/index.phtml:13 +msgid "" +"You can create routes without a account. But if you want to modify your " +"routes afterwards, you need to be registered when creating the route." +msgstr "" +"Vous pouvez créer des itinéraires sans avoir de compte. Mais si vous voulez " +"modifier les itinéraires que vous avez créé, vous devez avoir un compte lors " +"de leur création." + +#: application/views/scripts/faq/index.phtml:15 +msgid "Is it possible to have my route \"attach\" nearby paths?" +msgstr "Est-ce que c'est possible d' Â« accrocher Â» les routes ?" + +#: application/views/scripts/faq/index.phtml:16 +msgid "" +"When you create a route with syj, you must draw each point on the map. If " +"your route follows an existing path, you still need to draw the layer " +"manually: syj will not try to attach nearby existing paths. There are three " +"main reasons. One bad reason: it would a lot of work to implement. And two " +"good reasons: syj uses OpenStreetMap as a background map, and the map is " +"still unfinished in many areas. Also, depending on your route, you may wish " +"to attach to motorways, footways, biycle lanes, railways, …. If you " +"are in a place with lot of differents routes, it would be nearly impossible " +"to always choose the right way." +msgstr "" +"Lorsque vous créez un itinéraire avec syj, vous devez placer chaque point " +"sur la carte. Si votre itinéraire suit un chemin, vous devez quand même " +"dessiner la surcouche à la main : syj ne va pas chercher à accrocher " +"les chemins proches. Il y a trois raisons principales à cela. Une mauvaise " +"raison : cela demanderait beaucoup de travail à mettre en place. Et " +"deux bonnes raisons : syj utilise OpenStreetMap comme fond de carte. " +"Or, il y a beaucoup d'endroits où cette carte est incomplète. D'autre part, " +"selon l'itinéraire, vous voudriez accrocher l'autoroute, ou bien les chemins " +"piétons, ou les pistes cyclables, ou les rails de tramway, …. Si vous " +"êtes dans un endroit avec différents types de routes, syj n'arrivera " +"probablement pas à choisir la bonne route." + #: application/views/scripts/idx/raw.phtml:8 #: application/views/scripts/idx/index.phtml:8 #: application/views/scripts/list/index.phtml:8 msgid "SYJ needs javascript. Please activate scripts in your browser." -msgstr "SYJ a besoin de javascript pour fonctionner. Veuillez activer les scripts dans votre navigateur." +msgstr "" +"SYJ a besoin de javascript pour fonctionner. Veuillez activer les scripts " +"dans votre navigateur." #: application/views/scripts/idx/index.phtml:21 -msgid "To create a journey, press \"start a route\" button, then click on the map to add points. To delete a point, hold shift pressed while clicking on it." -msgstr "Pour créer un trajet, pressez le bouton \"commencer un itinéraire\" puis cliquez sur la carte pour ajouter des points à votre tracé. Pour supprimer un point, maintenant shift enfoncé en cliquant sur ce point." +msgid "" +"To create a journey, press \"start a route\" button, then " +"click on the map to add points. To delete a point, hold shift pressed while " +"clicking on it." +msgstr "" +"Pour créer un trajet, pressez le bouton \"commencer un itinéraire\" puis cliquez sur la carte pour ajouter des points à votre tracé. " +"Pour supprimer un point, maintenant shift enfoncé en cliquant sur ce point." #: application/views/scripts/idx/index.phtml:23 msgid "You can zoom and move the map with the controls in the top left corner." -msgstr "Vous pouvez zoomer et bouger la carte avec les boutons en haut à gauche." +msgstr "" +"Vous pouvez zoomer et bouger la carte avec les boutons en haut à gauche." #: application/views/scripts/idx/index.phtml:25 msgid "When you have finished a path, press \"create\", button." @@ -433,7 +704,7 @@ msgid "route length" msgstr "longueur du tracé" #: application/views/scripts/idx/index.phtml:51 -#: application/views/scripts/idx/index.phtml:169 +#: application/views/scripts/idx/index.phtml:170 msgid "create an account" msgstr "créer un compte" @@ -454,75 +725,32 @@ msgstr "lien direct" msgid "export" msgstr "export" -#: application/views/scripts/idx/index.phtml:91 #: application/views/scripts/idx/index.phtml:92 +#: application/views/scripts/idx/index.phtml:93 msgid "kml export" msgstr "export kml" -#: application/views/scripts/idx/index.phtml:98 #: application/views/scripts/idx/index.phtml:99 +#: application/views/scripts/idx/index.phtml:100 msgid "gpx export" msgstr "export gpx" -#: application/views/scripts/idx/index.phtml:112 -#: application/controllers/IdxController.php:177 -msgid "duplicate" -msgstr "dupliquer" - -#: application/views/scripts/idx/index.phtml:114 -#: application/controllers/IdxController.php:175 -msgid "edit" -msgstr "modifier" - -#: application/views/scripts/idx/index.phtml:118 +#: application/views/scripts/idx/index.phtml:119 msgid "Search a place" msgstr "Rechercher un lieu" -#: application/views/scripts/idx/index.phtml:122 +#: application/views/scripts/idx/index.phtml:123 msgid "Ok" msgstr "Ok" -#: application/views/scripts/idx/index.phtml:128 +#: application/views/scripts/idx/index.phtml:129 msgid "start a route" msgstr "commencer un itinéraire" -#: application/views/scripts/idx/index.phtml:140 +#: application/views/scripts/idx/index.phtml:141 msgid "more results" msgstr "plus de résultats" -#: 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 exemple, 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: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: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: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: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:25 -msgid "Sources of the software running the website are publicly available under a agpl license. The map used to display the routes comes from openstreetmap." -msgstr "Les sources du logiciel qui fait tourner le site web sont disponibles publiquement sous une licence agpl. La carte utilisée pour l'affichage des itinéraires vient d'openstreetmap." - -#: application/views/scripts/contact/success.phtml:4 -msgid "Email was send successfully" -msgstr "L'email a été envoyé avec succès" - -#: application/views/scripts/contact/index.phtml:8 -#, php-format -msgid "There was an unkwown message when sending the message. Please try again later, or send a mail directly to %s" -msgstr "Il s'est produit une erreur inconnue lors de l'envoi du message. Merci de réessayer plus tard, ou d'écrire directement à %s" - #: application/views/scripts/list/index.phtml:13 #: application/layouts/scripts/footer.phtml:16 msgid "create a route" @@ -553,257 +781,171 @@ msgstr "dernière page" msgid "modify or duplicate" msgstr "modifier ou dupliquer" -#: application/views/scripts/account/success.phtml:4 -msgid "Your account was modified successfully" -msgstr "Votre compte a bien été modifié." +#: application/models/Pending/ValidateCreation.php:15 +msgid "[SYJ] Please validate your account" +msgstr "[SYJ] Veuillez valider la création du compte" -#: application/views/scripts/newpwd/success.phtml:4 -#: application/controllers/IdxController.php:168 -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é" +#: application/models/Pending/ValidateCreation.php:16 +msgid "" +"Hi %user%, and welcome on syj\n" +"\n" +"Your account is currently active, but you need to confirm your inscription " +"by\n" +"following this link:\n" +"%hashurl%\n" +"\n" +"If you do not not confirm your inscription within 7 days, your account will " +"be\n" +"deleted.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" +msgstr "" +"Bonjour %user%, et bienvenue sur syj\n" +"\n" +"Votre compte est actif, mais vous devez confirmer votre inscription en\n" +"suivant ce lien:\n" +"%hashurl%\n" +"\n" +"Si vous ne confirmez pas votre inscription d'ici 7 jours, votre compte sera\n" +"supprimé.\n" +"\n" +"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous " +"contacter,\n" +"merci d'utiliser le formulaire à l'adresse suivante:\n" +"%contacturl%\n" +"\n" +"Merci,\n" +"\n" +"l'équipe de Syj" -#: application/views/scripts/pending/creation_cancel.phtml:12 -msgid "You have canceled the account." -msgstr "Vous avez annulé le compte." +#: application/models/Pending/ValidateCreation.php:34 +msgid "[SYJ] Reminder: Validate your account" +msgstr "[SYJ] Rappel: Validation de votre compte" -#: application/views/scripts/pending/creation_validate.phtml:12 -msgid "You have validated your account." -msgstr "Vous avez validé votre compte." +#: application/models/Pending/ValidateCreation.php:35 +msgid "" +"Hi %user%,\n" +"\n" +"You need to validate your account on syj since 6 days. Otherwise, your\n" +"account will be deleted tomorrow. Please follow this link:\n" +"%hashurl%\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" +msgstr "" +"Bonjour %user%,\n" +"\n" +"Votre compte est en attente de validation depuis 6 jours. Si vous ne le\n" +"validez pas, il sera supprimé demain. Merci de suivre ce lien:\n" +"%hashurl%\n" +"\n" +"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous " +"contacter,\n" +"merci d'utiliser le formulaire à l'adresse suivante:\n" +"%contacturl%\n" +"\n" +"Merci\n" +"\n" +"L'équipe de Syj" -#: application/views/scripts/pending/password_validate.phtml:17 -msgid "log in" -msgstr "vous connecter" +#: application/models/Pending/ValidateCreation.php:51 +msgid "[SYJ] Account deactivated" +msgstr "[SYJ] Compte désactivé" -#: application/views/scripts/pending/password_validate.phtml:15 -#, php-format -msgid "Your new password is now %s. You can %s with this new password. Don't forget to change it again to a personal password as soon as possible." -msgstr "Votre nouveau mot de passe est %s. Vous pouvez %s avec le nouveau mot de passe. N'oubliez pas de le rechanger le plus tôt possible pour utiliser un mot de passe personnel." +#: application/models/Pending/ValidateCreation.php:52 +msgid "" +"Hi %user%,\n" +"\n" +"You have not validated your syj account on time. Therefore, your account " +"have\n" +"been deleted. Nevertheless, you can still create a new account.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Regards,\n" +"\n" +"Syj team" +msgstr "" +"Bonjour %user%,\n" +"\n" +"Vous n'avez pas validé votre compte à temps. Votre compte a donc été " +"supprimé.\n" +"Vous pouvez toujours recréer un nouveau compte.\n" +"\n" +"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous " +"contacter,\n" +"merci d'utiliser le formulaire à l'adresse suivante:\n" +"%contacturl%\n" +"\n" +"L'équipe de Syj" -#: application/views/scripts/pending/password_cancel.phtml:12 -msgid "You have canceled the request." -msgstr "Vous avez annulé la requête." +#: application/models/Pending/ResetPassword.php:19 +msgid "[SYJ] Reset your password" +msgstr "[SYJ] Réinitialisation de votre mot de passe" -#: application/views/scripts/pending/index.phtml:16 -msgid "If you need more informations, please" -msgstr "Si vous avez besoin de plus d'informations, veuillez" +#: application/models/Pending/ResetPassword.php:20 +msgid "" +"Hi %user%,\n" +"\n" +"Someone, probably you, has asked to reset your password. If you want to " +"reset\n" +"your password, please follow this link:\n" +"%hashurl%\n" +"\n" +"If you do not not confirm within 2 days, your password will not be reset.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" +msgstr "" +"Bonjour %user%,\n" +"\n" +"Quelqu'un, probablement vous, a demandé à réinitialiser votre mot de\n" +"passe. Si vous voulez le réinitialiser, veuillez suivre ce lien:\n" +"%hashurl%\n" +"\n" +"Si vous n'avez pas confirmé d'ici 2 jours, votre mot de passe ne sera pas\n" +"réinitialisé.\n" +"\n" +"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous " +"contacter,\n" +"merci d'utiliser le formulaire à l'adresse suivante:\n" +"%contacturl%\n" +"\n" +"Merci,\n" +"\n" +"l'équipe de Syj" -#: application/views/scripts/pending/index.phtml:17 -msgid "contact us" -msgstr "nous contacter" +#: application/models/Path.php:61 +#, php-format +msgid "route number %d" +msgstr "itinéraire numéro %d" #: application/layouts/scripts/footer.phtml:27 msgid "contact" msgstr "contact" -#: application/layouts/scripts/footer.phtml:38 -#: application/controllers/AccountController.php:13 -msgid "my account" -msgstr "mon compte" - -#: application/layouts/scripts/footer.phtml:52 -#: application/controllers/ListController.php:14 -msgid "my routes" -msgstr "mes itinéraires" - #: application/layouts/scripts/footer.phtml:96 msgid "help" msgstr "aide" -#: application/controllers/PendingController.php:31 -msgid "account validated" -msgstr "compte validé" - -#: application/controllers/PendingController.php:38 -msgid "account deleted" -msgstr "Compte supprimé" - -#: application/controllers/PendingController.php:42 -msgid "account creation validation" -msgstr "validation de la création du compte" - -#: application/controllers/PendingController.php:52 -msgid "password changed" -msgstr "mot de passe modifié" - -#: application/controllers/PendingController.php:60 -msgid "request canceled" -msgstr "requête annulée" - -#: application/controllers/PendingController.php:64 -msgid "password reset validation" -msgstr "validation de la réinitialisation du mot de passe" - -#: application/controllers/NewpwdController.php:66 -#: application/controllers/IdxController.php:179 -#: application/controllers/ContactController.php:119 -#: application/controllers/AccountController.php:68 -msgid "Value is required" -msgstr "Le champ est requis" - -#: application/controllers/IdxController.php:24 -#: application/controllers/IdxController.php:71 -#, php-format -msgid "route by %s" -msgstr "tracé par %s" - -#: application/controllers/IdxController.php:43 -msgid "route has been deleted" -msgstr "l'itinéraire a été supprimé" - -#: application/controllers/IdxController.php:46 -msgid "route does not exist" -msgstr "L'itinéraire n'existe pas" - -#: application/controllers/IdxController.php:74 -#: application/controllers/IdxController.php:107 -msgid "website to share routes" -msgstr "site de partage d'itinéraires" - -#: application/controllers/IdxController.php:116 -#, php-format -msgid "File too large. File size must not exceed %s" -msgstr "Fichier trop gros. La taille ne doit pas dépasser %s" - -#: application/controllers/IdxController.php:118 -msgid "Invalid file" -msgstr "Fichier invalide" - -#: application/controllers/IdxController.php:146 -#: application/controllers/IdxController.php:171 -msgid "Map by OpenStreetMap" -msgstr "Carte par OpenStreetMap" - -#: application/controllers/IdxController.php:152 -msgid "save took place successfully" -msgstr "La sauvegarde s'est déroulée correctement" - -#: application/controllers/IdxController.php:153 -#: application/controllers/ListController.php:33 -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/IdxController.php:154 -#: application/controllers/ListController.php:34 -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/IdxController.php:155 -#: application/controllers/ListController.php:32 -msgid "server could not be reached" -msgstr "serveur inaccessible" - -#: application/controllers/IdxController.php:156 -#: application/controllers/ListController.php:35 -msgid "there was a server error" -msgstr "Il s'est produit une erreur serveur" - -#: application/controllers/IdxController.php:157 -#: application/controllers/ListController.php:36 -msgid "there was an unknown error" -msgstr "Il s'est produit une erreur inconnue" - -#: application/controllers/IdxController.php:158 -#: application/controllers/LoginController.php:89 -msgid "you must enter a login name" -msgstr "vous devez entrer un nom d'utilisateur" - -#: application/controllers/IdxController.php:159 -msgid "Login correct" -msgstr "Vous êtes connecté" - -#: application/controllers/IdxController.php:160 -msgid "Wrong login/password" -msgstr "Mauvais nom d'utilisateur ou mot de passe" - -#: application/controllers/IdxController.php:161 -msgid "you must enter a password" -msgstr "vous devez entrer un mot de passe" - -#: application/controllers/IdxController.php:163 -msgid "You must accept terms of use" -msgstr "Vous devez accepter les conditions d'utilisation" - -#: application/controllers/IdxController.php:164 -msgid "you must enter an email" -msgstr "vous devez entrer un email" - -#: application/controllers/IdxController.php:165 -msgid "invalid email" -msgstr "email invalide" - -#: application/controllers/IdxController.php:166 -#: application/controllers/AccountController.php:41 -msgid "an user is already registered with this email" -msgstr "il y'a déjà un utilisateur enregistré avec cet email" - -#: application/controllers/IdxController.php:167 -msgid "Account created" -msgstr "Compte créé" - -#: application/controllers/IdxController.php:169 -msgid "Now, you can retry to save" -msgstr "Maintenant, vous pouvez réessayer de sauvegarder" - -#: application/controllers/IdxController.php:170 -msgid "route by" -msgstr "tracé par" - -#: application/controllers/IdxController.php:172 -msgid "checking availibilty" -msgstr "vérification de la disponibilité" - -#: application/controllers/IdxController.php:173 -msgid "available pseudo" -msgstr "pseudo disponible" - -#: application/controllers/IdxController.php:174 -msgid "unavailable pseudo" -msgstr "pseudo non disponible" - -#: application/controllers/IdxController.php:176 -msgid "create" -msgstr "créér" - -#: application/controllers/IdxController.php:178 -msgid "You have an unsaved route" -msgstr "Vous avez un itinéraire non sauvegardé" - -#: application/controllers/IdxController.php:180 -msgid "no result" -msgstr "pas de résultat" - -#: application/controllers/IdxController.php:181 -msgid "could not analyze file content" -msgstr "impossible d'analyser le contenu du fichier" - -#: application/controllers/ContactController.php:11 -msgid "contact form" -msgstr "formulaire de contact" - -#: application/controllers/ContactController.php:110 -msgid "Hi," -msgstr "Bonjour," - -#: application/controllers/ListController.php:31 -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:37 -msgid "route was successfully deleted" -msgstr "l'itinéraire a été correctement supprimé" - -#: application/controllers/AccountController.php:28 -msgid "Wrong password" -msgstr "Mauvais mot de passe" - -#: application/controllers/AccountController.php:71 -msgid "You have made no change" -msgstr "Vous n'avez fait aucun changement" - -#: application/controllers/ErrorController.php:59 -msgid "Oups, something went wrong" -msgstr "Oups, il y a eu un souci" - #~ msgid "Welcome on Syj." #~ msgstr "Bienvenue sur Syj." diff --git a/application/languages/lang_ja.po b/application/languages/lang_ja.po index b335b41..daf53e4 100644 --- a/application/languages/lang_ja.po +++ b/application/languages/lang_ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: syj\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-08 16:25+0200\n" +"POT-Creation-Date: 2011-12-16 21:23+0100\n" "PO-Revision-Date: \n" "Last-Translator: S.Higashi \n" "Language: \n" @@ -10,13 +10,273 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: application/validate/EmailAddress.php:13 application/forms/Contact.php:32 +#: application/controllers/ErrorController.php:59 +msgid "Oups, something went wrong" +msgstr "おや、何かがおかしいですね" + +#: application/controllers/FaqController.php:9 +#: application/views/scripts/faq/index.phtml:5 +msgid "Frequently asked questions" +msgstr "FAQ" + +#: application/controllers/ListController.php:14 +#: application/layouts/scripts/footer.phtml:52 +msgid "my routes" +msgstr "自分のルート" + +#: application/controllers/ListController.php:31 +msgid "There is no undo. Delete this route definitively ?" +msgstr "やり直しはできません。本当にこのルートを削除しますか？" + +#: application/controllers/ListController.php:32 +#: application/controllers/IdxController.php:156 +msgid "server could not be reached" +msgstr "サーバに届かなかったようです" + +#: application/controllers/ListController.php:33 +#: application/controllers/IdxController.php:154 +msgid "" +"server did not understood request. That's probably caused by a bug in SYJ" +msgstr "サーバはリクエストを理解できませんでした。おそらくSYJのバグでしょう" + +#: application/controllers/ListController.php:34 +#: application/controllers/IdxController.php:155 +msgid "route not referenced on the server. It has probably been deleted." +msgstr "ルートはサーバ上で参照できませんでした。おそらく削除されています。" + +#: application/controllers/ListController.php:35 +#: application/controllers/IdxController.php:157 +msgid "there was a server error" +msgstr "サーバのエラーがありました" + +#: application/controllers/ListController.php:36 +#: application/controllers/IdxController.php:158 +msgid "there was an unknown error" +msgstr "不明なエラーがありました" + +#: application/controllers/ListController.php:37 +msgid "route was successfully deleted" +msgstr "ルートは削除されました" + +#: application/controllers/IdxController.php:24 +#: application/controllers/IdxController.php:71 +#, php-format +msgid "route by %s" +msgstr "%sのルート" + +#: application/controllers/IdxController.php:43 +msgid "route has been deleted" +msgstr "ルートは削除されました" + +#: application/controllers/IdxController.php:46 +msgid "route does not exist" +msgstr "ルートはありません" + +#: application/controllers/IdxController.php:74 +#: application/controllers/IdxController.php:107 +#, fuzzy +msgid "website to share routes" +msgstr "ルートを共有するウェブサイト" + +#: application/controllers/IdxController.php:116 +#, php-format +msgid "File too large. File size must not exceed %s" +msgstr "ファイルが大きすぎます。 %s 以下のサイズにしてください" + +#: application/controllers/IdxController.php:118 +#, fuzzy +msgid "Invalid file" +msgstr "不正なファイル" + +#: application/controllers/IdxController.php:146 +#: application/controllers/IdxController.php:172 +msgid "Map by OpenStreetMap" +msgstr "Map by OpenStreetMap" + +#: application/controllers/IdxController.php:147 +#: application/controllers/IdxController.php:173 +msgid "" +"Map by MapQuest, OpenStreetMap " +"and contributors, CC-BY-SA" +msgstr "" + +#: application/controllers/IdxController.php:153 +msgid "save took place successfully" +msgstr "保存されました" + +#: application/controllers/IdxController.php:159 +#: application/controllers/LoginController.php:89 +msgid "you must enter a login name" +msgstr "ログイン名を入力してください" + +#: application/controllers/IdxController.php:160 +msgid "Login correct" +msgstr "正常ログイン" + +#: application/controllers/IdxController.php:161 +msgid "Wrong login/password" +msgstr "誤ったログイン/パスワード" + +#: application/controllers/IdxController.php:162 +msgid "you must enter a password" +msgstr "パスワードを入力してください" + +#: application/controllers/IdxController.php:163 +#: application/controllers/AccountController.php:69 +#: application/forms/Account.php:40 +msgid "Password do not match" +msgstr "パスワードが一致しません" + +#: application/controllers/IdxController.php:164 +msgid "You must accept terms of use" +msgstr "利用条件を承諾してください" + +#: application/controllers/IdxController.php:165 +msgid "you must enter an email" +msgstr "メールアドレスを入力してください" + +#: application/controllers/IdxController.php:166 +msgid "invalid email" +msgstr "不正なメールアドレス" + +#: application/controllers/IdxController.php:167 +#: application/controllers/AccountController.php:41 +msgid "an user is already registered with this email" +msgstr "このメールアドレスのユーザが既に登録されています" + +#: application/controllers/IdxController.php:168 +msgid "Account created" +msgstr "アカウントを作成しました" + +#: application/controllers/IdxController.php:169 +#: application/views/scripts/newpwd/success.phtml:4 +msgid "A link to reset your password has been emailed to you" +msgstr "パスワードをリセットするためのURLがあなた宛に送られました" + +#: application/controllers/IdxController.php:170 +msgid "Now, you can retry to save" +msgstr "今は、保存をやり直すことができます" + +#: application/controllers/IdxController.php:171 +msgid "route by" +msgstr "ルート作成者" + +#: application/controllers/IdxController.php:174 +msgid "checking availibilty" +msgstr "利用可能かチェック中" + +#: application/controllers/IdxController.php:175 +msgid "available pseudo" +msgstr "利用出来るID" + +#: application/controllers/IdxController.php:176 +msgid "unavailable pseudo" +msgstr "利用できないID" + +#: application/controllers/IdxController.php:177 +#: application/views/scripts/idx/index.phtml:115 +msgid "edit" +msgstr "編集" + +#: application/controllers/IdxController.php:178 +msgid "create" +msgstr "作成" + +#: application/controllers/IdxController.php:179 +#: application/views/scripts/idx/index.phtml:113 +msgid "duplicate" +msgstr "複製" + +#: application/controllers/IdxController.php:180 +msgid "You have an unsaved route" +msgstr "保存されていないルートがあります" + +#: application/controllers/IdxController.php:181 +#: application/controllers/AccountController.php:68 +#: application/controllers/ContactController.php:119 +#: application/controllers/NewpwdController.php:66 +msgid "Value is required" +msgstr "値が必要です" + +#: application/controllers/IdxController.php:182 +msgid "no result" +msgstr "結果がありません" + +#: application/controllers/IdxController.php:183 +msgid "could not analyze file content" +msgstr "ファイル内容を分析できませんでした" + +#: application/controllers/AccountController.php:13 +#: application/layouts/scripts/footer.phtml:38 +msgid "my account" +msgstr "自分のアカウント" + +#: application/controllers/AccountController.php:28 +msgid "Wrong password" +msgstr "間違ったパスワード" + +#: application/controllers/AccountController.php:70 +#: application/forms/Account.php:33 application/forms/User.php:20 +#, php-format +msgid "At least %d characters" +msgstr "最低 %d 文字" + +#: application/controllers/AccountController.php:71 +msgid "You have made no change" +msgstr "変更していません" + +#: application/controllers/TermsofuseController.php:9 +#: application/forms/User.php:44 application/forms/Geom.php:39 +#: application/layouts/scripts/footer.phtml:86 +msgid "terms of use" +msgstr "利用条件" + +#: application/controllers/ContactController.php:11 +msgid "contact form" +msgstr "連絡フォーム" + +#: application/controllers/ContactController.php:110 +msgid "Hi," +msgstr "Hi," + #: application/controllers/ContactController.php:120 +#: application/forms/Contact.php:32 application/validate/EmailAddress.php:13 msgid "Invalid email" msgstr "不正なメールアドレス" -#: application/forms/Newpwd.php:28 application/forms/User.php:36 -#: application/forms/Account.php:27 +#: application/controllers/PendingController.php:31 +msgid "account validated" +msgstr "認証済みアカウント" + +#: application/controllers/PendingController.php:38 +msgid "account deleted" +msgstr "削除済みアカウント" + +#: application/controllers/PendingController.php:42 +msgid "account creation validation" +msgstr "アカウント作成認証" + +#: application/controllers/PendingController.php:52 +msgid "password changed" +msgstr "変更済みパスワード" + +#: application/controllers/PendingController.php:60 +msgid "request canceled" +msgstr "キャンセル済みリクエスト" + +#: application/controllers/PendingController.php:64 +msgid "password reset validation" +msgstr "パスワードリセット認証" + +#: application/controllers/LoginController.php:8 +#: application/forms/Login.php:23 application/views/scripts/idx/index.phtml:49 +#: application/layouts/scripts/footer.phtml:73 +msgid "login" +msgstr "ログイン" + +#: application/forms/Newpwd.php:28 application/forms/Account.php:27 +#: application/forms/User.php:36 msgid "email" msgstr "メールアドレス" @@ -53,52 +313,6 @@ msgstr "送信" msgid "Send a message" msgstr "メッセージを送信" -#: application/forms/User.php:10 -msgid "only letters, numbers, underscores or dots" -msgstr "文字、数字、アンダースコア、ドットのいずれかのみ" - -#: application/forms/User.php:12 -msgid "user name" -msgstr "ユーザ名" - -#: application/forms/User.php:20 application/forms/Account.php:33 -#: application/controllers/AccountController.php:70 -#, php-format -msgid "At least %d characters" -msgstr "最低 %d 文字" - -#: application/forms/User.php:23 application/forms/Account.php:35 -#: application/forms/Login.php:10 -msgid "password" -msgstr "パスワード" - -#: application/forms/User.php:30 application/forms/Account.php:42 -msgid "confirm password" -msgstr "パスワードを確認" - -#: application/forms/User.php:37 -msgid "" -"After creating your account, you will receive a confirmation email. You have " -"7 days to confirm otherwise, your account will be deleted." -msgstr "" -"アカウント作成後、確認メールが届きます。７日以内に認証してください、そうしな" -"ければアカウントは削除されます。" - -#: application/forms/User.php:44 application/forms/Geom.php:39 -#: application/layouts/scripts/footer.phtml:86 -#: application/controllers/TermsofuseController.php:9 -msgid "terms of use" -msgstr "利用条件" - -#: application/forms/User.php:46 application/forms/Geom.php:41 -#, php-format -msgid "I've read and accepted %s" -msgstr "私は %s を読んで承諾しました" - -#: application/forms/User.php:59 -msgid "create account" -msgstr "アカウント作成" - #: application/forms/Pending/ValidateCreation.php:11 #, php-format msgid "" @@ -149,11 +363,14 @@ msgstr "" "このリクエストをキャンセルするには、次のボタンを押してください。あなたのパス" "ワードは変更されません。" -#: application/forms/Account.php:40 -#: application/controllers/IdxController.php:162 -#: application/controllers/AccountController.php:69 -msgid "Password do not match" -msgstr "パスワードが一致しません" +#: application/forms/Account.php:35 application/forms/User.php:23 +#: application/forms/Login.php:10 +msgid "password" +msgstr "パスワード" + +#: application/forms/Account.php:42 application/forms/User.php:30 +msgid "confirm password" +msgstr "パスワードを確認" #: application/forms/Account.php:48 msgid "current password" @@ -163,6 +380,31 @@ msgstr "現在のパスワード" msgid "modify my informations" msgstr "自分の情報を変更" +#: application/forms/User.php:10 +msgid "only letters, numbers, underscores or dots" +msgstr "文字、数字、アンダースコア、ドットのいずれかのみ" + +#: application/forms/User.php:12 +msgid "user name" +msgstr "ユーザ名" + +#: application/forms/User.php:37 +msgid "" +"After creating your account, you will receive a confirmation email. You have " +"7 days to confirm otherwise, your account will be deleted." +msgstr "" +"アカウント作成後、確認メールが届きます。７日以内に認証してください、そうしな" +"ければアカウントは削除されます。" + +#: application/forms/User.php:46 application/forms/Geom.php:41 +#, php-format +msgid "I've read and accepted %s" +msgstr "私は %s を読んで承諾しました" + +#: application/forms/User.php:59 +msgid "create account" +msgstr "アカウント作成" + #: application/forms/Login.php:9 msgid "user" msgstr "ユーザ" @@ -175,12 +417,6 @@ msgstr "" msgid "I forgot my password" msgstr "パスワードを忘れた" -#: application/forms/Login.php:23 application/views/scripts/idx/index.phtml:49 -#: application/layouts/scripts/footer.phtml:73 -#: application/controllers/LoginController.php:8 -msgid "login" -msgstr "ログイン" - #: application/forms/Geom.php:17 msgid "Draw journey on the map or choose one from a file" msgstr "マップ上に旅行記録を描くかファイルからひとつ選んでください" @@ -189,174 +425,31 @@ msgstr "マップ上に旅行記録を描くかファイルからひとつ選ん msgid "optional title for this journey" msgstr "この旅の任意の見出し" -#: application/models/Pending/ValidateCreation.php:15 -#, fuzzy -msgid "[SYJ] Please validate your account" -msgstr "[SYJ] あなたのアカウントを認証してください" - -#: application/models/Pending/ValidateCreation.php:16 -msgid "" -"Hi %user%, and welcome on syj\n" -"\n" -"Your account is currently active, but you need to confirm your inscription " -"by\n" -"following this link:\n" -"%hashurl%\n" -"\n" -"If you do not not confirm your inscription within 7 days, your account will " -"be\n" -"deleted.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the " -"form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" -msgstr "" -"こんにちは %user%さん、そしてようこそsyjへ\n" -"\n" -"あなたのアカウントは現在アクティブですが、次のリンクで\n" -"署名に確認が必要です:\n" -"%hashurl%\n" -"\n" -"７日以内にあなたの署名を確認しなければ、あなたのアカウントは\n" -"削除されます。\n" -"\n" -"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n" -"連絡を %contacturl%\n" -"\n" -"ありがとうごいざいます、\n" -"\n" -"Syj チーム" - -#: application/models/Pending/ValidateCreation.php:34 -msgid "[SYJ] Reminder: Validate your account" -msgstr "[SYJ] リマインダー: あなたのアカウントを確認してください" - -#: application/models/Pending/ValidateCreation.php:35 -msgid "" -"Hi %user%,\n" -"\n" -"You need to validate your account on syj since 6 days. Otherwise, your\n" -"account will be deleted tomorrow. Please follow this link:\n" -"%hashurl%\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the " -"form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" -msgstr "" -"こんにちは %user%さん\n" -"\n" -"あなたのアカウントは認証されずに６日間経っています。何もしなければ、あなた" -"の\n" -"アカウントは明日削除されます。次のリンクに従ってください:\n" -"%hashurl%\n" -"\n" -"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n" -"連絡を %contacturl%\n" -"\n" -"ありがとうごいざいます、\n" -"\n" -"Syj チーム" - -#: application/models/Pending/ValidateCreation.php:51 -msgid "[SYJ] Account deactivated" -msgstr "[SYJ] アカウント無効化" - -#: application/models/Pending/ValidateCreation.php:52 -msgid "" -"Hi %user%,\n" -"\n" -"You have not validated your syj account on time. Therefore, your account " -"have\n" -"been deleted. Nevertheless, you can still create a new account.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the " -"form\n" -"contact at %contacturl%\n" -"\n" -"Regards,\n" -"\n" -"Syj team" -msgstr "" -"こんにちは %user%さん\n" -"\n" -"あなたは期限までにSyjのアカウントを認証しませんでした。このため、あなたのアカ" -"ウントは\n" -"削除されました。しかし、また新しいアカウントを作成することはできます。\n" -"\n" -"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n" -"連絡を %contacturl%\n" -"\n" -"ありがとうごいざいます、\n" -"\n" -"Syj チーム" - -#: application/models/Pending/ResetPassword.php:19 -msgid "[SYJ] Reset your password" -msgstr "[SYJ] あなたのパスワードをリセット" - -#: application/models/Pending/ResetPassword.php:20 -msgid "" -"Hi %user%,\n" -"\n" -"Someone, probably you, has asked to reset your password. If you want to " -"reset\n" -"your password, please follow this link:\n" -"%hashurl%\n" -"\n" -"If you do not not confirm within 2 days, your password will not be reset.\n" -"\n" -"Please do not reply this email. If you need to contact us, please use the " -"form\n" -"contact at %contacturl%\n" -"\n" -"Thanks,\n" -"\n" -"Syj team" -msgstr "" -"こんにちは %user% さん\n" -"\n" -"誰か、おそらくあなた自身、があなたのパスワードリセットを要求しました。あなた" -"のパスワードをリセット\n" -"する場合には、このリンクに従ってください:\n" -"%hashurl%\n" -"\n" -"２日以内に確認しなければ、あなたのパスワードはリセットされません。\n" -"\n" -"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n" -"連絡を %contacturl%\n" -"\n" -"ありがとうごいざいます、\n" -"\n" -"Syj チーム" +# This is language name. translate english to the name of your language. For example: "deutsch" or "fran軋is" +#: application/views/helpers/LocaleSwitcher.php:17 +msgid "english" +msgstr "日本語" -#: application/models/Path.php:61 -#, php-format -msgid "route number %d" -msgstr "ルート番号 %d" +#: application/views/helpers/LogoutLink.php:9 +#: application/layouts/scripts/footer.phtml:66 +msgid "logout" +msgstr "ログアウト" #: application/views/helpers/Returnto.php:22 #: application/views/helpers/Returnto.php:25 #: application/views/helpers/Returnto.php:28 -#: application/views/scripts/pending/creation_cancel.phtml:14 #: application/views/scripts/pending/creation_validate.phtml:14 +#: application/views/scripts/pending/creation_cancel.phtml:14 #: application/views/scripts/pending/password_cancel.phtml:14 msgid "You can now" msgstr "以下のことができます" #: application/views/helpers/Returnto.php:23 #: application/views/helpers/Returnto.php:31 -#: application/views/scripts/error/error.phtml:37 -#: application/views/scripts/pending/creation_cancel.phtml:15 #: application/views/scripts/pending/creation_validate.phtml:15 +#: application/views/scripts/pending/creation_cancel.phtml:15 #: application/views/scripts/pending/password_cancel.phtml:15 +#: application/views/scripts/error/error.phtml:37 msgid "go to main page" msgstr "メインページへ" @@ -370,20 +463,127 @@ msgstr "%s に戻る" msgid "or you can" msgstr "または" -# This is language name. translate english to the name of your language. For example: "deutsch" or "fran軋is" -#: application/views/helpers/LocaleSwitcher.php:17 -msgid "english" -msgstr "日本語" +#: application/views/scripts/account/success.phtml:4 +msgid "Your account was modified successfully" +msgstr "アカウントの変更に成功しました" -#: application/views/helpers/LogoutLink.php:9 -#: application/layouts/scripts/footer.phtml:66 -msgid "logout" -msgstr "ログアウト" +#: application/views/scripts/pending/index.phtml:16 +msgid "If you need more informations, please" +msgstr "詳細な情報が必要なら" -#: application/views/scripts/faq/index.phtml:5 -#: application/controllers/FaqController.php:9 -msgid "Frequently asked questions" -msgstr "FAQ" +#: application/views/scripts/pending/index.phtml:17 +msgid "contact us" +msgstr "管理者に連絡してください" + +#: application/views/scripts/pending/creation_validate.phtml:12 +msgid "You have validated your account." +msgstr "あなたのアカウントは認証されました。" + +#: application/views/scripts/pending/creation_cancel.phtml:12 +msgid "You have canceled the account." +msgstr "アカウントはキャンセルされました。" + +#: application/views/scripts/pending/password_cancel.phtml:12 +msgid "You have canceled the request." +msgstr "リクエストをキャンセルしました。" + +#: application/views/scripts/pending/password_validate.phtml:17 +msgid "log in" +msgstr "ログイン" + +#: application/views/scripts/pending/password_validate.phtml:15 +#, php-format +msgid "" +"Your new password is now %s. You can %s with this new " +"password. Don't forget to change it again to a personal password as soon as " +"possible." +msgstr "" +"あなたの新しいパスワードは %s です。この新しいパスワード" +"で%s できます。忘れずにできるだけ早く個人的なパスワードに再度変更してくださ" +"い。" + +#: application/views/scripts/contact/index.phtml:8 +#, php-format +msgid "" +"There was an unkwown message when sending the message. Please try again " +"later, or send a mail directly to %s" +msgstr "" +"メッセージ送信時に不明なメッセージがありました。しばらくしてからやり直してく" +"ださいもしくは%sに直接メールしてください" + +#: application/views/scripts/contact/success.phtml:4 +msgid "Email was send successfully" +msgstr "メール送信に成功しました" + +#: 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 のゴールは誰もがルートを公開できるようにすることです。例え" +"ば、ハイキング経路、自転車トリップ、旅行行程その他あらゆるものです。" + +#: 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 "" +"ルートを公開するためには、最初にアカウントを作成してください。実在するメール" +"アドレスが必要で、アカウントを作成時のIPアドレスはサーバの保存されます。これ" +"らの情報はユーザの明示的な許可が無い限り、誰にも漏らすことはありません。" + +#: 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 "" +"ルートを作成する場合は、いかなる用途でも自由に使えることに同意することになり" +"ます。これはあなたの旅程やそれに手を加えたものを誰もがどのような目的にも再利" +"用、再作成、再公開できるということを意味します。同時に、もしあなたが自分で作" +"成したものでないルートをアップロードする場合にはその作者から適切な許可をもら" +"う必要がある、ということをも意味しています。" + +#: 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は公開されたルートの正確さに責を負うものではありません。ルー" +"トが通行可能で安全であるということをチェックするのはユーザの責任です。" + +#: 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サービスは\"あるがまま\"に提供され、正確さやアクセシビリティ" +"を保証するものではありません。" + +#: application/views/scripts/termsofuse/index.phtml:25 +msgid "" +"Sources of the software running the website are publicly available under a agpl license. The " +"map used to display the routes comes from openstreetmap." +msgstr "" +"ウェブサイトで動作しているソフトウェアのソースコードはagplライセンスの下で誰でも利用可能です。ルート表" +"示に使用されているマップはopenstreetmapです。" + +#: application/views/scripts/error/error.phtml:5 +msgid "An error occurred" +msgstr "エラーが発生しました" + +#: application/views/scripts/error/error.phtml:35 +msgid "Please try again later" +msgstr "しばらくしてからやり直してください" #: application/views/scripts/faq/index.phtml:6 msgid "What's syj?" @@ -455,14 +655,6 @@ msgstr "" "用レーン、鉄道…などを添付したいと思うでしょう。あなたが多くの異なるルートがあ" "る場所にいるなら、常に正しい道を選ぶのは不可能に近いでしょう。" -#: application/views/scripts/error/error.phtml:5 -msgid "An error occurred" -msgstr "エラーが発生しました" - -#: application/views/scripts/error/error.phtml:35 -msgid "Please try again later" -msgstr "しばらくしてからやり直してください" - #: application/views/scripts/idx/raw.phtml:8 #: application/views/scripts/idx/index.phtml:8 #: application/views/scripts/list/index.phtml:8 @@ -495,7 +687,7 @@ msgid "route length" msgstr "ルート長" #: application/views/scripts/idx/index.phtml:51 -#: application/views/scripts/idx/index.phtml:169 +#: application/views/scripts/idx/index.phtml:170 msgid "create an account" msgstr "アカウントを作成" @@ -516,117 +708,32 @@ msgstr "ダイレクトリンク" msgid "export" msgstr "エクスポート" -#: application/views/scripts/idx/index.phtml:91 #: application/views/scripts/idx/index.phtml:92 +#: application/views/scripts/idx/index.phtml:93 msgid "kml export" msgstr "kmlにエクスポート" -#: application/views/scripts/idx/index.phtml:98 #: application/views/scripts/idx/index.phtml:99 +#: application/views/scripts/idx/index.phtml:100 msgid "gpx export" msgstr "gpxにエクスポート" -#: application/views/scripts/idx/index.phtml:112 -#: application/controllers/IdxController.php:177 -msgid "duplicate" -msgstr "複製" - -#: application/views/scripts/idx/index.phtml:114 -#: application/controllers/IdxController.php:175 -msgid "edit" -msgstr "編集" - -#: application/views/scripts/idx/index.phtml:118 +#: application/views/scripts/idx/index.phtml:119 msgid "Search a place" msgstr "場所をさがす" -#: application/views/scripts/idx/index.phtml:122 +#: application/views/scripts/idx/index.phtml:123 msgid "Ok" msgstr "OK" -#: application/views/scripts/idx/index.phtml:128 +#: application/views/scripts/idx/index.phtml:129 msgid "start a route" msgstr "ルート開始" -#: application/views/scripts/idx/index.phtml:140 +#: application/views/scripts/idx/index.phtml:141 msgid "more results" msgstr "もっと" -#: 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 のゴールは誰もがルートを公開できるようにすることです。例え" -"ば、ハイキング経路、自転車トリップ、旅行行程その他あらゆるものです。" - -#: 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 "" -"ルートを公開するためには、最初にアカウントを作成してください。実在するメール" -"アドレスが必要で、アカウントを作成時のIPアドレスはサーバの保存されます。これ" -"らの情報はユーザの明示的な許可が無い限り、誰にも漏らすことはありません。" - -#: 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 "" -"ルートを作成する場合は、いかなる用途でも自由に使えることに同意することになり" -"ます。これはあなたの旅程やそれに手を加えたものを誰もがどのような目的にも再利" -"用、再作成、再公開できるということを意味します。同時に、もしあなたが自分で作" -"成したものでないルートをアップロードする場合にはその作者から適切な許可をもら" -"う必要がある、ということをも意味しています。" - -#: 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は公開されたルートの正確さに責を負うものではありません。ルー" -"トが通行可能で安全であるということをチェックするのはユーザの責任です。" - -#: 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サービスは\"あるがまま\"に提供され、正確さやアクセシビリティ" -"を保証するものではありません。" - -#: application/views/scripts/termsofuse/index.phtml:25 -msgid "" -"Sources of the software running the website are publicly available under a agpl license. The " -"map used to display the routes comes from openstreetmap." -msgstr "" -"ウェブサイトで動作しているソフトウェアのソースコードはagplライセンスの下で誰でも利用可能です。ルート表" -"示に使用されているマップはopenstreetmapです。" - -#: application/views/scripts/contact/success.phtml:4 -msgid "Email was send successfully" -msgstr "メール送信に成功しました" - -#: application/views/scripts/contact/index.phtml:8 -#, php-format -msgid "" -"There was an unkwown message when sending the message. Please try again " -"later, or send a mail directly to %s" -msgstr "" -"メッセージ送信時に不明なメッセージがありました。しばらくしてからやり直してく" -"ださいもしくは%sに直接メールしてください" - #: application/views/scripts/list/index.phtml:13 #: application/layouts/scripts/footer.phtml:16 msgid "create a route" @@ -657,265 +764,166 @@ msgstr "最終ページ" msgid "modify or duplicate" msgstr "変更または複製" -#: application/views/scripts/account/success.phtml:4 -msgid "Your account was modified successfully" -msgstr "アカウントの変更に成功しました" - -#: application/views/scripts/newpwd/success.phtml:4 -#: application/controllers/IdxController.php:168 -msgid "A link to reset your password has been emailed to you" -msgstr "パスワードをリセットするためのURLがあなた宛に送られました" - -#: application/views/scripts/pending/creation_cancel.phtml:12 -msgid "You have canceled the account." -msgstr "アカウントはキャンセルされました。" - -#: application/views/scripts/pending/creation_validate.phtml:12 -msgid "You have validated your account." -msgstr "あなたのアカウントは認証されました。" - -#: application/views/scripts/pending/password_validate.phtml:17 -msgid "log in" -msgstr "ログイン" +#: application/models/Pending/ValidateCreation.php:15 +#, fuzzy +msgid "[SYJ] Please validate your account" +msgstr "[SYJ] あなたのアカウントを認証してください" -#: application/views/scripts/pending/password_validate.phtml:15 -#, php-format +#: application/models/Pending/ValidateCreation.php:16 msgid "" -"Your new password is now %s. You can %s with this new " -"password. Don't forget to change it again to a personal password as soon as " -"possible." -msgstr "" -"あなたの新しいパスワードは %s です。この新しいパスワード" -"で%s できます。忘れずにできるだけ早く個人的なパスワードに再度変更してくださ" -"い。" - -#: application/views/scripts/pending/password_cancel.phtml:12 -msgid "You have canceled the request." -msgstr "リクエストをキャンセルしました。" - -#: application/views/scripts/pending/index.phtml:16 -msgid "If you need more informations, please" -msgstr "詳細な情報が必要なら" - -#: application/views/scripts/pending/index.phtml:17 -msgid "contact us" -msgstr "管理者に連絡してください" - -#: application/layouts/scripts/footer.phtml:27 -msgid "contact" -msgstr "連絡先" - -#: application/layouts/scripts/footer.phtml:38 -#: application/controllers/AccountController.php:13 -msgid "my account" -msgstr "自分のアカウント" - -#: application/layouts/scripts/footer.phtml:52 -#: application/controllers/ListController.php:14 -msgid "my routes" -msgstr "自分のルート" - -#: application/layouts/scripts/footer.phtml:96 -msgid "help" -msgstr "ヘルプ" - -#: application/controllers/PendingController.php:31 -msgid "account validated" -msgstr "認証済みアカウント" - -#: application/controllers/PendingController.php:38 -msgid "account deleted" -msgstr "削除済みアカウント" - -#: application/controllers/PendingController.php:42 -msgid "account creation validation" -msgstr "アカウント作成認証" - -#: application/controllers/PendingController.php:52 -msgid "password changed" -msgstr "変更済みパスワード" - -#: application/controllers/PendingController.php:60 -msgid "request canceled" -msgstr "キャンセル済みリクエスト" - -#: application/controllers/PendingController.php:64 -msgid "password reset validation" -msgstr "パスワードリセット認証" - -#: application/controllers/NewpwdController.php:66 -#: application/controllers/IdxController.php:179 -#: application/controllers/ContactController.php:119 -#: application/controllers/AccountController.php:68 -msgid "Value is required" -msgstr "値が必要です" - -#: application/controllers/IdxController.php:24 -#: application/controllers/IdxController.php:71 -#, php-format -msgid "route by %s" -msgstr "%sのルート" - -#: application/controllers/IdxController.php:43 -msgid "route has been deleted" -msgstr "ルートは削除されました" - -#: application/controllers/IdxController.php:46 -msgid "route does not exist" -msgstr "ルートはありません" - -#: application/controllers/IdxController.php:74 -#: application/controllers/IdxController.php:107 -#, fuzzy -msgid "website to share routes" -msgstr "ルートを共有するウェブサイト" - -#: application/controllers/IdxController.php:116 -#, php-format -msgid "File too large. File size must not exceed %s" -msgstr "ファイルが大きすぎます。 %s 以下のサイズにしてください" - -#: application/controllers/IdxController.php:118 -#, fuzzy -msgid "Invalid file" -msgstr "不正なファイル" - -#: application/controllers/IdxController.php:146 -#: application/controllers/IdxController.php:171 -msgid "Map by OpenStreetMap" -msgstr "Map by OpenStreetMap" +"Hi %user%, and welcome on syj\n" +"\n" +"Your account is currently active, but you need to confirm your inscription " +"by\n" +"following this link:\n" +"%hashurl%\n" +"\n" +"If you do not not confirm your inscription within 7 days, your account will " +"be\n" +"deleted.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" +msgstr "" +"こんにちは %user%さん、そしてようこそsyjへ\n" +"\n" +"あなたのアカウントは現在アクティブですが、次のリンクで\n" +"署名に確認が必要です:\n" +"%hashurl%\n" +"\n" +"７日以内にあなたの署名を確認しなければ、あなたのアカウントは\n" +"削除されます。\n" +"\n" +"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n" +"連絡を %contacturl%\n" +"\n" +"ありがとうごいざいます、\n" +"\n" +"Syj チーム" -#: application/controllers/IdxController.php:152 -msgid "save took place successfully" -msgstr "保存されました" +#: application/models/Pending/ValidateCreation.php:34 +msgid "[SYJ] Reminder: Validate your account" +msgstr "[SYJ] リマインダー: あなたのアカウントを確認してください" -#: application/controllers/IdxController.php:153 -#: application/controllers/ListController.php:33 +#: application/models/Pending/ValidateCreation.php:35 msgid "" -"server did not understood request. That's probably caused by a bug in SYJ" -msgstr "サーバはリクエストを理解できませんでした。おそらくSYJのバグでしょう" - -#: application/controllers/IdxController.php:154 -#: application/controllers/ListController.php:34 -msgid "route not referenced on the server. It has probably been deleted." -msgstr "ルートはサーバ上で参照できませんでした。おそらく削除されています。" - -#: application/controllers/IdxController.php:155 -#: application/controllers/ListController.php:32 -msgid "server could not be reached" -msgstr "サーバに届かなかったようです" - -#: application/controllers/IdxController.php:156 -#: application/controllers/ListController.php:35 -msgid "there was a server error" -msgstr "サーバのエラーがありました" - -#: application/controllers/IdxController.php:157 -#: application/controllers/ListController.php:36 -msgid "there was an unknown error" -msgstr "不明なエラーがありました" - -#: application/controllers/IdxController.php:158 -#: application/controllers/LoginController.php:89 -msgid "you must enter a login name" -msgstr "ログイン名を入力してください" - -#: application/controllers/IdxController.php:159 -msgid "Login correct" -msgstr "正常ログイン" - -#: application/controllers/IdxController.php:160 -msgid "Wrong login/password" -msgstr "誤ったログイン/パスワード" - -#: application/controllers/IdxController.php:161 -msgid "you must enter a password" -msgstr "パスワードを入力してください" - -#: application/controllers/IdxController.php:163 -msgid "You must accept terms of use" -msgstr "利用条件を承諾してください" - -#: application/controllers/IdxController.php:164 -msgid "you must enter an email" -msgstr "メールアドレスを入力してください" - -#: application/controllers/IdxController.php:165 -msgid "invalid email" -msgstr "不正なメールアドレス" - -#: application/controllers/IdxController.php:166 -#: application/controllers/AccountController.php:41 -msgid "an user is already registered with this email" -msgstr "このメールアドレスのユーザが既に登録されています" - -#: application/controllers/IdxController.php:167 -msgid "Account created" -msgstr "アカウントを作成しました" - -#: application/controllers/IdxController.php:169 -msgid "Now, you can retry to save" -msgstr "今は、保存をやり直すことができます" - -#: application/controllers/IdxController.php:170 -msgid "route by" -msgstr "ルート作成者" - -#: application/controllers/IdxController.php:172 -msgid "checking availibilty" -msgstr "利用可能かチェック中" - -#: application/controllers/IdxController.php:173 -msgid "available pseudo" -msgstr "利用出来るID" - -#: application/controllers/IdxController.php:174 -msgid "unavailable pseudo" -msgstr "利用できないID" - -#: application/controllers/IdxController.php:176 -msgid "create" -msgstr "作成" - -#: application/controllers/IdxController.php:178 -msgid "You have an unsaved route" -msgstr "保存されていないルートがあります" - -#: application/controllers/IdxController.php:180 -msgid "no result" -msgstr "結果がありません" - -#: application/controllers/IdxController.php:181 -msgid "could not analyze file content" -msgstr "ファイル内容を分析できませんでした" +"Hi %user%,\n" +"\n" +"You need to validate your account on syj since 6 days. Otherwise, your\n" +"account will be deleted tomorrow. Please follow this link:\n" +"%hashurl%\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" +msgstr "" +"こんにちは %user%さん\n" +"\n" +"あなたのアカウントは認証されずに６日間経っています。何もしなければ、あなた" +"の\n" +"アカウントは明日削除されます。次のリンクに従ってください:\n" +"%hashurl%\n" +"\n" +"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n" +"連絡を %contacturl%\n" +"\n" +"ありがとうごいざいます、\n" +"\n" +"Syj チーム" -#: application/controllers/ContactController.php:11 -msgid "contact form" -msgstr "連絡フォーム" +#: application/models/Pending/ValidateCreation.php:51 +msgid "[SYJ] Account deactivated" +msgstr "[SYJ] アカウント無効化" -#: application/controllers/ContactController.php:110 -msgid "Hi," -msgstr "Hi," +#: application/models/Pending/ValidateCreation.php:52 +msgid "" +"Hi %user%,\n" +"\n" +"You have not validated your syj account on time. Therefore, your account " +"have\n" +"been deleted. Nevertheless, you can still create a new account.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Regards,\n" +"\n" +"Syj team" +msgstr "" +"こんにちは %user%さん\n" +"\n" +"あなたは期限までにSyjのアカウントを認証しませんでした。このため、あなたのアカ" +"ウントは\n" +"削除されました。しかし、また新しいアカウントを作成することはできます。\n" +"\n" +"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n" +"連絡を %contacturl%\n" +"\n" +"ありがとうごいざいます、\n" +"\n" +"Syj チーム" -#: application/controllers/ListController.php:31 -msgid "There is no undo. Delete this route definitively ?" -msgstr "やり直しはできません。本当にこのルートを削除しますか？" +#: application/models/Pending/ResetPassword.php:19 +msgid "[SYJ] Reset your password" +msgstr "[SYJ] あなたのパスワードをリセット" -#: application/controllers/ListController.php:37 -msgid "route was successfully deleted" -msgstr "ルートは削除されました" +#: application/models/Pending/ResetPassword.php:20 +msgid "" +"Hi %user%,\n" +"\n" +"Someone, probably you, has asked to reset your password. If you want to " +"reset\n" +"your password, please follow this link:\n" +"%hashurl%\n" +"\n" +"If you do not not confirm within 2 days, your password will not be reset.\n" +"\n" +"Please do not reply this email. If you need to contact us, please use the " +"form\n" +"contact at %contacturl%\n" +"\n" +"Thanks,\n" +"\n" +"Syj team" +msgstr "" +"こんにちは %user% さん\n" +"\n" +"誰か、おそらくあなた自身、があなたのパスワードリセットを要求しました。あなた" +"のパスワードをリセット\n" +"する場合には、このリンクに従ってください:\n" +"%hashurl%\n" +"\n" +"２日以内に確認しなければ、あなたのパスワードはリセットされません。\n" +"\n" +"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n" +"連絡を %contacturl%\n" +"\n" +"ありがとうごいざいます、\n" +"\n" +"Syj チーム" -#: application/controllers/AccountController.php:28 -msgid "Wrong password" -msgstr "間違ったパスワード" +#: application/models/Path.php:61 +#, php-format +msgid "route number %d" +msgstr "ルート番号 %d" -#: application/controllers/AccountController.php:71 -msgid "You have made no change" -msgstr "変更していません" +#: application/layouts/scripts/footer.phtml:27 +msgid "contact" +msgstr "連絡先" -#: application/controllers/ErrorController.php:59 -msgid "Oups, something went wrong" -msgstr "おや、何かがおかしいですね" +#: application/layouts/scripts/footer.phtml:96 +msgid "help" +msgstr "ヘルプ" #~ msgid "Welcome on Syj." #~ msgstr "Syjへようこそ。" diff --git a/public/css/syj.css b/public/css/syj.css index a78a52f..e88f3da 100644 --- a/public/css/syj.css +++ b/public/css/syj.css @@ -29,6 +29,37 @@ body, html { left: 0.5em; } +.olControlLayerSwitcher { + bottom: 4em; + top: auto; + left: 13px; + opacity: 0.75; + height: 6em; + max-width: intrinsic; + max-width: -moz-max-content; +} + +/* setting opacity to .olControlLayerSwitcher does not work */ +.olControlLayerSwitcher .layersDiv, +.olControlLayerSwitcher .maximizeDiv, +.olControlLayerSwitcher .minimizeDiv +{ + filter:alpha(opacity=75); +} + +.olControlLayerSwitcher .dataLayersDiv, .olControlLayerSwitcher .dataLbl { + display: none; +} +.olControlLayerSwitcher .layersDiv { + padding: 5px 12px 5px 36px; +} +.olControlLayerSwitcher .maximizeDiv { + top: -6em; +} +.olControlLayerSwitcher .minimizeDiv { + left: 4px; +} + /* * main message rules */ diff --git a/public/css/syjprint.css b/public/css/syjprint.css index 36f829c..ebdef23 100644 --- a/public/css/syjprint.css +++ b/public/css/syjprint.css @@ -1,7 +1,7 @@ /* This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier, and is published under the AGPL license. */ -.olControlPanZoom, .olControlLayerSwitcher { +.olControlPanZoom, .olControlAttribution, .olControlLayerSwitcher { display: none; } #message, #other-language, #menu, #user_area, #login_area, #newpwd_area, #termsofusearea, footer, #map-overlay { diff --git a/public/icons/layer-switcher-maximize-flipped.png b/public/icons/layer-switcher-maximize-flipped.png new file mode 100644 index 0000000..f87fa32 Binary files /dev/null and b/public/icons/layer-switcher-maximize-flipped.png differ diff --git a/public/js/store.js b/public/js/store.js new file mode 120000 index 0000000..2e44358 --- /dev/null +++ b/public/js/store.js @@ -0,0 +1 @@ +../store/store.js \ No newline at end of file diff --git a/public/js/syj.js b/public/js/syj.js index 8f5f509..8c48c99 100644 --- a/public/js/syj.js +++ b/public/js/syj.js @@ -276,7 +276,7 @@ var SYJView = { mode: 'view', init: function() { - var externalGraphic, baseURL, baseLayer, layerOptions, hidemessenger; + var externalGraphic, baseURL, mapnikLayer, mapquestLayer, layerOptions, hidemessenger, layerCode, parameters; // is svg context, opera does not resolve links with base element is svg context externalGraphic = styleMap.edit.styles.select.defaultStyle.externalGraphic; @@ -287,16 +287,24 @@ var SYJView = { controls: [ new OpenLayers.Control.Navigation(), new OpenLayers.Control.PanZoom(), + this.createLayerSwitcher(), new OpenLayers.Control.Attribution() ], theme: null }); - baseLayer = new OpenLayers.Layer.OSM("OSM", [ + mapnikLayer = new OpenLayers.Layer.OSM("Mapnik", [ 'http://a.tile.openstreetmap.org/${z}/${x}/${y}.png', 'http://b.tile.openstreetmap.org/${z}/${x}/${y}.png', 'http://c.tile.openstreetmap.org/${z}/${x}/${y}.png'], - { attribution: SyjStrings.osmAttribution }); + { attribution: SyjStrings.osmAttribution, layerCode: 'M' }); + + mapquestLayer = new OpenLayers.Layer.OSM("MapQuest", [ + 'http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png', + 'http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png', + 'http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png', + 'http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png'], + { attribution: SyjStrings.mapquestAttribution, layerCode: 'Q'}); layerOptions = {format: OpenLayers.Format.WKT, projection: WGS84, @@ -304,7 +312,33 @@ var SYJView = { attribution: SyjStrings.geomAttribution }; this.viewLayer = new OpenLayers.Layer.Vector("View Layer", layerOptions); - this.map.addLayers([baseLayer, this.viewLayer]); + this.map.addLayers([mapnikLayer, mapquestLayer, this.viewLayer]); + + this.map.setBaseLayer(mapnikLayer); + layerCode = null; + parameters = OpenLayers.Util.getParameters(window.location.href); + if (parameters.layer) { + layerCode = parameters.layer; + try { + store.remove('baselayer'); + } catch(e) {} + } else { + try { + layerCode = store.get('baselayer'); + } catch(e) {} + } + + if (layerCode) { + layerCode = layerCode.toUpperCase(); + var self = this; + $([mapnikLayer, mapquestLayer]).each(function(layer) { + if (layer.layerCode === layerCode) { + self.map.setBaseLayer(layer); + } + }); + } + + this.map.events.register("changebaselayer", this, this.saveBaseLayer); if ($("edit-btn")) { $("edit-btn").observe('click', function() { @@ -442,6 +476,33 @@ var SYJView = { SYJPathLength.update(); }, + saveBaseLayer: function(data) { + try { + store.set('baselayer', data.layer.layerCode); + } catch(e) {} + }, + + createLayerSwitcher: function() { + var control = new OpenLayers.Control.LayerSwitcher({roundedCorner: false}); + // XXX: we need to "live-patch" LayerSwitcher to use our icons. We use + // a regexp instead of a string in case OpenLayers is modified and in + // case browsers modify the function representation + control.loadContents = eval('(function() { return (' + control.loadContents.toString().replace( + /\s*=\s*imgLocation\s*\+\s*['"]layer-switcher-maximize\.png['"]\s*;/, + " = 'icons/layer-switcher-maximize-flipped.png';" + ) + ')}())'); + var oldMaximizeControl = control.maximizeControl; + var self = this; + control.maximizeControl = (function(oldfunc) { + return function() { + oldfunc.apply(control, arguments); + self.messenger.hide(); + }; + }(control.maximizeControl)); + + return control; + }, + initMaPos: function (aPos) { var extent = null, center = null, zoom = 0; diff --git a/public/js/syjraw.js b/public/js/syjraw.js index b07e0b9..59b3f5c 100644 --- a/public/js/syjraw.js +++ b/public/js/syjraw.js @@ -22,6 +22,23 @@ function resizeMap() { map.style.height = map.offsetHeight.toString() + 'px'; } +function mapquestLayer() { + return new OpenLayers.Layer.OSM("MapQuest", [ + 'http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png', + 'http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png', + 'http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png', + 'http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png'], + { attribution: SyjStrings.mapquestAttribution}); +} + +function mapnikLayer() { + return new OpenLayers.Layer.OSM("Mapnik", [ + 'http://a.tile.openstreetmap.org/${z}/${x}/${y}.png', + 'http://b.tile.openstreetmap.org/${z}/${x}/${y}.png', + 'http://c.tile.openstreetmap.org/${z}/${x}/${y}.png'], + { attribution: SyjStrings.osmAttribution}); +} + function init() { var map = new OpenLayers.Map('map', { controls: [ @@ -30,7 +47,8 @@ function init() { ], theme: null}), - baseLayer = new OpenLayers.Layer.OSM("OSM", null, { attribution: SyjStrings.osmAttribution }), + parameters = OpenLayers.Util.getParameters(window.location.href), + baseLayer = null, layerOptions = {format: OpenLayers.Format.WKT, projection: WGS84, @@ -40,6 +58,21 @@ function init() { viewLayer = new OpenLayers.Layer.Vector("View Layer", layerOptions), wkt = new OpenLayers.Format.WKT({ internalProjection: Mercator, externalProjection: WGS84 }); + if (parameters.layer) { + switch (parameters.layer.toUpperCase()) { + case 'Q': + baseLayer = mapquestLayer(); + break; + case 'M': + baseLayer = mapnikLayer(); + break; + } + } + + if (!baseLayer) { + baseLayer = mapnikLayer(); + } + map.addLayers([baseLayer, viewLayer]); viewLayer.addFeatures([wkt.read(gInitialGeom.data)]); var extent = viewLayer.getDataExtent(); diff --git a/public/store b/public/store new file mode 160000 index 0000000..25c640b --- /dev/null +++ b/public/store @@ -0,0 +1 @@ +Subproject commit 25c640b09962bcbf46a17e88817ce195118cfeac diff --git a/scripts/syj.cfg b/scripts/syj.cfg index a17d34f..184df6c 100644 --- a/scripts/syj.cfg +++ b/scripts/syj.cfg @@ -15,6 +15,7 @@ OpenLayers/BaseTypes/Element.js OpenLayers/Console.js OpenLayers/Control/Attribution.js OpenLayers/Control/DrawFeature.js +OpenLayers/Control/LayerSwitcher.js OpenLayers/Control/Navigation.js OpenLayers/Control/DragFeature.js OpenLayers/Control/PanZoom.js