diff options
| -rw-r--r-- | fietsboek/locale/en/LC_MESSAGES/messages.mo | bin | 5278 -> 7015 bytes | |||
| -rw-r--r-- | fietsboek/locale/en/LC_MESSAGES/messages.po | 187 | ||||
| -rw-r--r-- | fietsboek/locale/fietslog.pot | 180 | ||||
| -rw-r--r-- | fietsboek/templates/login.jinja2 | 1 |
4 files changed, 279 insertions, 89 deletions
diff --git a/fietsboek/locale/en/LC_MESSAGES/messages.mo b/fietsboek/locale/en/LC_MESSAGES/messages.mo Binary files differindex 4559d38..ee8faaa 100644 --- a/fietsboek/locale/en/LC_MESSAGES/messages.mo +++ b/fietsboek/locale/en/LC_MESSAGES/messages.mo diff --git a/fietsboek/locale/en/LC_MESSAGES/messages.po b/fietsboek/locale/en/LC_MESSAGES/messages.po index c218051..ff05525 100644 --- a/fietsboek/locale/en/LC_MESSAGES/messages.po +++ b/fietsboek/locale/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2022-06-30 20:14+0200\n" +"POT-Creation-Date: 2022-07-01 13:29+0200\n" "PO-Revision-Date: 2022-06-28 13:11+0200\n" "Last-Translator: \n" "Language: en\n" @@ -18,79 +18,79 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.10.3\n" -#: fietsboek/util.py:89 +#: fietsboek/util.py:88 msgid "month.january" msgstr "January" -#: fietsboek/util.py:90 +#: fietsboek/util.py:89 msgid "month.february" msgstr "February" -#: fietsboek/util.py:91 +#: fietsboek/util.py:90 msgid "month.march" msgstr "March" -#: fietsboek/util.py:92 +#: fietsboek/util.py:91 msgid "month.april" msgstr "April" -#: fietsboek/util.py:93 +#: fietsboek/util.py:92 msgid "month.may" msgstr "May" -#: fietsboek/util.py:94 +#: fietsboek/util.py:93 msgid "month.june" msgstr "June" -#: fietsboek/util.py:95 +#: fietsboek/util.py:94 msgid "month.july" msgstr "July" -#: fietsboek/util.py:96 +#: fietsboek/util.py:95 msgid "month.august" msgstr "August" -#: fietsboek/util.py:97 +#: fietsboek/util.py:96 msgid "month.september" msgstr "September" -#: fietsboek/util.py:98 +#: fietsboek/util.py:97 msgid "month.october" msgstr "October" -#: fietsboek/util.py:99 +#: fietsboek/util.py:98 msgid "month.november" msgstr "November" -#: fietsboek/util.py:100 +#: fietsboek/util.py:99 msgid "month.december" msgstr "December" -#: fietsboek/models/track.py:250 +#: fietsboek/models/track.py:319 msgid "tooltip.table.length" msgstr "Length" -#: fietsboek/models/track.py:251 +#: fietsboek/models/track.py:320 msgid "tooltip.table.uphill" msgstr "Uphill" -#: fietsboek/models/track.py:252 +#: fietsboek/models/track.py:321 msgid "tooltip.table.downhill" msgstr "Downhill" -#: fietsboek/models/track.py:253 +#: fietsboek/models/track.py:322 msgid "tooltip.table.moving_time" msgstr "Moving Time" -#: fietsboek/models/track.py:254 +#: fietsboek/models/track.py:323 msgid "tooltip.table.stopped_time" msgstr "Stopped Time" -#: fietsboek/models/track.py:255 +#: fietsboek/models/track.py:324 msgid "tooltip.table.max_speed" msgstr "Max Speed" -#: fietsboek/models/track.py:256 +#: fietsboek/models/track.py:326 msgid "tooltip.table.avg_speed" msgstr "Average Speed" @@ -240,28 +240,32 @@ msgid "page.track.form.visibility.friends" msgstr "Friends only" #: fietsboek/templates/edit_form.jinja2:15 +msgid "page.track.form.visibility.logged_in" +msgstr "Logged in users" + +#: fietsboek/templates/edit_form.jinja2:16 msgid "page.track.form.visibility.public" msgstr "Public" -#: fietsboek/templates/edit_form.jinja2:18 +#: fietsboek/templates/edit_form.jinja2:19 msgid "page.track.form.visibility.info" msgstr "" "Note that tagged people and people with the share link can always view " "the track." -#: fietsboek/templates/edit_form.jinja2:22 +#: fietsboek/templates/edit_form.jinja2:23 msgid "page.track.form.tags" msgstr "Tags" -#: fietsboek/templates/edit_form.jinja2:33 +#: fietsboek/templates/edit_form.jinja2:34 msgid "page.track.form.add_tag" msgstr "Add Tag" -#: fietsboek/templates/edit_form.jinja2:39 +#: fietsboek/templates/edit_form.jinja2:40 msgid "page.track.form.badges" msgstr "Badges" -#: fietsboek/templates/edit_form.jinja2:50 +#: fietsboek/templates/edit_form.jinja2:51 msgid "page.track.form.description" msgstr "Description" @@ -331,87 +335,180 @@ msgstr "Password" msgid "page.login.submit" msgstr "Login" +#: fietsboek/templates/login.jinja2:20 +msgid "page.login.forgot_password" +msgstr "Forgot password" + +#: fietsboek/templates/password_reset.jinja2:4 +msgid "page.password_reset.title" +msgstr "Reset Your Password" + +#: fietsboek/templates/password_reset.jinja2:7 +msgid "page.password_reset.password" +msgstr "Password" + +#: fietsboek/templates/password_reset.jinja2:13 +msgid "page.password_reset.repeat_password" +msgstr "Repeat password" + +#: fietsboek/templates/password_reset.jinja2:18 +msgid "page.password_reset.reset" +msgstr "Reset" + #: fietsboek/templates/profile.jinja2:5 msgid "page.my_profile.title" msgstr "My Profile" -#: fietsboek/templates/profile.jinja2:6 +#: fietsboek/templates/profile.jinja2:9 +msgid "page.my_profile.personal_data" +msgstr "Personal Data" + +#: fietsboek/templates/profile.jinja2:13 +msgid "page.my_profile.personal_data.name" +msgstr "My name" + +#: fietsboek/templates/profile.jinja2:19 +msgid "page.my_profile.personal_data.password" +msgstr "Password" + +#: fietsboek/templates/profile.jinja2:25 +msgid "page.my_profile.personal_data.repeat_password" +msgstr "Repeat password" + +#: fietsboek/templates/profile.jinja2:30 +msgid "page.my_profile.personal_data.save" +msgstr "Save" + +#: fietsboek/templates/profile.jinja2:35 msgid "page.my_profile.friends" msgstr "Friends" -#: fietsboek/templates/profile.jinja2:13 +#: fietsboek/templates/profile.jinja2:42 msgid "page.my_profile.unfriend" msgstr "Unfriend" -#: fietsboek/templates/profile.jinja2:22 +#: fietsboek/templates/profile.jinja2:51 msgid "page.my_profile.accept_friend" msgstr "Accept" -#: fietsboek/templates/profile.jinja2:35 +#: fietsboek/templates/profile.jinja2:64 msgid "page.my_profile.friend_request_email" msgstr "Email of the friend" -#: fietsboek/templates/profile.jinja2:41 +#: fietsboek/templates/profile.jinja2:70 msgid "page.my_profile.send_friend_request" msgstr "Send friend request" +#: fietsboek/templates/request_password.jinja2:4 +msgid "page.request_password.title" +msgstr "Request a Password Reset" + +#: fietsboek/templates/request_password.jinja2:5 +msgid "page.request_password.info" +msgstr "" +"If you forgot your password, you can type in your email address below and" +" receive a link to reset your password" + +#: fietsboek/templates/request_password.jinja2:9 +msgid "page.request_password.email" +msgstr "Email" + +#: fietsboek/templates/request_password.jinja2:15 +msgid "page.request_password.request" +msgstr "Send request" + #: fietsboek/templates/upload.jinja2:8 msgid "page.upload.form.gpx" msgstr "GPX file" -#: fietsboek/views/admin.py:26 +#: fietsboek/views/admin.py:45 msgid "flash.badge_added" msgstr "Badge has been added" -#: fietsboek/views/admin.py:39 +#: fietsboek/views/admin.py:69 msgid "flash.badge_modified" msgstr "Badge has been modified" -#: fietsboek/views/admin.py:48 +#: fietsboek/views/admin.py:89 msgid "flash.badge_deleted" msgstr "Badge has been deleted" -#: fietsboek/views/default.py:46 +#: fietsboek/views/default.py:68 msgid "flash.invalid_credentials" msgstr "Invalid login credentials" -#: fietsboek/views/default.py:49 +#: fietsboek/views/default.py:71 msgid "flash.logged_in" msgstr "You are now logged in" -#: fietsboek/views/default.py:56 +#: fietsboek/views/default.py:85 msgid "flash.logged_out" msgstr "You have been logged out" -#: fietsboek/views/profile.py:34 -msgid "flash.friend_not_found" +#: fietsboek/views/default.py:116 +msgid "flash.reset_invalid_email" +msgstr "Invalid email address provided" + +#: fietsboek/views/default.py:121 +msgid "flash.password_token_generated" +msgstr "A password reset email has been sent" + +#: fietsboek/views/default.py:126 +msgid "page.password_reset.email.subject" +msgstr "Fietsboek Password Reset" + +#: fietsboek/views/default.py:131 +msgid "page.password_reset.email.body" msgstr "" +"You can reset your Fietsboek password here: {}\n" +"\n" +"If you did not request a password reset, ignore this email." + +#: fietsboek/views/default.py:157 +msgid "flash.email_verified" +msgstr "Your email address has been verified" + +#: fietsboek/views/default.py:163 fietsboek/views/profile.py:48 +msgid "flash.password_mismatch" +msgstr "Passwords don't match" + +#: fietsboek/views/default.py:168 +msgid "flash.password_updated" +msgstr "Password has been updated" + +#: fietsboek/views/profile.py:54 +msgid "flash.personal_data_updated" +msgstr "Personal data has been updated" + +#: fietsboek/views/profile.py:75 +msgid "flash.friend_not_found" +msgstr "The friend was not found" -#: fietsboek/views/profile.py:39 +#: fietsboek/views/profile.py:80 msgid "flash.friend_already_exists" msgstr "Friend already exists" -#: fietsboek/views/profile.py:47 +#: fietsboek/views/profile.py:88 msgid "flash.friend_added" msgstr "Friend has been added" -#: fietsboek/views/profile.py:57 +#: fietsboek/views/profile.py:98 msgid "flash.friend_request_sent" msgstr "Friend request sent" -#: fietsboek/views/upload.py:25 +#: fietsboek/views/upload.py:51 msgid "flash.no_file_selected" msgstr "No file selected" -#: fietsboek/views/upload.py:32 +#: fietsboek/views/upload.py:61 msgid "flash.invalid_file" msgstr "Invalid GPX file selected" -#: fietsboek/views/upload.py:107 +#: fietsboek/views/upload.py:157 msgid "flash.upload_success" msgstr "Upload successful" -#: fietsboek/views/upload.py:118 +#: fietsboek/views/upload.py:175 msgid "flash.upload_cancelled" msgstr "Upload cancelled" diff --git a/fietsboek/locale/fietslog.pot b/fietsboek/locale/fietslog.pot index 8cbb70a..a4426fe 100644 --- a/fietsboek/locale/fietslog.pot +++ b/fietsboek/locale/fietslog.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2022-06-30 20:14+0200\n" +"POT-Creation-Date: 2022-07-01 13:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,79 +17,79 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.10.3\n" -#: fietsboek/util.py:89 +#: fietsboek/util.py:88 msgid "month.january" msgstr "" -#: fietsboek/util.py:90 +#: fietsboek/util.py:89 msgid "month.february" msgstr "" -#: fietsboek/util.py:91 +#: fietsboek/util.py:90 msgid "month.march" msgstr "" -#: fietsboek/util.py:92 +#: fietsboek/util.py:91 msgid "month.april" msgstr "" -#: fietsboek/util.py:93 +#: fietsboek/util.py:92 msgid "month.may" msgstr "" -#: fietsboek/util.py:94 +#: fietsboek/util.py:93 msgid "month.june" msgstr "" -#: fietsboek/util.py:95 +#: fietsboek/util.py:94 msgid "month.july" msgstr "" -#: fietsboek/util.py:96 +#: fietsboek/util.py:95 msgid "month.august" msgstr "" -#: fietsboek/util.py:97 +#: fietsboek/util.py:96 msgid "month.september" msgstr "" -#: fietsboek/util.py:98 +#: fietsboek/util.py:97 msgid "month.october" msgstr "" -#: fietsboek/util.py:99 +#: fietsboek/util.py:98 msgid "month.november" msgstr "" -#: fietsboek/util.py:100 +#: fietsboek/util.py:99 msgid "month.december" msgstr "" -#: fietsboek/models/track.py:250 +#: fietsboek/models/track.py:319 msgid "tooltip.table.length" msgstr "" -#: fietsboek/models/track.py:251 +#: fietsboek/models/track.py:320 msgid "tooltip.table.uphill" msgstr "" -#: fietsboek/models/track.py:252 +#: fietsboek/models/track.py:321 msgid "tooltip.table.downhill" msgstr "" -#: fietsboek/models/track.py:253 +#: fietsboek/models/track.py:322 msgid "tooltip.table.moving_time" msgstr "" -#: fietsboek/models/track.py:254 +#: fietsboek/models/track.py:323 msgid "tooltip.table.stopped_time" msgstr "" -#: fietsboek/models/track.py:255 +#: fietsboek/models/track.py:324 msgid "tooltip.table.max_speed" msgstr "" -#: fietsboek/models/track.py:256 +#: fietsboek/models/track.py:326 msgid "tooltip.table.avg_speed" msgstr "" @@ -239,26 +239,30 @@ msgid "page.track.form.visibility.friends" msgstr "" #: fietsboek/templates/edit_form.jinja2:15 +msgid "page.track.form.visibility.logged_in" +msgstr "" + +#: fietsboek/templates/edit_form.jinja2:16 msgid "page.track.form.visibility.public" msgstr "" -#: fietsboek/templates/edit_form.jinja2:18 +#: fietsboek/templates/edit_form.jinja2:19 msgid "page.track.form.visibility.info" msgstr "" -#: fietsboek/templates/edit_form.jinja2:22 +#: fietsboek/templates/edit_form.jinja2:23 msgid "page.track.form.tags" msgstr "" -#: fietsboek/templates/edit_form.jinja2:33 +#: fietsboek/templates/edit_form.jinja2:34 msgid "page.track.form.add_tag" msgstr "" -#: fietsboek/templates/edit_form.jinja2:39 +#: fietsboek/templates/edit_form.jinja2:40 msgid "page.track.form.badges" msgstr "" -#: fietsboek/templates/edit_form.jinja2:50 +#: fietsboek/templates/edit_form.jinja2:51 msgid "page.track.form.description" msgstr "" @@ -328,87 +332,175 @@ msgstr "" msgid "page.login.submit" msgstr "" +#: fietsboek/templates/login.jinja2:20 +msgid "page.login.forgot_password" +msgstr "" + +#: fietsboek/templates/password_reset.jinja2:4 +msgid "page.password_reset.title" +msgstr "" + +#: fietsboek/templates/password_reset.jinja2:7 +msgid "page.password_reset.password" +msgstr "" + +#: fietsboek/templates/password_reset.jinja2:13 +msgid "page.password_reset.repeat_password" +msgstr "" + +#: fietsboek/templates/password_reset.jinja2:18 +msgid "page.password_reset.reset" +msgstr "" + #: fietsboek/templates/profile.jinja2:5 msgid "page.my_profile.title" msgstr "" -#: fietsboek/templates/profile.jinja2:6 -msgid "page.my_profile.friends" +#: fietsboek/templates/profile.jinja2:9 +msgid "page.my_profile.personal_data" msgstr "" #: fietsboek/templates/profile.jinja2:13 +msgid "page.my_profile.personal_data.name" +msgstr "" + +#: fietsboek/templates/profile.jinja2:19 +msgid "page.my_profile.personal_data.password" +msgstr "" + +#: fietsboek/templates/profile.jinja2:25 +msgid "page.my_profile.personal_data.repeat_password" +msgstr "" + +#: fietsboek/templates/profile.jinja2:30 +msgid "page.my_profile.personal_data.save" +msgstr "" + +#: fietsboek/templates/profile.jinja2:35 +msgid "page.my_profile.friends" +msgstr "" + +#: fietsboek/templates/profile.jinja2:42 msgid "page.my_profile.unfriend" msgstr "" -#: fietsboek/templates/profile.jinja2:22 +#: fietsboek/templates/profile.jinja2:51 msgid "page.my_profile.accept_friend" msgstr "" -#: fietsboek/templates/profile.jinja2:35 +#: fietsboek/templates/profile.jinja2:64 msgid "page.my_profile.friend_request_email" msgstr "" -#: fietsboek/templates/profile.jinja2:41 +#: fietsboek/templates/profile.jinja2:70 msgid "page.my_profile.send_friend_request" msgstr "" +#: fietsboek/templates/request_password.jinja2:4 +msgid "page.request_password.title" +msgstr "" + +#: fietsboek/templates/request_password.jinja2:5 +msgid "page.request_password.info" +msgstr "" + +#: fietsboek/templates/request_password.jinja2:9 +msgid "page.request_password.email" +msgstr "" + +#: fietsboek/templates/request_password.jinja2:15 +msgid "page.request_password.request" +msgstr "" + #: fietsboek/templates/upload.jinja2:8 msgid "page.upload.form.gpx" msgstr "" -#: fietsboek/views/admin.py:26 +#: fietsboek/views/admin.py:45 msgid "flash.badge_added" msgstr "" -#: fietsboek/views/admin.py:39 +#: fietsboek/views/admin.py:69 msgid "flash.badge_modified" msgstr "" -#: fietsboek/views/admin.py:48 +#: fietsboek/views/admin.py:89 msgid "flash.badge_deleted" msgstr "" -#: fietsboek/views/default.py:46 +#: fietsboek/views/default.py:68 msgid "flash.invalid_credentials" msgstr "" -#: fietsboek/views/default.py:49 +#: fietsboek/views/default.py:71 msgid "flash.logged_in" msgstr "" -#: fietsboek/views/default.py:56 +#: fietsboek/views/default.py:85 msgid "flash.logged_out" msgstr "" -#: fietsboek/views/profile.py:34 +#: fietsboek/views/default.py:116 +msgid "flash.reset_invalid_email" +msgstr "" + +#: fietsboek/views/default.py:121 +msgid "flash.password_token_generated" +msgstr "" + +#: fietsboek/views/default.py:126 +msgid "page.password_reset.email.subject" +msgstr "" + +#: fietsboek/views/default.py:131 +msgid "page.password_reset.email.body" +msgstr "" + +#: fietsboek/views/default.py:157 +msgid "flash.email_verified" +msgstr "" + +#: fietsboek/views/default.py:163 fietsboek/views/profile.py:48 +msgid "flash.password_mismatch" +msgstr "" + +#: fietsboek/views/default.py:168 +msgid "flash.password_updated" +msgstr "" + +#: fietsboek/views/profile.py:54 +msgid "flash.personal_data_updated" +msgstr "" + +#: fietsboek/views/profile.py:75 msgid "flash.friend_not_found" msgstr "" -#: fietsboek/views/profile.py:39 +#: fietsboek/views/profile.py:80 msgid "flash.friend_already_exists" msgstr "" -#: fietsboek/views/profile.py:47 +#: fietsboek/views/profile.py:88 msgid "flash.friend_added" msgstr "" -#: fietsboek/views/profile.py:57 +#: fietsboek/views/profile.py:98 msgid "flash.friend_request_sent" msgstr "" -#: fietsboek/views/upload.py:25 +#: fietsboek/views/upload.py:51 msgid "flash.no_file_selected" msgstr "" -#: fietsboek/views/upload.py:32 +#: fietsboek/views/upload.py:61 msgid "flash.invalid_file" msgstr "" -#: fietsboek/views/upload.py:107 +#: fietsboek/views/upload.py:157 msgid "flash.upload_success" msgstr "" -#: fietsboek/views/upload.py:118 +#: fietsboek/views/upload.py:175 msgid "flash.upload_cancelled" msgstr "" diff --git a/fietsboek/templates/login.jinja2 b/fietsboek/templates/login.jinja2 index b54f1bd..8d1e2c2 100644 --- a/fietsboek/templates/login.jinja2 +++ b/fietsboek/templates/login.jinja2 @@ -17,6 +17,7 @@ </div> </div> <button type="submit" class="btn btn-primary"><i class="bi bi-door-open"></i> {{ _("page.login.submit") }}</button> + <a href="{{ request.route_url("password-reset") }}">{{ _("page.login.forgot_password") }}</a> </form> </div> {% endblock content %} |