From 5774cf9f6472b29aec8fc890d765352890e20e91 Mon Sep 17 00:00:00 2001 From: Gonny Date: Thu, 25 Feb 2021 14:54:28 +0200 Subject: [PATCH 1/5] feat: marking strings as translatable First pass, around 1/2 html files done. Additionally some text strings were modified or removed. One redundant file was also removed. --- app/locales/en/LC_MESSAGES/base.mo | Bin 443 -> 443 bytes app/locales/en/LC_MESSAGES/base.po | 467 ++++++++++++++--- app/locales/he/LC_MESSAGES/base.mo | Bin 557 -> 520 bytes app/locales/he/LC_MESSAGES/base.po | 469 +++++++++++++++--- app/routers/weekview.py | 5 +- app/templates/agenda.html | 26 +- app/templates/archive.html | 20 +- app/templates/notifications.html | 26 +- app/templates/on_this_day.html | 4 +- app/templates/partials/base.html | 10 +- .../partials/calendar/calendar_base.html | 12 +- .../partials/calendar/event/comments_tab.html | 18 +- .../event/edit_event_details_tab.html | 78 +-- .../event/text_editor_partial_body.html | 2 +- .../event/view_event_details_tab.html | 28 +- .../calendar/feature_settings/example.html | 2 +- .../calendar/monthly_view/add_week.html | 12 +- .../calendar/monthly_view/monthly_grid.html | 2 +- .../partials/calendar/navigation.html | 4 +- app/templates/partials/index/index_base.html | 6 +- app/templates/partials/index/navigation.html | 26 +- app/templates/partials/notification/base.html | 19 +- .../notification/generate_archive.html | 4 +- .../notification/generate_notifications.html | 10 +- .../partials/user_profile/middle_content.html | 6 +- .../middle_content/event_card.html | 6 +- .../middle_content/update_event_modal.html | 4 +- .../partials/user_profile/sidebar_left.html | 8 +- .../sidebar_left/daily_horoscope.html | 6 +- .../sidebar_left/features_card.html | 18 +- .../features_card/export_calendar.html | 6 +- .../sidebar_left/profile_card.html | 8 +- .../sidebar_left/profile_card/modals.html | 12 +- .../modals/calendar_privacy_modal.html | 4 +- .../profile_card/profile_update_menu.html | 14 +- .../profile_card/user_details.html | 4 +- .../partials/user_profile/sidebar_right.html | 10 +- .../user_profile/sidebar_right/new_card.html | 4 +- .../user_profile/sidebar_right/new_card2.html | 7 - app/templates/profile.html | 6 +- app/templates/salary/month.j2 | 16 +- app/templates/salary/pick.j2 | 14 +- app/templates/salary/settings.j2 | 58 ++- app/templates/salary/view.j2 | 26 +- tests/salary/conftest.py | 12 +- tests/test_event.py | 2 +- 46 files changed, 1080 insertions(+), 421 deletions(-) delete mode 100644 app/templates/partials/user_profile/sidebar_right/new_card2.html diff --git a/app/locales/en/LC_MESSAGES/base.mo b/app/locales/en/LC_MESSAGES/base.mo index a2af11c0b73ebfd27cb1a041941e462eb5f09fa7..689acb09f5e40a8da834a607970c04bafca25732 100644 GIT binary patch delta 22 dcmdnZyqkH#1a2c!1w#`nLj!FCqm8o_7y(T(1}Ojl delta 22 dcmdnZyqkH#1a3nk1w%6{V{>f-gN?Hl7y(UB1}*>q diff --git a/app/locales/en/LC_MESSAGES/base.po b/app/locales/en/LC_MESSAGES/base.po index 948c8761..c9024e99 100644 --- a/app/locales/en/LC_MESSAGES/base.po +++ b/app/locales/en/LC_MESSAGES/base.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-02-07 21:31+0000\n" +"POT-Creation-Date: 2021-02-25 14:10+0200\n" "PO-Revision-Date: 2021-01-26 21:31+0200\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -18,115 +18,468 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.9.0\n" -#: app/routers/profile.py:20 +#: app/internal/astronomy.py:11 +msgid "No response from server." +msgstr "" + +#: app/routers/export.py:18 msgid "Not found" msgstr "" -#: app/templates/agenda.html:11 +#: app/routers/search.py:53 +msgid "Invalid request." +msgstr "" + +#: app/routers/search.py:58 +msgid "No matching results for '{keywords}'." +msgstr "" + +#: app/templates/agenda.html:14 +#: app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html:9 msgid "From" msgstr "" -#: app/templates/agenda.html:13 -msgid "to" +#: app/templates/agenda.html:18 +#: app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html:11 +msgid "To" msgstr "" -#: app/templates/agenda.html:15 +#: app/templates/agenda.html:22 msgid "Get Agenda" msgstr "" -#: app/templates/agenda.html:20 +#: app/templates/agenda.html:28 +msgid "Filter events by category" +msgstr "" + +#: app/templates/agenda.html:33 +msgid "Filter by categories" +msgstr "" + +#: app/templates/agenda.html:39 msgid "Today" msgstr "" -#: app/templates/agenda.html:23 -msgid "Next week" +#: app/templates/agenda.html:42 +msgid "Next 7 days" msgstr "" -#: app/templates/agenda.html:26 -msgid "Next month" +#: app/templates/agenda.html:45 +msgid "Next 30 days" msgstr "" -#: app/templates/agenda.html:33 +#: app/templates/agenda.html:49 +msgid "Week graph" +msgstr "" + +#: app/templates/agenda.html:61 msgid "Start date is greater than end date" msgstr "" -#: app/templates/agenda.html:35 +#: app/templates/agenda.html:63 msgid "No events found..." msgstr "" -#: app/templates/profile.html:50 -msgid "Update name" +#: app/templates/agenda.html:77 +#: app/templates/partials/calendar/event/edit_event_details_tab.html:111 +#: app/templates/partials/calendar/event/view_event_details_tab.html:22 +msgid "Busy" +msgstr "" + +#: app/templates/agenda.html:77 +#: app/templates/partials/calendar/event/edit_event_details_tab.html:110 +#: app/templates/partials/calendar/event/view_event_details_tab.html:22 +msgid "Free" +msgstr "" + +#: app/templates/agenda.html:80 +#, python-format +msgid "duration: %(duration)s" +msgstr "" + +#: app/templates/archive.html:2 app/templates/archive.html:5 +msgid "Archived notifications" +msgstr "" + +#: app/templates/archive.html:13 +msgid "You don't have any archived notifications." +msgstr "" + +#: app/templates/base.html:41 +msgid "Sign Out" +msgstr "" + +#: app/templates/base.html:68 +msgid "About Us" +msgstr "" + +#: app/templates/notifications.html:2 +msgid "Notifications" +msgstr "" + +#: app/templates/notifications.html:5 +msgid "New notifications" +msgstr "" + +#: app/templates/notifications.html:13 +msgid "Mark all as read" +msgstr "" + +#: app/templates/notifications.html:23 +msgid "You don't have any new notifications." +msgstr "" + +#: app/templates/on_this_day.html:2 +msgid "On this day" +msgstr "" + +#: app/templates/on_this_day.html:11 +msgid "Explore more..." +msgstr "" + +#: app/templates/partials/base.html:38 +msgid "Pylendar" +msgstr "" + +#: app/templates/partials/calendar/event/comments_tab.html:2 +msgid "Write your comment here..." +msgstr "" + +#: app/templates/partials/calendar/event/comments_tab.html:3 +msgid "Post comment" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:8 +msgid "Voice" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:12 +msgid "Volume" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:17 +msgid "Pitch" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:22 +msgid "Rate" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:29 +msgid "Start date:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:30 +msgid "Start date" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:31 +msgid "Start time:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:32 +msgid "Start time" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:36 +msgid "End date:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:37 +msgid "End date" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:38 +msgid "End time:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:39 +msgid "End time" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:43 +#: app/templates/partials/calendar/event/edit_event_details_tab.html:44 +msgid "Location" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:54 +msgid "Title" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:59 +msgid "Item name" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:61 +msgid "Amount" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:63 +msgid "Participant" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:70 +msgid "Add an item" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:77 +msgid "Invited emails:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:78 +msgid "Invited emails, separated by commas" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:82 +msgid "Image:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:88 +msgid "Description:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:93 +msgid "Color:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:95 +msgid "Red" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:96 +msgid "Green" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:97 +msgid "Blue" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:102 +msgid "All-day:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:104 +#: app/templates/partials/calendar/event/edit_event_details_tab.html:135 +msgid "Yes" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:105 +#: app/templates/partials/calendar/event/edit_event_details_tab.html:136 +msgid "No" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:108 +msgid "Availability:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:114 +msgid "Privacy:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:133 +msgid "Google event:" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:61 +msgid "Choose user" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:75 +#: app/templates/partials/calendar/event/view_event_details_tab.html:82 +msgid "ICON" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:76 +#, python-format +msgid "Shared list: %(title)s" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:84 +#, python-format +msgid "Item %(index)s: %(name)s" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:85 +#, python-format +msgid "Amount: %(amount)s" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:86 +#, python-format +msgid "Participant: %(participant)s" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:94 +msgid "Duplicate" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:95 +msgid "Edit" +msgstr "" + +#: app/templates/partials/calendar/feature_settings/example.html:1 +msgid "Feature name" +msgstr "" + +#: app/templates/partials/index/navigation.html:10 +msgid "Home" +msgstr "" + +#: app/templates/partials/index/navigation.html:13 +msgid "Profile" +msgstr "" + +#: app/templates/partials/index/navigation.html:16 +msgid "Sign in" +msgstr "" + +#: app/templates/partials/index/navigation.html:19 +msgid "Sign up" +msgstr "" + +#: app/templates/partials/index/navigation.html:24 +msgid "Agenda" +msgstr "" + +#: app/templates/partials/index/navigation.html:27 +msgid "Search" +msgstr "" + +#: app/templates/partials/index/navigation.html:30 +msgid "Audio settings" msgstr "" -#: app/templates/profile.html:57 app/templates/profile.html:77 -#: app/templates/profile.html:97 app/templates/profile.html:120 -#: app/templates/profile.html:140 +#: app/templates/partials/index/navigation.html:33 +msgid "Categories" +msgstr "" + +#: app/templates/partials/index/navigation.html:36 +msgid "About us" +msgstr "" + +#: app/templates/partials/index/navigation.html:39 +msgid "Credits" +msgstr "" + +#: app/templates/partials/index/navigation.html:47 +msgid "Salary" +msgstr "" + +#: app/templates/partials/index/navigation.html:50 +msgid "Medication" +msgstr "" + +#: app/templates/partials/notification/generate_archive.html:7 +#: app/templates/partials/notification/generate_notifications.html:7 +#, python-format +msgid "Invitation from %(user)s" +msgstr "" + +#: app/templates/partials/user_profile/middle_content.html:6 +msgid "Upcoming events" +msgstr "" + +#: app/templates/partials/user_profile/middle_content/event_card.html:3 +#, python-format +msgid "Upcoming event on %(date)s" +msgstr "" + +#: app/templates/partials/user_profile/middle_content/event_card.html:13 +#, python-format +msgid "%(title)s details" +msgstr "" + +#: app/templates/partials/user_profile/middle_content/update_event_modal.html:11 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html:16 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html:14 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html:14 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html:14 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html:15 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html:15 msgid "Save changes" msgstr "" -#: app/templates/profile.html:70 -msgid "Update email" +#: app/templates/partials/user_profile/sidebar_left/features_card.html:5 +msgid "Explore more features" msgstr "" -#: app/templates/profile.html:90 -msgid "Update description" +#: app/templates/partials/user_profile/sidebar_left/features_card.html:13 +msgid "Try PyLendar bot" msgstr "" -#: app/templates/profile.html:111 -msgid "Update photo" +#: app/templates/partials/user_profile/sidebar_left/features_card.html:20 +msgid "Add holidays to calendar" msgstr "" -#: app/templates/profile.html:220 -msgid "Upcoming event on (date)" +#: app/templates/partials/user_profile/sidebar_left/features_card.html:25 +msgid "Sync with Google" msgstr "" -#: app/templates/profile.html:246 -msgid "The Event (event)" +#: app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html:4 +msgid "Export my calendar" msgstr "" -#: app/templates/profile.html:249 -msgid "Last updated (time) ago" +#: app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html:13 +msgid "Export" msgstr "" -#: app/templates/profile.html:285 -msgid "Explore MeetUps near you" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:11 +msgid "Update full name" msgstr "" -#: app/templates/profile.html:293 -msgid "Your Card" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:17 +msgid "Update email address" msgstr "" -#. i18n: String used in testing. Do not change. -#: tests/test_language.py:32 -msgid "test python translation" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:23 +msgid "Update profile photo" msgstr "" -#~ msgid "Features" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:29 +msgid "Update profile status" +msgstr "" -#~ msgid "Export my calendar" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:35 +msgid "Register telegram ID" +msgstr "" -#~ msgid "Settings" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:41 +msgid "Update calendar privacy" +msgstr "" -#~ msgid "Your feature" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html:7 +msgid "Settings" +msgstr "" -#~ msgid "Calendar" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html:6 +msgid "Set your calendar privacy" +msgstr "" -#~ msgid "Home" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html:6 +msgid "Update description" +msgstr "" -#~ msgid "Profile" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html:6 +msgid "Update email" +msgstr "" -#~ msgid "Sign in" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html:6 +msgid "Update name" +msgstr "" -#~ msgid "Sign up" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html:6 +msgid "Update photo" +msgstr "" + +#: app/templates/partials/user_profile/sidebar_right/meetups.html:4 +msgid "Explore MeetUps near you" +msgstr "" -#~ msgid "Agenda" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_right/new_card.html:4 +msgid "Your card" +msgstr "" + +#. i18n: String used in testing. Do not change. +#: tests/test_language.py:32 +msgid "test python translation" +msgstr "" diff --git a/app/locales/he/LC_MESSAGES/base.mo b/app/locales/he/LC_MESSAGES/base.mo index 2233662f7db746572194be58ed79d61f3a836c11..1a14304152b52691f73e21407bfd18d42478579d 100644 GIT binary patch delta 88 zcmZ3>(!pYLPl#nI0}wC)u?!IFfH+9N2FMl%Vp|~YWn^Fo1=1=&{20id7*fM+WU63j TVr6KcZD6$Vwj$$XP9_xqw5SWX delta 124 zcmeBRS<4b~Pl#nI0}wC+u?!HKfH+9N2gqgzVqYK@2jWm5?qy_P$OY0oK>QoXRsqr+ zOh6)_C_gPTCv~Dt4Y#3@f}xp}vAMQ^!N$XijND7Eued(-`jYE2ug{tMh*1pyuss+P diff --git a/app/locales/he/LC_MESSAGES/base.po b/app/locales/he/LC_MESSAGES/base.po index 959b1f6d..0050ca5a 100644 --- a/app/locales/he/LC_MESSAGES/base.po +++ b/app/locales/he/LC_MESSAGES/base.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-02-07 21:31+0000\n" +"POT-Creation-Date: 2021-02-25 14:10+0200\n" "PO-Revision-Date: 2021-01-26 21:31+0200\n" "Last-Translator: FULL NAME \n" "Language: he\n" @@ -18,115 +18,468 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.9.0\n" -#: app/routers/profile.py:20 +#: app/internal/astronomy.py:11 +msgid "No response from server." +msgstr "" + +#: app/routers/export.py:18 msgid "Not found" msgstr "" -#: app/templates/agenda.html:11 +#: app/routers/search.py:53 +msgid "Invalid request." +msgstr "" + +#: app/routers/search.py:58 +msgid "No matching results for '{keywords}'." +msgstr "" + +#: app/templates/agenda.html:14 +#: app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html:9 msgid "From" msgstr "" -#: app/templates/agenda.html:13 -msgid "to" +#: app/templates/agenda.html:18 +#: app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html:11 +msgid "To" msgstr "" -#: app/templates/agenda.html:15 +#: app/templates/agenda.html:22 msgid "Get Agenda" msgstr "" -#: app/templates/agenda.html:20 +#: app/templates/agenda.html:28 +msgid "Filter events by category" +msgstr "" + +#: app/templates/agenda.html:33 +msgid "Filter by categories" +msgstr "" + +#: app/templates/agenda.html:39 msgid "Today" msgstr "" -#: app/templates/agenda.html:23 -msgid "Next week" +#: app/templates/agenda.html:42 +msgid "Next 7 days" msgstr "" -#: app/templates/agenda.html:26 -msgid "Next month" +#: app/templates/agenda.html:45 +msgid "Next 30 days" msgstr "" -#: app/templates/agenda.html:33 +#: app/templates/agenda.html:49 +msgid "Week graph" +msgstr "" + +#: app/templates/agenda.html:61 msgid "Start date is greater than end date" msgstr "" -#: app/templates/agenda.html:35 +#: app/templates/agenda.html:63 msgid "No events found..." msgstr "" -#: app/templates/profile.html:50 -msgid "Update name" +#: app/templates/agenda.html:77 +#: app/templates/partials/calendar/event/edit_event_details_tab.html:111 +#: app/templates/partials/calendar/event/view_event_details_tab.html:22 +msgid "Busy" +msgstr "" + +#: app/templates/agenda.html:77 +#: app/templates/partials/calendar/event/edit_event_details_tab.html:110 +#: app/templates/partials/calendar/event/view_event_details_tab.html:22 +msgid "Free" +msgstr "" + +#: app/templates/agenda.html:80 +#, python-format +msgid "duration: %(duration)s" +msgstr "" + +#: app/templates/archive.html:2 app/templates/archive.html:5 +msgid "Archived notifications" +msgstr "" + +#: app/templates/archive.html:13 +msgid "You don't have any archived notifications." +msgstr "" + +#: app/templates/base.html:41 +msgid "Sign Out" +msgstr "" + +#: app/templates/base.html:68 +msgid "About Us" +msgstr "" + +#: app/templates/notifications.html:2 +msgid "Notifications" +msgstr "" + +#: app/templates/notifications.html:5 +msgid "New notifications" +msgstr "" + +#: app/templates/notifications.html:13 +msgid "Mark all as read" +msgstr "" + +#: app/templates/notifications.html:23 +msgid "You don't have any new notifications." +msgstr "" + +#: app/templates/on_this_day.html:2 +msgid "On this day" +msgstr "" + +#: app/templates/on_this_day.html:11 +msgid "Explore more..." +msgstr "" + +#: app/templates/partials/base.html:38 +msgid "Pylendar" +msgstr "" + +#: app/templates/partials/calendar/event/comments_tab.html:2 +msgid "Write your comment here..." +msgstr "" + +#: app/templates/partials/calendar/event/comments_tab.html:3 +msgid "Post comment" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:8 +msgid "Voice" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:12 +msgid "Volume" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:17 +msgid "Pitch" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:22 +msgid "Rate" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:29 +msgid "Start date:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:30 +msgid "Start date" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:31 +msgid "Start time:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:32 +msgid "Start time" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:36 +msgid "End date:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:37 +msgid "End date" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:38 +msgid "End time:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:39 +msgid "End time" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:43 +#: app/templates/partials/calendar/event/edit_event_details_tab.html:44 +msgid "Location" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:54 +msgid "Title" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:59 +msgid "Item name" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:61 +msgid "Amount" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:63 +msgid "Participant" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:70 +msgid "Add an item" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:77 +msgid "Invited emails:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:78 +msgid "Invited emails, separated by commas" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:82 +msgid "Image:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:88 +msgid "Description:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:93 +msgid "Color:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:95 +msgid "Red" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:96 +msgid "Green" msgstr "" -#: app/templates/profile.html:57 app/templates/profile.html:77 -#: app/templates/profile.html:97 app/templates/profile.html:120 -#: app/templates/profile.html:140 +#: app/templates/partials/calendar/event/edit_event_details_tab.html:97 +msgid "Blue" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:102 +msgid "All-day:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:104 +#: app/templates/partials/calendar/event/edit_event_details_tab.html:135 +msgid "Yes" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:105 +#: app/templates/partials/calendar/event/edit_event_details_tab.html:136 +msgid "No" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:108 +msgid "Availability:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:114 +msgid "Privacy:" +msgstr "" + +#: app/templates/partials/calendar/event/edit_event_details_tab.html:133 +msgid "Google event:" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:61 +msgid "Choose user" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:75 +#: app/templates/partials/calendar/event/view_event_details_tab.html:82 +msgid "ICON" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:76 +#, python-format +msgid "Shared list: %(title)s" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:84 +#, python-format +msgid "Item %(index)s: %(name)s" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:85 +#, python-format +msgid "Amount: %(amount)s" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:86 +#, python-format +msgid "Participant: %(participant)s" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:94 +msgid "Duplicate" +msgstr "" + +#: app/templates/partials/calendar/event/view_event_details_tab.html:95 +msgid "Edit" +msgstr "" + +#: app/templates/partials/calendar/feature_settings/example.html:1 +msgid "Feature name" +msgstr "" + +#: app/templates/partials/index/navigation.html:10 +msgid "Home" +msgstr "" + +#: app/templates/partials/index/navigation.html:13 +msgid "Profile" +msgstr "" + +#: app/templates/partials/index/navigation.html:16 +msgid "Sign in" +msgstr "" + +#: app/templates/partials/index/navigation.html:19 +msgid "Sign up" +msgstr "" + +#: app/templates/partials/index/navigation.html:24 +msgid "Agenda" +msgstr "" + +#: app/templates/partials/index/navigation.html:27 +msgid "Search" +msgstr "" + +#: app/templates/partials/index/navigation.html:30 +msgid "Audio settings" +msgstr "" + +#: app/templates/partials/index/navigation.html:33 +msgid "Categories" +msgstr "" + +#: app/templates/partials/index/navigation.html:36 +msgid "About us" +msgstr "" + +#: app/templates/partials/index/navigation.html:39 +msgid "Credits" +msgstr "" + +#: app/templates/partials/index/navigation.html:47 +msgid "Salary" +msgstr "" + +#: app/templates/partials/index/navigation.html:50 +msgid "Medication" +msgstr "" + +#: app/templates/partials/notification/generate_archive.html:7 +#: app/templates/partials/notification/generate_notifications.html:7 +#, python-format +msgid "Invitation from %(user)s" +msgstr "" + +#: app/templates/partials/user_profile/middle_content.html:6 +msgid "Upcoming events" +msgstr "" + +#: app/templates/partials/user_profile/middle_content/event_card.html:3 +#, python-format +msgid "Upcoming event on %(date)s" +msgstr "" + +#: app/templates/partials/user_profile/middle_content/event_card.html:13 +#, python-format +msgid "%(title)s details" +msgstr "" + +#: app/templates/partials/user_profile/middle_content/update_event_modal.html:11 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html:16 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html:14 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html:14 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html:14 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html:15 +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html:15 msgid "Save changes" msgstr "" -#: app/templates/profile.html:70 -msgid "Update email" +#: app/templates/partials/user_profile/sidebar_left/features_card.html:5 +msgid "Explore more features" msgstr "" -#: app/templates/profile.html:90 -msgid "Update description" +#: app/templates/partials/user_profile/sidebar_left/features_card.html:13 +msgid "Try PyLendar bot" msgstr "" -#: app/templates/profile.html:111 -msgid "Update photo" +#: app/templates/partials/user_profile/sidebar_left/features_card.html:20 +msgid "Add holidays to calendar" msgstr "" -#: app/templates/profile.html:220 -msgid "Upcoming event on (date)" +#: app/templates/partials/user_profile/sidebar_left/features_card.html:25 +msgid "Sync with Google" msgstr "" -#: app/templates/profile.html:246 -msgid "The Event (event)" +#: app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html:4 +msgid "Export my calendar" msgstr "" -#: app/templates/profile.html:249 -msgid "Last updated (time) ago" +#: app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html:13 +msgid "Export" msgstr "" -#: app/templates/profile.html:285 -msgid "Explore MeetUps near you" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:11 +msgid "Update full name" msgstr "" -#: app/templates/profile.html:293 -msgid "Your Card" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:17 +msgid "Update email address" msgstr "" -#. i18n: String used in testing. Do not change. -#: tests/test_language.py:32 -msgid "test python translation" -msgstr "בדיקת תרגום בפייתון" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:23 +msgid "Update profile photo" +msgstr "" -#~ msgid "Features" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:29 +msgid "Update profile status" +msgstr "" -#~ msgid "Export my calendar" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:35 +msgid "Register telegram ID" +msgstr "" -#~ msgid "Settings" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html:41 +msgid "Update calendar privacy" +msgstr "" -#~ msgid "Your feature" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html:7 +msgid "Settings" +msgstr "" -#~ msgid "Calendar" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html:6 +msgid "Set your calendar privacy" +msgstr "" -#~ msgid "Home" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html:6 +msgid "Update description" +msgstr "" -#~ msgid "Profile" -#~ msgstr "פרופיל" +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html:6 +msgid "Update email" +msgstr "" -#~ msgid "Sign in" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html:6 +msgid "Update name" +msgstr "" -#~ msgid "Sign up" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html:6 +msgid "Update photo" +msgstr "" + +#: app/templates/partials/user_profile/sidebar_right/meetups.html:4 +msgid "Explore MeetUps near you" +msgstr "" -#~ msgid "Agenda" -#~ msgstr "" +#: app/templates/partials/user_profile/sidebar_right/new_card.html:4 +msgid "Your card" +msgstr "" + +#. i18n: String used in testing. Do not change. +#: tests/test_language.py:32 +msgid "test python translation" +msgstr "בדיקת תרגום בפייתון" diff --git a/app/routers/weekview.py b/app/routers/weekview.py index 9b4f2bb9..debd2a2a 100644 --- a/app/routers/weekview.py +++ b/app/routers/weekview.py @@ -7,16 +7,13 @@ from sqlalchemy.orm.session import Session from app.database.models import Event, User -from app.dependencies import TEMPLATES_PATH, get_db +from app.dependencies import get_db, templates from app.routers.dayview import ( DivAttributes, dayview, get_events_and_attributes, ) -templates = Jinja2Templates(directory=TEMPLATES_PATH) - - router = APIRouter() diff --git a/app/templates/agenda.html b/app/templates/agenda.html index 54b65208..2d7d8a9a 100644 --- a/app/templates/agenda.html +++ b/app/templates/agenda.html @@ -2,35 +2,35 @@ {% block head %} {{ super() }} - - + + {% endblock %} {% block content %}
-
+
- +
-
+
- +
- +
@@ -73,11 +73,11 @@

{{ start_date.strftime("%d/%m/%Y") }} - {{ end_date.strftime("%d/
{{ events_date }}
{% for event in events_list %} -
- {% set availability = 'Busy' if event.availability else 'Free' %} -
+
+ {% set availability, availability_text = ("busy", gettext("Busy")) if event.availability else ("free", gettext("Free")) %} +
{{ event.start }} - {{ event.title | safe }}
- duration: {{ event.duration }} + {{ gettext("duration: %(duration)s", duration=event.duration) }}
{% endfor %} @@ -85,4 +85,4 @@

{{ start_date.strftime("%d/%m/%Y") }} - {{ end_date.strftime("%d/ {% endfor %}

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/archive.html b/app/templates/archive.html index a74da791..f4038bba 100644 --- a/app/templates/archive.html +++ b/app/templates/archive.html @@ -1,26 +1,14 @@ {% extends "./partials/notification/base.html" %} -{% block page_name %}Archive{% endblock page_name %} +{% block page_name %}{{ gettext("Archived notifications") }}{% endblock page_name %} {% block description %} -
-
Archived Notifications
-

- In this page you can view all of your archived notifications.
- Any notification you have marked as read or declined, you will see here.
- You can use the - button to accept an invitation that you already declined. -

-
+
{{ gettext("Archived notifications") }}
{% endblock description %} -{% block link %} - -{% endblock link %} - {% block notifications %} - {% include './partials/notification/generate_archive.html' %} + {% include "./partials/notification/generate_archive.html" %} {% endblock notifications %} {% block no_notifications_msg %} - You don't have any archived notifications. + {{ gettext("You don't have any archived notifications.") }} {% endblock no_notifications_msg %} diff --git a/app/templates/notifications.html b/app/templates/notifications.html index 7b33a17f..6a38d343 100644 --- a/app/templates/notifications.html +++ b/app/templates/notifications.html @@ -1,38 +1,24 @@ {% extends "./partials/notification/base.html" %} -{% block page_name %}Notifications{% endblock page_name %} +{% block page_name %}{{ gettext("Notifications") }}{% endblock page_name %} {% block description %} -
-
New Notifications
-

- In this page you can view all of your new notifications.
- use the - button to mark as read - and the - and - to accept and decline. -

-
+
{{ gettext("New notifications") }}
{% endblock description %} -{% block link %} - -{% endblock link %} - {% block optional %} -
+
{% endblock optional %} {% block notifications %} - {% include './partials/notification/generate_notifications.html' %} + {% include "./partials/notification/generate_notifications.html" %} {% endblock notifications %} {% block no_notifications_msg %} - You don't have any new notifications. + {{ gettext("You don't have any new notifications.") }} {% endblock no_notifications_msg %} diff --git a/app/templates/on_this_day.html b/app/templates/on_this_day.html index 4a8b784b..876ba625 100644 --- a/app/templates/on_this_day.html +++ b/app/templates/on_this_day.html @@ -1,5 +1,5 @@
-

On This Day

+

{{ gettext("On this day") }}

    {% for event in on_this_day_data.events[1::-1] %}
  • @@ -8,5 +8,5 @@
    • {% endfor %}
- Explore More ... + {{ gettext("Explore more...") }}
diff --git a/app/templates/partials/base.html b/app/templates/partials/base.html index 790a617d..4f052d1b 100644 --- a/app/templates/partials/base.html +++ b/app/templates/partials/base.html @@ -12,7 +12,7 @@ - + @@ -27,19 +27,19 @@ - + - + {% endblock head %} {% block title %} - Pylendar{% if self.page_name() %} - {% endif %}{% block page_name %}{% endblock %} + {{ gettext("Pylendar") }}{% if self.page_name() %} - {% endif %}{% block page_name %}{% endblock %} {% endblock %} {% block body %} {% endblock %} - \ No newline at end of file + diff --git a/app/templates/partials/calendar/calendar_base.html b/app/templates/partials/calendar/calendar_base.html index 7f539c37..e9ee0b08 100644 --- a/app/templates/partials/calendar/calendar_base.html +++ b/app/templates/partials/calendar/calendar_base.html @@ -2,14 +2,14 @@ {% block head %} {{super()}} - + {% endblock head %} {% block page_name %}Month View{% endblock page_name %} {% block body %}
- {% include 'partials/calendar/navigation.html' %} + {% include "partials/calendar/navigation.html" %}
- {% include 'partials/calendar/feature_settings/example.html' %} + {% include "partials/calendar/feature_settings/example.html" %}
{% block content %} @@ -17,8 +17,8 @@
- - + + - + {% endblock body %} diff --git a/app/templates/partials/calendar/event/comments_tab.html b/app/templates/partials/calendar/event/comments_tab.html index 64c0de7f..f3bda297 100644 --- a/app/templates/partials/calendar/event/comments_tab.html +++ b/app/templates/partials/calendar/event/comments_tab.html @@ -1,22 +1,22 @@ -
- - + + +
{% for comment in comments %}
- Profile image -
+ Profile image +
-

{{ comment['username'] }}

-

{{ comment['time'] }}

+

{{ comment["username"] }}

+

{{ comment["time"] }}

- {{ comment['content'] }} + {{ comment["content"] }}
-{% endfor %} \ No newline at end of file +{% endfor %} diff --git a/app/templates/partials/calendar/event/edit_event_details_tab.html b/app/templates/partials/calendar/event/edit_event_details_tab.html index f0bf0ad3..c44ea83c 100644 --- a/app/templates/partials/calendar/event/edit_event_details_tab.html +++ b/app/templates/partials/calendar/event/edit_event_details_tab.html @@ -5,43 +5,43 @@
- +
- +
- +
- +
- - - - + + + +
- - - - + + + +
- - + +
@@ -51,67 +51,67 @@
- +
- + - + - +
- - + +
- +
- +
- +
- + - + - + {% if categories_list[0] is defined %} - + {% endif %} {% if categories_list[1] is defined %} {% for category in categories_list[1:] %} - + {% endfor %} {% endif %} - +
diff --git a/app/templates/partials/calendar/event/text_editor_partial_body.html b/app/templates/partials/calendar/event/text_editor_partial_body.html index b292fa7a..5541fcf1 100644 --- a/app/templates/partials/calendar/event/text_editor_partial_body.html +++ b/app/templates/partials/calendar/event/text_editor_partial_body.html @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/app/templates/partials/calendar/event/view_event_details_tab.html b/app/templates/partials/calendar/event/view_event_details_tab.html index 8ec2818f..584e84dd 100644 --- a/app/templates/partials/calendar/event/view_event_details_tab.html +++ b/app/templates/partials/calendar/event/view_event_details_tab.html @@ -9,7 +9,7 @@

{{ event.title }}

- +
@@ -19,7 +19,7 @@

{{ event.title }}

{% endif %}
- {{ 'Free' if event.availability else 'Busy' }} + {{ gettext("Free") if event.availability else gettext("Busy") }}
@@ -30,7 +30,7 @@

{{ event.title }}

{% if event.location %}
- icon wase + icon wase
{{ event.location }}
{% endif %} @@ -56,11 +56,11 @@

{{ event.title }}

{% endif %} {% if event.invitees %} -
+
- + @@ -72,18 +72,18 @@

{{ event.title }}

- ICON -

Shared list: {{ event.shared_list.title }}

+ {{ gettext("ICON") }} +

{{ gettext("Shared list: %(title)s", title=event.shared_list.title) }}

{% if event.shared_list is not none %}
{% for item in event.shared_list.items %} - ICON + {{ gettext("ICON") }}
-

Item {{ loop.index }}: {{ item.name }}

-

Amount: {{ item.amount }}

-

Participant: {{ item.participant }}

+

{{ gettext("Item %(index)s: %(name)s", index=loop.index, name=item.name) }}

+

{{ gettext("Amount: %(amount)s", amount=item.amount) }}

+

{{ gettext("Participant: %(participant)s", participant=item.participant) }}

{% endfor %}
@@ -91,6 +91,6 @@

{{ event.title }}

- - + +
diff --git a/app/templates/partials/calendar/feature_settings/example.html b/app/templates/partials/calendar/feature_settings/example.html index a9f4edd0..4c89c354 100644 --- a/app/templates/partials/calendar/feature_settings/example.html +++ b/app/templates/partials/calendar/feature_settings/example.html @@ -1 +1 @@ -
FEATURE NAME
\ No newline at end of file +
{{ gettext("Feature name") }}
diff --git a/app/templates/partials/calendar/monthly_view/add_week.html b/app/templates/partials/calendar/monthly_view/add_week.html index 2f821846..e840d629 100644 --- a/app/templates/partials/calendar/monthly_view/add_week.html +++ b/app/templates/partials/calendar/monthly_view/add_week.html @@ -1,19 +1,19 @@ {% for week in weeks_block %}
{% for day in week.days %} -
+
-
{{ day }}
+
{{ day }}
{% for devent in day.dailyevents %} -
-
{{ devent[0] }}
-
{{ devent[1] }}
+
+
{{ devent[0] }}
+
{{ devent[1] }}
{% endfor %} {% for event in day.events %} -
{{ event[0] }} {{ event[1] }}
+
{{ event[0] }} {{ event[1] }}
{% endfor %}
{% endfor %} diff --git a/app/templates/partials/calendar/monthly_view/monthly_grid.html b/app/templates/partials/calendar/monthly_view/monthly_grid.html index 1a2df047..f5171b70 100644 --- a/app/templates/partials/calendar/monthly_view/monthly_grid.html +++ b/app/templates/partials/calendar/monthly_view/monthly_grid.html @@ -9,7 +9,7 @@ {% endfor %}
- {% include 'partials/calendar/monthly_view/add_week.html' %} + {% include "partials/calendar/monthly_view/add_week.html" %}
diff --git a/app/templates/partials/calendar/navigation.html b/app/templates/partials/calendar/navigation.html index ed73747d..334766dc 100644 --- a/app/templates/partials/calendar/navigation.html +++ b/app/templates/partials/calendar/navigation.html @@ -8,7 +8,7 @@
@@ -25,7 +25,7 @@
diff --git a/app/templates/partials/index/index_base.html b/app/templates/partials/index/index_base.html index b2b433ea..e3bd00de 100644 --- a/app/templates/partials/index/index_base.html +++ b/app/templates/partials/index/index_base.html @@ -2,12 +2,12 @@ {% block head %} {{ super() }} - + {% endblock head %} {% block body %} - {% include 'partials/index/navigation.html' %} + {% include "partials/index/navigation.html" %} {% block content %} {% endblock %} -{% endblock body %} \ No newline at end of file +{% endblock body %} diff --git a/app/templates/partials/index/navigation.html b/app/templates/partials/index/navigation.html index 60baf35d..0159f884 100644 --- a/app/templates/partials/index/navigation.html +++ b/app/templates/partials/index/navigation.html @@ -7,47 +7,47 @@ diff --git a/app/templates/partials/notification/base.html b/app/templates/partials/notification/base.html index 0df8fcde..0390de39 100644 --- a/app/templates/partials/notification/base.html +++ b/app/templates/partials/notification/base.html @@ -1,28 +1,23 @@ {% extends "partials/base.html" %} {% block head %} - {{super()}} + {{ super() }} - - + + {% endblock head %} {% block body %}
- {% include 'partials/calendar/navigation.html' %} + {% include "partials/calendar/navigation.html" %}
- {% include 'partials/calendar/feature_settings/example.html' %} + {% include "partials/calendar/feature_settings/example.html" %}
{% block content %}
{% block description %} {% endblock description %} -
@@ -51,6 +46,6 @@
- - + + {% endblock body %} diff --git a/app/templates/partials/notification/generate_archive.html b/app/templates/partials/notification/generate_archive.html index 2d0e0ed3..79387157 100644 --- a/app/templates/partials/notification/generate_archive.html +++ b/app/templates/partials/notification/generate_archive.html @@ -4,12 +4,12 @@
{% if type == "invitations" %}
- Invitation from {{ n.event.owner.username }} - + {{ gettext("Invitation from %(user)s", user=n.event.owner.username) }} - {{ n.event.title }} (declined)
- -
-
diff --git a/app/templates/partials/user_profile/middle_content/event_card.html b/app/templates/partials/user_profile/middle_content/event_card.html index 53474f6a..7c775ab0 100644 --- a/app/templates/partials/user_profile/middle_content/event_card.html +++ b/app/templates/partials/user_profile/middle_content/event_card.html @@ -1,8 +1,8 @@
- Upcoming event on {{ event.start.strftime("%d/%m/%Y %H:%M") }} + {{ gettext("Upcoming event on %(date)s", date=event.start.strftime("%d/%m/%Y %H:%M")) }} - {% include 'partials/user_profile/middle_content/event_settings.html' %} + {% include "partials/user_profile/middle_content/event_settings.html" %}
@@ -10,6 +10,6 @@ {{ event.title }} - {{ event.content if event.content is not none }}

- {{ event.title }} details + {{ gettext("%(title)s details", title=event.title) }}
diff --git a/app/templates/partials/user_profile/middle_content/update_event_modal.html b/app/templates/partials/user_profile/middle_content/update_event_modal.html index a6966e28..af633b3b 100644 --- a/app/templates/partials/user_profile/middle_content/update_event_modal.html +++ b/app/templates/partials/user_profile/middle_content/update_event_modal.html @@ -8,9 +8,9 @@

Update Event

{{ event.content }}
- +
-
\ No newline at end of file +
diff --git a/app/templates/partials/user_profile/sidebar_left.html b/app/templates/partials/user_profile/sidebar_left.html index 92c48acb..5001bfc0 100644 --- a/app/templates/partials/user_profile/sidebar_left.html +++ b/app/templates/partials/user_profile/sidebar_left.html @@ -1,12 +1,12 @@
-{% include 'partials/user_profile/sidebar_left/profile_card.html' %} +{% include "partials/user_profile/sidebar_left/profile_card.html" %} - {% include 'partials/user_profile/sidebar_left/features_card.html' %} + {% include "partials/user_profile/sidebar_left/features_card.html" %} - {% include 'partials/user_profile/sidebar_left/daily_horoscope.html' %} + {% include "partials/user_profile/sidebar_left/daily_horoscope.html" %} -
\ No newline at end of file +
diff --git a/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html b/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html index 29bea347..0f0cc51b 100644 --- a/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html +++ b/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html @@ -2,12 +2,12 @@
- -
\ No newline at end of file +

diff --git a/app/templates/partials/user_profile/sidebar_left/features_card.html b/app/templates/partials/user_profile/sidebar_left/features_card.html index 946d1040..6d458484 100644 --- a/app/templates/partials/user_profile/sidebar_left/features_card.html +++ b/app/templates/partials/user_profile/sidebar_left/features_card.html @@ -2,7 +2,7 @@

- Explore more features + {{ gettext("Explore more features") }}

diff --git a/app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html b/app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html index 3a34dade..cce36cf6 100644 --- a/app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html +++ b/app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html @@ -1,15 +1,15 @@
- +



- +
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card.html b/app/templates/partials/user_profile/sidebar_left/profile_card.html index b4dbaec2..67041532 100644 --- a/app/templates/partials/user_profile/sidebar_left/profile_card.html +++ b/app/templates/partials/user_profile/sidebar_left/profile_card.html @@ -1,8 +1,8 @@
- {% include 'partials/user_profile/sidebar_left/profile_card/profile_update_menu.html' %} + {% include "partials/user_profile/sidebar_left/profile_card/profile_update_menu.html" %} - {% include 'partials/user_profile/sidebar_left/profile_card/modals.html' %} + {% include "partials/user_profile/sidebar_left/profile_card/modals.html" %} - {% include 'partials/user_profile/sidebar_left/profile_card/user_details.html' %} -
\ No newline at end of file + {% include "partials/user_profile/sidebar_left/profile_card/user_details.html" %} +
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals.html index cde0ca1e..5660f5a0 100644 --- a/app/templates/partials/user_profile/sidebar_left/profile_card/modals.html +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals.html @@ -1,17 +1,17 @@ -{% include 'partials/user_profile/sidebar_left/profile_card/modals/name_modal.html' %} +{% include "partials/user_profile/sidebar_left/profile_card/modals/name_modal.html" %} -{% include 'partials/user_profile/sidebar_left/profile_card/modals/email_modal.html' %} +{% include "partials/user_profile/sidebar_left/profile_card/modals/email_modal.html" %} -{% include 'partials/user_profile/sidebar_left/profile_card/modals/description_modal.html' %} +{% include "partials/user_profile/sidebar_left/profile_card/modals/description_modal.html" %} -{% include 'partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html' %} +{% include "partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html" %} -{% include 'partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html' %} +{% include "partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html" %} -{% include 'partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html' %} \ No newline at end of file +{% include "partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html" %} diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html index 0a2a7e7c..0c7aa828 100644 --- a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html @@ -3,7 +3,7 @@
-

Set your calendar privacy

+

{{ gettext("Set your calendar privacy") }}

@@ -13,7 +13,7 @@

Set your calendar privacy

- +
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html b/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html index df643cf1..00135565 100644 --- a/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html @@ -8,39 +8,39 @@
    • -
    \ No newline at end of file + diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html b/app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html index 5f85416f..542492c2 100644 --- a/app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html @@ -4,11 +4,11 @@
    {{ user.full_name }}

    - Settings + {{ gettext("Settings") }}

    {{ user.description }}

    - \ No newline at end of file + diff --git a/app/templates/partials/user_profile/sidebar_right.html b/app/templates/partials/user_profile/sidebar_right.html index c84dedb8..56c4f27c 100644 --- a/app/templates/partials/user_profile/sidebar_right.html +++ b/app/templates/partials/user_profile/sidebar_right.html @@ -1,15 +1,15 @@
    - {% include 'partials/user_profile/sidebar_right/meetups.html' %} + {% include "partials/user_profile/sidebar_right/meetups.html" %} - {% include 'partials/user_profile/sidebar_right/on_this_day.html' %} + {% include "partials/user_profile/sidebar_right/on_this_day.html" %} - {% include 'partials/user_profile/sidebar_right/new_card.html' %} + {% include "partials/user_profile/sidebar_right/new_card.html" %} - {% include 'partials/user_profile/sidebar_right/new_card2.html' %} + {% include "partials/user_profile/sidebar_right/new_card.html" %} -
    \ No newline at end of file + diff --git a/app/templates/partials/user_profile/sidebar_right/new_card.html b/app/templates/partials/user_profile/sidebar_right/new_card.html index ff6350f7..0fa26275 100644 --- a/app/templates/partials/user_profile/sidebar_right/new_card.html +++ b/app/templates/partials/user_profile/sidebar_right/new_card.html @@ -1,7 +1,7 @@

    - {{ gettext("Your Card") }} + {{ gettext("Your card") }}

    -
    \ No newline at end of file + diff --git a/app/templates/partials/user_profile/sidebar_right/new_card2.html b/app/templates/partials/user_profile/sidebar_right/new_card2.html deleted file mode 100644 index 20529588..00000000 --- a/app/templates/partials/user_profile/sidebar_right/new_card2.html +++ /dev/null @@ -1,7 +0,0 @@ -
    -
    -

    - Your Card -

    -
    -
    \ No newline at end of file diff --git a/app/templates/profile.html b/app/templates/profile.html index 5ac4c16a..23735576 100644 --- a/app/templates/profile.html +++ b/app/templates/profile.html @@ -5,13 +5,13 @@
    - {% include 'partials/user_profile/sidebar_left.html' %} + {% include "partials/user_profile/sidebar_left.html" %} - {% include 'partials/user_profile/middle_content.html' %} + {% include "partials/user_profile/middle_content.html" %} - {% include 'partials/user_profile/sidebar_right.html' %} + {% include "partials/user_profile/sidebar_right.html" %}
    diff --git a/app/templates/salary/month.j2 b/app/templates/salary/month.j2 index c11e3984..432e7451 100644 --- a/app/templates/salary/month.j2 +++ b/app/templates/salary/month.j2 @@ -4,35 +4,35 @@

    {{ category }}

    -

    Monthly Salary

    +

    {{ gettext("Monthly salary") }}

    - +
    - +
    - +
    - +
    - +
    -

    Need to alter your settings? Edit your settings here

    +

    {{ gettext("Settings") }}

    -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/app/templates/salary/pick.j2 b/app/templates/salary/pick.j2 index 351431a4..bca8d2e3 100644 --- a/app/templates/salary/pick.j2 +++ b/app/templates/salary/pick.j2 @@ -4,15 +4,15 @@

    {% if edit %} - Edit Settings + {{ gettext("Edit settings") }} {% else %} - View Salary + {{ gettext("View salary") }} {% endif %}

    - + {% for id, category in categories.items() %} {% endfor %}
    - + {% endif %}
    - - + +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    {% if category %} -

    Settings don't need editing? View your salary here

    +

    {{ gettext("View your salary") }}

    {% else %} -

    Already created your settings? View your salary or Edit your salary

    +

    {{ gettext("Setting created?") }} {{ gettext("View your salary") }} {{ gettext("or") }} {{ gettext("Edit your salary") }}

    {% endif %}
    -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/app/templates/salary/view.j2 b/app/templates/salary/view.j2 index 3fa31b6a..ebd1a0c4 100644 --- a/app/templates/salary/view.j2 +++ b/app/templates/salary/view.j2 @@ -7,38 +7,38 @@

    {{ category }}

    {{ month }} {{ salary.year}}

    - +

    Base Salary

    -

    Hourly Wage: {{ wage.wage }}

    -

    Number of shifts: {{ salary.num_of_shifts }}

    -

    Base Salary: {{ salary.base_salary }}

    +

    {{ gettext("Hourly wage:") }} {{ wage.wage }}

    +

    {{ gettext("Number of shifts:") }} {{ salary.num_of_shifts }}

    +

    {{ gettext("Base salary:") }} {{ salary.base_salary }}

    Additions

    {% if salary.month_weekly_overtime %} -

    Weekly Overtime Total: {{ salary.month_weekly_overtime }}

    +

    Weekly overtime total:") }} {{ salary.month_weekly_overtime }}

    {% endif %} {% if salary.transport %} -

    Transport: {{ salary.transport }}

    +

    {{ gettext("Transport:") }} {{ salary.transport }}

    {% endif %} {% if salary.bonus %} -

    Bonus: {{ salary.bonus }}

    +

    {{ gettext("Bonus:") }} {{ salary.bonus }}

    {% endif %} - + {% if salary.deduction %}

    Deductions

    -

    Deduction: {{ salary.deduction }}

    +

    {{ gettext("Deduction:") }} {{ salary.deduction }}

    {% endif %}
    - +
    -

    Total Salary:

    +

    {{ gettext("Total salary:") }}

    {{ salary.salary }}
    -

    Need to alter your settings? Edit your settings here

    +

    {{ gettext("Edit settings") }}

    -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/tests/salary/conftest.py b/tests/salary/conftest.py index 51c77288..f61472d7 100644 --- a/tests/salary/conftest.py +++ b/tests/salary/conftest.py @@ -10,12 +10,12 @@ from tests.conftest import get_test_db, test_engine MESSAGES = { - "create_settings": "Already created your settings?", - "pick_settings": "Edit Settings", - "edit_settings": "Settings don't need editing?", - "pick_category": "View Salary", - "view_salary": "Need to alter your settings?", - "salary_calc": "Total Salary:", + "create_settings": "Setting created?", + "pick_settings": "Edit settings", + "edit_settings": "View your salary", + "pick_category": "View salary", + "view_salary": "Edit settings", + "salary_calc": "Total salary:", } ROUTES = { diff --git a/tests/test_event.py b/tests/test_event.py index bb80135d..c9b69172 100644 --- a/tests/test_event.py +++ b/tests/test_event.py @@ -677,7 +677,7 @@ def test_delete_comment( } response = event_test_client.post(path, data=data, allow_redirects=True) assert response.ok - assert "Post Comment" in response.text + assert "Post comment" in response.text assert session.query(Comment).first() is None From e0ef1df9d959683b551d9c457ff7602c974ee387 Mon Sep 17 00:00:00 2001 From: Gonny Date: Thu, 25 Feb 2021 15:02:52 +0200 Subject: [PATCH 2/5] fix: added .j2 files to extraction --- app/babel_mapping.ini | 3 +- app/locales/en/LC_MESSAGES/base.po | 169 ++++++++++++++++++++++++++++- app/locales/he/LC_MESSAGES/base.po | 169 ++++++++++++++++++++++++++++- 3 files changed, 338 insertions(+), 3 deletions(-) diff --git a/app/babel_mapping.ini b/app/babel_mapping.ini index d28e505a..726e77f1 100644 --- a/app/babel_mapping.ini +++ b/app/babel_mapping.ini @@ -1,6 +1,7 @@ # Extraction from Python source files [python: **.py] -# Extraction from Jinja2 HTML and text templates +# Extraction from Jinja2 HTML and j2 templates [jinja2: **/templates/**.html] +[jinja2: **/templates/**.j2] extensions = jinja2.ext.i18n,jinja2.ext.autoescape,jinja2.ext.with_ diff --git a/app/locales/en/LC_MESSAGES/base.po b/app/locales/en/LC_MESSAGES/base.po index c9024e99..53426cae 100644 --- a/app/locales/en/LC_MESSAGES/base.po +++ b/app/locales/en/LC_MESSAGES/base.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-02-25 14:10+0200\n" +"POT-Creation-Date: 2021-02-25 15:01+0200\n" "PO-Revision-Date: 2021-01-26 21:31+0200\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -448,6 +448,7 @@ msgid "Update calendar privacy" msgstr "" #: app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html:7 +#: app/templates/salary/month.j2:35 msgid "Settings" msgstr "" @@ -479,6 +480,172 @@ msgstr "" msgid "Your card" msgstr "" +#: app/templates/salary/month.j2:7 +msgid "Monthly salary" +msgstr "" + +#: app/templates/salary/month.j2:12 +msgid "Pick month:" +msgstr "" + +#: app/templates/salary/month.j2:17 app/templates/salary/view.j2:25 +msgid "Bonus:" +msgstr "" + +#: app/templates/salary/month.j2:22 app/templates/salary/view.j2:30 +msgid "Deduction:" +msgstr "" + +#: app/templates/salary/month.j2:28 +msgid "Include weekly overtime" +msgstr "" + +#: app/templates/salary/month.j2:31 +msgid "Calculate salary" +msgstr "" + +#: app/templates/salary/pick.j2:7 app/templates/salary/pick.j2:24 +#: app/templates/salary/view.j2:41 +msgid "Edit settings" +msgstr "" + +#: app/templates/salary/pick.j2:9 app/templates/salary/pick.j2:26 +msgid "View salary" +msgstr "" + +#: app/templates/salary/pick.j2:15 app/templates/salary/settings.j2:20 +msgid "Please choose a category" +msgstr "" + +#: app/templates/salary/pick.j2:32 +msgid "Create settings for a different category" +msgstr "" + +#: app/templates/salary/settings.j2:8 +#, python-format +msgid "%(category)s salary settings" +msgstr "" + +#: app/templates/salary/settings.j2:10 +msgid "New salary settings" +msgstr "" + +#: app/templates/salary/settings.j2:28 +msgid "Create a new category" +msgstr "" + +#: app/templates/salary/settings.j2:33 +msgid "Hourly wage" +msgstr "" + +#: app/templates/salary/settings.j2:38 +msgid "Day off" +msgstr "" + +#: app/templates/salary/settings.j2:40 +msgid "Friday" +msgstr "" + +#: app/templates/salary/settings.j2:41 +msgid "Saturday" +msgstr "" + +#: app/templates/salary/settings.j2:42 +msgid "Sunday" +msgstr "" + +#: app/templates/salary/settings.j2:47 +msgid "Holiday category:" +msgstr "" + +#: app/templates/salary/settings.j2:56 +msgid "Regular hour basis" +msgstr "" + +#: app/templates/salary/settings.j2:61 +msgid "Night hour basis" +msgstr "" + +#: app/templates/salary/settings.j2:66 +msgid "Night shift start" +msgstr "" + +#: app/templates/salary/settings.j2:71 +msgid "Night shift end" +msgstr "" + +#: app/templates/salary/settings.j2:76 +msgid "Night shift minimum length" +msgstr "" + +#: app/templates/salary/settings.j2:81 +msgid "First overtime amount" +msgstr "" + +#: app/templates/salary/settings.j2:86 +msgid "First overtime pay" +msgstr "" + +#: app/templates/salary/settings.j2:91 +msgid "second overtime pay" +msgstr "" + +#: app/templates/salary/settings.j2:96 +msgid "Week working hour" +msgstr "" + +#: app/templates/salary/settings.j2:101 +msgid "Daily transport" +msgstr "" + +#: app/templates/salary/settings.j2:107 +msgid "Create salary settings" +msgstr "" + +#: app/templates/salary/settings.j2:109 +msgid "Update salary settings" +msgstr "" + +#: app/templates/salary/settings.j2:116 app/templates/salary/settings.j2:118 +msgid "View your salary" +msgstr "" + +#: app/templates/salary/settings.j2:118 +msgid "Setting created?" +msgstr "" + +#: app/templates/salary/settings.j2:118 +msgid "or" +msgstr "" + +#: app/templates/salary/settings.j2:118 +msgid "Edit your salary" +msgstr "" + +#: app/templates/salary/view.j2:13 +msgid "Hourly wage:" +msgstr "" + +#: app/templates/salary/view.j2:14 +msgid "Number of shifts:" +msgstr "" + +#: app/templates/salary/view.j2:15 +msgid "Base salary:" +msgstr "" + +#: app/templates/salary/view.j2:19 +msgid ">Weekly overtime total:" +msgstr "" + +#: app/templates/salary/view.j2:22 +msgid "Transport:" +msgstr "" + +#: app/templates/salary/view.j2:35 +msgid "Total salary:" +msgstr "" + #. i18n: String used in testing. Do not change. #: tests/test_language.py:32 msgid "test python translation" diff --git a/app/locales/he/LC_MESSAGES/base.po b/app/locales/he/LC_MESSAGES/base.po index 0050ca5a..75e10303 100644 --- a/app/locales/he/LC_MESSAGES/base.po +++ b/app/locales/he/LC_MESSAGES/base.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-02-25 14:10+0200\n" +"POT-Creation-Date: 2021-02-25 15:01+0200\n" "PO-Revision-Date: 2021-01-26 21:31+0200\n" "Last-Translator: FULL NAME \n" "Language: he\n" @@ -448,6 +448,7 @@ msgid "Update calendar privacy" msgstr "" #: app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html:7 +#: app/templates/salary/month.j2:35 msgid "Settings" msgstr "" @@ -479,6 +480,172 @@ msgstr "" msgid "Your card" msgstr "" +#: app/templates/salary/month.j2:7 +msgid "Monthly salary" +msgstr "" + +#: app/templates/salary/month.j2:12 +msgid "Pick month:" +msgstr "" + +#: app/templates/salary/month.j2:17 app/templates/salary/view.j2:25 +msgid "Bonus:" +msgstr "" + +#: app/templates/salary/month.j2:22 app/templates/salary/view.j2:30 +msgid "Deduction:" +msgstr "" + +#: app/templates/salary/month.j2:28 +msgid "Include weekly overtime" +msgstr "" + +#: app/templates/salary/month.j2:31 +msgid "Calculate salary" +msgstr "" + +#: app/templates/salary/pick.j2:7 app/templates/salary/pick.j2:24 +#: app/templates/salary/view.j2:41 +msgid "Edit settings" +msgstr "" + +#: app/templates/salary/pick.j2:9 app/templates/salary/pick.j2:26 +msgid "View salary" +msgstr "" + +#: app/templates/salary/pick.j2:15 app/templates/salary/settings.j2:20 +msgid "Please choose a category" +msgstr "" + +#: app/templates/salary/pick.j2:32 +msgid "Create settings for a different category" +msgstr "" + +#: app/templates/salary/settings.j2:8 +#, python-format +msgid "%(category)s salary settings" +msgstr "" + +#: app/templates/salary/settings.j2:10 +msgid "New salary settings" +msgstr "" + +#: app/templates/salary/settings.j2:28 +msgid "Create a new category" +msgstr "" + +#: app/templates/salary/settings.j2:33 +msgid "Hourly wage" +msgstr "" + +#: app/templates/salary/settings.j2:38 +msgid "Day off" +msgstr "" + +#: app/templates/salary/settings.j2:40 +msgid "Friday" +msgstr "" + +#: app/templates/salary/settings.j2:41 +msgid "Saturday" +msgstr "" + +#: app/templates/salary/settings.j2:42 +msgid "Sunday" +msgstr "" + +#: app/templates/salary/settings.j2:47 +msgid "Holiday category:" +msgstr "" + +#: app/templates/salary/settings.j2:56 +msgid "Regular hour basis" +msgstr "" + +#: app/templates/salary/settings.j2:61 +msgid "Night hour basis" +msgstr "" + +#: app/templates/salary/settings.j2:66 +msgid "Night shift start" +msgstr "" + +#: app/templates/salary/settings.j2:71 +msgid "Night shift end" +msgstr "" + +#: app/templates/salary/settings.j2:76 +msgid "Night shift minimum length" +msgstr "" + +#: app/templates/salary/settings.j2:81 +msgid "First overtime amount" +msgstr "" + +#: app/templates/salary/settings.j2:86 +msgid "First overtime pay" +msgstr "" + +#: app/templates/salary/settings.j2:91 +msgid "second overtime pay" +msgstr "" + +#: app/templates/salary/settings.j2:96 +msgid "Week working hour" +msgstr "" + +#: app/templates/salary/settings.j2:101 +msgid "Daily transport" +msgstr "" + +#: app/templates/salary/settings.j2:107 +msgid "Create salary settings" +msgstr "" + +#: app/templates/salary/settings.j2:109 +msgid "Update salary settings" +msgstr "" + +#: app/templates/salary/settings.j2:116 app/templates/salary/settings.j2:118 +msgid "View your salary" +msgstr "" + +#: app/templates/salary/settings.j2:118 +msgid "Setting created?" +msgstr "" + +#: app/templates/salary/settings.j2:118 +msgid "or" +msgstr "" + +#: app/templates/salary/settings.j2:118 +msgid "Edit your salary" +msgstr "" + +#: app/templates/salary/view.j2:13 +msgid "Hourly wage:" +msgstr "" + +#: app/templates/salary/view.j2:14 +msgid "Number of shifts:" +msgstr "" + +#: app/templates/salary/view.j2:15 +msgid "Base salary:" +msgstr "" + +#: app/templates/salary/view.j2:19 +msgid ">Weekly overtime total:" +msgstr "" + +#: app/templates/salary/view.j2:22 +msgid "Transport:" +msgstr "" + +#: app/templates/salary/view.j2:35 +msgid "Total salary:" +msgstr "" + #. i18n: String used in testing. Do not change. #: tests/test_language.py:32 msgid "test python translation" From 309542d7a6c46b2704fe4db2e7ca4814e145504d Mon Sep 17 00:00:00 2001 From: Gonny Date: Thu, 25 Feb 2021 15:11:43 +0200 Subject: [PATCH 3/5] fix: test fix --- tests/test_audio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_audio.py b/tests/test_audio.py index f7040b9b..c304f203 100644 --- a/tests/test_audio.py +++ b/tests/test_audio.py @@ -8,7 +8,7 @@ def test_get_settings(audio_test_client): response = audio_test_client.get(url=AUDIO_SETTINGS_URL) assert response.ok - assert b"Audio Settings" in response.content + assert b"Audio settings" in response.content def test_start_audio_default(audio_test_client): From aed24fe4b4ddfe4e25f817e0aae64fa5200ddcb7 Mon Sep 17 00:00:00 2001 From: Gonny Date: Thu, 25 Feb 2021 15:21:21 +0200 Subject: [PATCH 4/5] fix: bugfix --- .../partials/user_profile/sidebar_left/daily_horoscope.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html b/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html index 0f0cc51b..f056487f 100644 --- a/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html +++ b/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html @@ -2,7 +2,7 @@
    {% endblock content %}