diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index a5f63f5af6..a096de5693 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 6d00e5c75e..b7ad15a4b3 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -886,7 +886,7 @@ msgstr "Back to login" #: templates/registration/password_reset_subject.txt:2 msgid "Pecha.org_Password_Reset" -msgstr "Pecha.org_Password_Reset" +msgstr "Pecha.org Password Reset" #: templates/registration/register.html:4 msgid "registration.register.create_an_account" diff --git a/locale/he/LC_MESSAGES/django.mo b/locale/he/LC_MESSAGES/django.mo index 48bcd34381..9cc379dd37 100644 Binary files a/locale/he/LC_MESSAGES/django.mo and b/locale/he/LC_MESSAGES/django.mo differ diff --git a/locale/he/LC_MESSAGES/django.po b/locale/he/LC_MESSAGES/django.po index 170ae4a1b0..2a93d73bfe 100644 --- a/locale/he/LC_MESSAGES/django.po +++ b/locale/he/LC_MESSAGES/django.po @@ -301,7 +301,7 @@ msgstr "" #: templates/activity.html:52 msgid "activity.all_activity_drop_down" -msgstr "" +msgstr "All Activity" #: templates/activity.html:53 msgid "activity.translation_option" @@ -313,11 +313,11 @@ msgstr "ཟིན་བྲིས།" #: templates/activity.html:55 msgid "activity.new_texts_option" -msgstr "" +msgstr "New Texts" #: templates/activity.html:56 msgid "activity.edit_list_option" -msgstr "" +msgstr "Edits" #: templates/activity.html:57 msgid "activity.notes_option" @@ -325,23 +325,23 @@ msgstr "མཆན་འགོད་ས།" #: templates/activity.html:58 msgid "activity.reviews_option" -msgstr "" +msgstr "Reviews" #: templates/activity.html:59 msgid "activity.text_info_option_option" -msgstr "" +msgstr "Text Info" #: templates/activity.html:60 msgid "activity.reversions_option" -msgstr "" +msgstr "Reversions" #: templates/activity.html:61 msgid "activity.flagged_option" -msgstr "" +msgstr "Flagged" #: templates/delete-sheet.html:4 msgid "admin.admin_delete_sheet" -msgstr "" +msgstr "Admin: Delete a Sheet" #: templates/delete-sheet.html:4 msgid "admin.common.delete-sheet.pecha" @@ -819,7 +819,7 @@ msgstr "" #: templates/registration/password_reset_done.html:10 msgid "registration.password_reset_done.messages" -msgstr "" +msgstr "ཁྱེད་ཀྱི་གློག་འཕྲིན་ནང་། གསང་ཚིག་བསྐྱར་སྒྲིག་གི་དྲ་ཐག་བསྐུར་ཡོད།" #: templates/registration/password_reset_email.html:4 msgid "registration.password_reset_email.password_reset_email_message" @@ -829,7 +829,7 @@ msgstr "དཔེ་ཆ་དྲ་བའི་ཀློག་པ་པོ་ཞ #: templates/registration/password_reset_email.txt:5 msgid "" "registration.password_reset_email.password_reset_email_to_click_on_link" -msgstr "" +msgstr "གསང་ཚིག་བསྐྱར་སྒྲིག་བྱེད་པ་ལ། བཤམ་གྱི་དྲ་ཐག་ལ་བསྣུན་པའམ། ཡང་ན། དྲ་ཐག་འདི་བཤུས་ནས། འཚོལ་བཤེར་མཉེན་ཆས་གཞན་གྱི་ནང་ཁ་ཕྱེ་རོགས།" #: templates/registration/password_reset_email.html:12 #: templates/registration/password_reset_email.txt:9 @@ -861,7 +861,7 @@ msgstr "ནང་འཛུལ་བྱེད་སར་ཕྱིར་ལོག #: templates/registration/password_reset_subject.txt:2 msgid "Pecha.org_Password_Reset" -msgstr "" +msgstr "དཔེ་ཆ་དྲ་བའི་གསང་ཚིག་བསྐྱར་སྒྲིག།" #: templates/registration/register.html:4 msgid "registration.register.create_an_account" diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo index aaf05a6d09..7b5926cc92 100644 Binary files a/locale/zh_Hans/LC_MESSAGES/django.mo and b/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index af8141a39f..85148e5ea2 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -86,47 +86,47 @@ msgstr "" #: sefaria/forms.py:157 msgid "form.placeholder_new_password" -msgstr "" +msgstr "新密码" #: sefaria/forms.py:158 msgid "placeholder_new_password" -msgstr "" +msgstr "输入新密码" #: sefaria/forms.py:163 msgid "form_placeholder_new_pw_confirmation" -msgstr "" +msgstr "确认新密码" #: sefaria/forms.py:165 msgid "placeholder_repeat_new_password" -msgstr "" +msgstr "重复新密码" #: sefaria/model/collection.py:93 msgid "set_collection_name_message" -msgstr "" +msgstr "请为您的收藏设置一个名称" #: sefaria/model/collection.py:117 msgid "collection_name_taken_message" -msgstr "" +msgstr "以下是该句子的中文翻译:已存在同名的公开收藏。请在发布前选择一个不同的名称。" #: sefaria/model/collection.py:119 msgid "collection_image_required_message" -msgstr "" +msgstr "以下是该句子的中文翻译:公开收藏必须包含一张收藏图片(方形图片效果最佳)。" #: sefaria/model/collection.py:121 msgid "collection_sheet_count_message" -msgstr "" +msgstr "公开收藏必须包含至少3个公开表单。" #: sefaria/model/collection.py:284 msgid "collection_invitation_email_subject" -msgstr "" +msgstr "邀请您加入Pecha上的一个收藏。" #: sefaria/model/user_profile.py:288 msgid "email_invalid_message" -msgstr "" +msgstr "电子邮件地址无效。" #: sourcesheets/views.py:403 msgid "creating_new_collection_message" -msgstr "" +msgstr "您必须登录才能创建新的收藏" #: sourcesheets/views.py:566 msgid "error_message_when_trying_to_remove_the_last_owner_of_a_collection" @@ -138,59 +138,59 @@ msgstr "" #: templates/404.html:4 msgid "page_not_found_title" -msgstr "" +msgstr "页面未找到 | Pecha" #: templates/404.html:11 msgid "page_not_found_message" -msgstr "" +msgstr "页面未找到" #: templates/404.html:15 msgid "link_not_working_message" -msgstr "" +msgstr "以下是该句子的中文翻译:无法找到请求的网址。如果您是通过其他网站的链接到达此处,您可能需要告知他们他们的链接无法正常工作。" #: templates/500.html:4 templates/500.html:10 msgid "server_related_error_message" -msgstr "" +msgstr "内部服务器错误" #: templates/500.html:15 msgid "send_message_to_developer_request" -msgstr "" +msgstr "抱歉,系统出错。我们已通知开发人员。如有疑问或建议,请联系我们的 注意:原文最后一句未完成,所以翻译也相应保留了未完成的状态。这个简短版本保留了原文的主要信息,包括出错通知、开发人员已被告知,以及如何联系的指示" #: templates/500.html:15 msgid "developer_team" -msgstr "" +msgstr "开发团队" #: templates/account_settings.html:12 msgid "account_setting" -msgstr "" +msgstr "账户设置" #: templates/account_settings.html:16 msgid "common.account_setting.cancel_setting_button" -msgstr "" +msgstr "取消" #: templates/account_settings.html:19 msgid "common.account_setting.save_request" -msgstr "" +msgstr "保存" #: templates/account_settings.html:25 msgid "account_setting.rate_of_notification" -msgstr "" +msgstr "通知频率(最大)" #: templates/account_settings.html:29 msgid "account_setting.to_send_notification_daily" -msgstr "" +msgstr "每日" #: templates/account_settings.html:32 msgid "account_setting.to_send_notification_weekly" -msgstr "" +msgstr "每周" #: templates/account_settings.html:35 msgid "account_setting.never_send_notification" -msgstr "" +msgstr "从不" #: templates/account_settings.html:42 msgid "account_setting.language_selection_title" -msgstr "" +msgstr "网站语言" #: templates/account_settings.html:46 msgid "account_setting.language_english_option" @@ -298,7 +298,7 @@ msgstr "" #: templates/activity.html:52 msgid "activity.all_activity_drop_down" -msgstr "" +msgstr "所有活动" #: templates/activity.html:53 msgid "activity.translation_option" @@ -607,7 +607,7 @@ msgstr "" #: templates/elements/loading.html:12 msgid "common.loading" -msgstr "" +msgstr "正在加载..." #: templates/elements/login_prompt.html:6 msgid "common.templates.elements.login_prompts.sign_up" @@ -784,53 +784,53 @@ msgstr "创建新账号" #: templates/registration/password_reset_complete.html:3 msgid "registration.password_reset_complete.password_reset" -msgstr "" +msgstr "密码重置" #: templates/registration/password_reset_complete.html:3 #: templates/registration/password_reset_confirm.html:4 #: templates/registration/password_reset_done.html:3 #: templates/registration/password_reset_form.html:4 msgid "common.name_pecha" -msgstr "" +msgstr "Pecha" #: templates/registration/password_reset_complete.html:10 msgid "registration.password_reset_complete.your_new_password_has_been_saved" -msgstr "" +msgstr "的中文翻译是: 您的新密码已保存。" #: templates/registration/password_reset_complete.html:13 msgid "registration.password_reset_complete.back_to_login" -msgstr "" +msgstr "的中文翻译是:返回登录" #: templates/registration/password_reset_confirm.html:4 #: templates/registration/password_reset_confirm.html:11 msgid "registration.password_reset_confirm.choose_a_new_password" -msgstr "" +msgstr "选择新密码" #: templates/registration/password_reset_confirm.html:17 msgid "registration.password_reset_confirm.save_password" -msgstr "" +msgstr "保存密码" #: templates/registration/password_reset_done.html:3 msgid "registration.password_reset_done.password_reset_link_sent" -msgstr "" +msgstr "密码重置链接已发送" #: templates/registration/password_reset_done.html:10 msgid "registration.password_reset_done.messages" -msgstr "" +msgstr "已发送一封包含重置密码链接的电子邮件。" #: templates/registration/password_reset_email.html:4 msgid "registration.password_reset_email.password_reset_email_message" -msgstr "" +msgstr "已请求重置此电子邮件地址在 Pecha.org 上的密码。" #: templates/registration/password_reset_email.html:6 #: templates/registration/password_reset_email.txt:5 msgid "registration.password_reset_email.password_reset_email_to_click_on_link" -msgstr "" +msgstr "点击此链接,或将其复制到您的浏览器,以选择新密码:" #: templates/registration/password_reset_email.html:12 #: templates/registration/password_reset_email.txt:9 msgid "registration.password_reset_email.ignore_this_email_if_haven't_send_it" -msgstr "" +msgstr "如果您没有请求重置密码,可以安全地忽略此电子邮件。" #: templates/registration/password_reset_email.txt:3 msgid "password.reset_request_made_msg" @@ -839,7 +839,7 @@ msgstr "" #: templates/registration/password_reset_form.html:4 #: templates/registration/password_reset_form.html:13 msgid "registration.password_reset_form.forgot_your_password" -msgstr "" +msgstr "忘记密码" #: templates/registration/password_reset_form.html:6 msgid "registration.password_reset_form.request_a_link_to_change_your_password" @@ -847,15 +847,15 @@ msgstr "" #: templates/registration/password_reset_form.html:19 msgid "registration.password_reset_form.send_reset_link" -msgstr "" +msgstr "发送重置链接" #: templates/registration/password_reset_form.html:23 msgid "registration.password_reset_form.back_to_link" -msgstr "" +msgstr "返回登录" #: templates/registration/password_reset_subject.txt:2 msgid "Pecha.org_Password_Reset" -msgstr "" +msgstr "Pecha.org 密码重置" #: templates/registration/register.html:4 msgid "registration.register.create_an_account" diff --git a/static/css/s2.css b/static/css/s2.css index fb07c23686..4a786c29d9 100644 --- a/static/css/s2.css +++ b/static/css/s2.css @@ -2512,7 +2512,7 @@ span .asterisk { } .readerNavTop .readerNavTopCategory .he { - font-family: "Taamey Frank", "adobe-garamond-pro", "Crimson Text", Georgia, "Times New Roman", serif; + font-family: var(--hebrew-serif-font-family); } .readerNavMenu .readerSearch { @@ -2522,7 +2522,7 @@ span .asterisk { border: none; background-color: inherit; font-size: 18px; - font-family: "adobe-garamond-pro", "Crimson Text", Georgia, serif; + font-family: var(--hebrew-serif-font-family); height: 48px; } @@ -4165,6 +4165,7 @@ a.navBlockTitle:hover { line-height: 50px; vertical-align: middle; font-size: 18px; + font-family: var(--hebrew-serif-font-family); font-weight: lighter; margin: 3px; text-align: center; @@ -4432,6 +4433,7 @@ a.navBlockTitle:hover { --line-height: 22px; line-height: var(--line-height); text-decoration: none; + font-family: var(--hebrew-serif-font-family) } .versionBlock .versionPreview big { @@ -4468,6 +4470,7 @@ a.navBlockTitle:hover { display: inline; margin-inline-end: 5px; font-style: italic; + font-family: var(--hebrew-serif-font-family); } .versionBlock.with-preview summary { @@ -4503,6 +4506,7 @@ details .open-details::before { .version-with-preview-title-line .selectButton { text-decoration: none; + font-family: var(--hebrew-serif-font-family); } .version-with-preview-title-line .selectButton.currSelectButton { @@ -4527,6 +4531,7 @@ details .open-details::before { .versionDetails-version-title { color: black; + font-family: var(--hebrew-serif-font-family); } .bookPage .versionBlock .versionTitle { @@ -4656,13 +4661,15 @@ details .open-details::before { justify-content: space-between; font-style: normal; font-weight: normal; - font-family: var(--hebrew-font-conditional); - font-family: var(--chinese-font-conditional); - font-size: 17px; + font-size: 15px; line-height: 20px; color: #666666; } +.review-history-text { + font-family: var(--hebrew-sans-serif-font-family); +} + .bookPage .versionBlock .versionDetails { line-height: 20px; } @@ -6206,6 +6213,7 @@ body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item a.ui-state-focus } .toggleSet .toggle-set-label { + font-family: var(--hebrew-serif-font-family); font-size: 13px; display: block; text-align: center; @@ -6577,7 +6585,7 @@ body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item a.ui-state-focus .bilingual .segment > .en, .bilingual .segment > p > .en { - display: block; + /* display: block; */ } .bilingual .segment > .en, @@ -7419,6 +7427,10 @@ But not to use a display block directive that might break continuous mode for ot font-family: "HebrewInEnglish Serif Font", "adobe-garamond-pro", "Crimson Text", Georgia, serif; } +.recentFilterSet.filterSet .textFilter, .recentFilterSet.filterSet .textFilter span .he{ + font-family: var(--hebrew-serif-font-family); +} + .hebrew .textList .recentFilterSet.filterSet { direction: ltr; } @@ -8290,7 +8302,7 @@ But not to use a display block directive that might break continuous mode for ot } .connection-buttons .connection-button .int-he { - font-family: "Heebo", "Roboto", "Helvetica Neue", "Helvetica", sans-serif; + font-family: var(--hebrew-serif-font-family); } .toolsMessage { @@ -9323,7 +9335,7 @@ But not to use a display block directive that might break continuous mode for ot } a.button { - font-size: 16px; + font-size: 18px; color: white; } @@ -10511,7 +10523,7 @@ body.interface-english .publishBox .react-tags__suggestions ul { box-sizing: border-box; border: none; background: transparent; - font-size: 18px; + font-size: 16px; } .topicsFilterReset { diff --git a/static/js/ReaderApp.jsx b/static/js/ReaderApp.jsx index 5bdb069375..a0709df5e4 100644 --- a/static/js/ReaderApp.jsx +++ b/static/js/ReaderApp.jsx @@ -505,12 +505,12 @@ class ReaderApp extends Component { hist.mode = "topics"; break; case "community": - hist.title = Sefaria._("From the Community: Today on Sefaria"); + hist.title = Sefaria._("From the Community: Today on Pecha"); hist.url = "community"; hist.mode = "community"; break; case "profile": - hist.title = `${state.profile.full_name} ${Sefaria._("on Sefaria")}`; + hist.title = `${state.profile.full_name} ${Sefaria._("on Pecha")}`; hist.url = `profile/${state.profile.slug}`; hist.mode = "profile"; break; diff --git a/static/js/VersionBlock/VersionInformation.jsx b/static/js/VersionBlock/VersionInformation.jsx index 8e739e1e83..51039146a6 100644 --- a/static/js/VersionBlock/VersionInformation.jsx +++ b/static/js/VersionBlock/VersionInformation.jsx @@ -37,7 +37,9 @@ function VersionInformation({currentRef, version}) {
- {% trans "registration.password_reset_complete.your_new_password_has_been_saved" %} + {% trans "registration.password_reset_complete.your_new_password_has_been_saved" %}
- {% trans "registration.password_reset_complete.back_to_login" %} + {% trans "registration.password_reset_complete.back_to_login" %}- {% trans "registration.password_reset_done.messages" %} + {% trans "registration.password_reset_done.messages" %}