From c7ec8b4df013b08b3416bd5a987b58c897d94bd1 Mon Sep 17 00:00:00 2001 From: dzhuang Date: Tue, 9 Jan 2018 10:48:10 +0800 Subject: [PATCH] Reverted to c79f805 --- course/templates/course/analytics-flow.html | 3 +- course/templates/course/analytics-flows.html | 3 +- course/templates/course/analytics-page.html | 3 +- .../course/broken-code-question-email.txt | 4 +- course/templates/course/calendar.html | 3 +- course/templates/course/course-base.html | 3 +- .../course/enrollment-decision-email.txt | 4 +- .../course/enrollment-request-email.txt | 4 +- .../course/flow-completion-grade.html | 3 +- course/templates/course/flow-completion.html | 3 +- .../course/flow-confirm-completion.html | 3 +- course/templates/course/flow-page.html | 3 +- course/templates/course/flow-start.html | 4 +- .../templates/course/generic-course-form.html | 3 +- course/templates/course/grade-flow-page.html | 3 +- course/templates/course/gradebook-by-opp.html | 3 +- .../templates/course/gradebook-opp-list.html | 3 +- .../course/gradebook-participant-list.html | 3 +- .../course/gradebook-participant.html | 3 +- course/templates/course/gradebook-single.html | 3 +- course/templates/course/gradebook.html | 3 +- .../templates/course/grading-statistics.html | 3 +- course/templates/course/home.html | 5 +- course/templates/course/keypair.html | 3 +- course/templates/course/login.html | 3 +- .../templates/course/manage-auth-tokens.html | 3 +- .../course/prompt-code-question.html | 6 +- .../course/query-participations.html | 3 +- course/templates/course/sandbox-page.html | 3 +- course/templates/course/sign-in-email.txt | 8 +- course/templates/course/submit-notify.txt | 4 +- locale/de/LC_MESSAGES/django.po | 116 +++++++++++++----- locale/zh_CN/LC_MESSAGES/django.po | 99 ++++++++------- relate/templates/admin/base_site.html | 2 +- relate/templates/base.html | 5 +- relate/templates/generic-form.html | 3 +- relate/templates/maintenance.html | 3 +- relate/templates/sign-in-choice.html | 5 +- tests/test_misc.py | 9 +- 39 files changed, 198 insertions(+), 152 deletions(-) diff --git a/course/templates/course/analytics-flow.html b/course/templates/course/analytics-flow.html index 2992017a..7f870b6d 100644 --- a/course/templates/course/analytics-flow.html +++ b/course/templates/course/analytics-flow.html @@ -1,9 +1,8 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block title %} - {% trans "Analytics" %} - {{ RELATE }} + {% trans "Analytics" %} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/analytics-flows.html b/course/templates/course/analytics-flows.html index 273866a1..705e4dbe 100644 --- a/course/templates/course/analytics-flows.html +++ b/course/templates/course/analytics-flows.html @@ -1,9 +1,8 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block title %} - {% trans "Analytics" %} - {{ RELATE }} + {% trans "Analytics" %} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/analytics-page.html b/course/templates/course/analytics-page.html index 17e27fe2..32ab2e3e 100644 --- a/course/templates/course/analytics-page.html +++ b/course/templates/course/analytics-page.html @@ -1,9 +1,8 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block title %} - {% trans "Analytics" %} - {{ RELATE }} + {% trans "Analytics" %} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/broken-code-question-email.txt b/course/templates/course/broken-code-question-email.txt index 8e0b645c..1f4680cf 100644 --- a/course/templates/course/broken-code-question-email.txt +++ b/course/templates/course/broken-code-question-email.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% trans relate_site_name as RELATE %}{% blocktrans with page_id=page_id course_identifier=course.identifier error_message=error_message|safe %}Hi there, +{% load i18n %}{% blocktrans with page_id=page_id course_identifier=course.identifier error_message=error_message|safe %}Hi there, This message was sent from {{ site }} at {{ time }}. Bad news! A code question with ID '{{ page_id }}' in '{{ course_identifier }}' has just failed while a user was trying to get his or her code graded. Details of the problem are below: @@ -12,6 +12,6 @@ Details of the problem are below: ---------------- {% endif %} -- {{ RELATE }} +- {{ relate_site_name }} diff --git a/course/templates/course/calendar.html b/course/templates/course/calendar.html index 3a267e9a..def1b36e 100644 --- a/course/templates/course/calendar.html +++ b/course/templates/course/calendar.html @@ -1,12 +1,11 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load static %} {% block title %} {{ course.number}} - {% trans "Calendar" %} - {{ RELATE }} + {% trans "Calendar" %} - {{ relate_site_name }} {% endblock %} {%block header_extra %} diff --git a/course/templates/course/course-base.html b/course/templates/course/course-base.html index 614a3227..ff0e31a0 100644 --- a/course/templates/course/course-base.html +++ b/course/templates/course/course-base.html @@ -1,12 +1,11 @@ {% extends "base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block title %} {{ course.number}}: {{ course.time_period}} - - {{ RELATE }} + {{ relate_site_name }} {% endblock %} {% block brand %} diff --git a/course/templates/course/enrollment-decision-email.txt b/course/templates/course/enrollment-decision-email.txt index 70dd2f0a..f5e8020f 100644 --- a/course/templates/course/enrollment-decision-email.txt +++ b/course/templates/course/enrollment-decision-email.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% trans relate_site_name as RELATE %}{% blocktrans trimmed with username=user.get_email_appellation %}Dear {{username}},{% endblocktrans %} +{% load i18n %}{% blocktrans trimmed with username=user.get_email_appellation %}Dear {{username}},{% endblocktrans %} {% if approved %} {% blocktrans with course_identifier=course.identifier course_uri=course_uri %}Welcome! Your request to join the course '{{course_identifier}}' has been approved. Find the course web page here: @@ -9,4 +9,4 @@ Welcome, and we hope you have a productive class!{% endblocktrans %} One common reason for this may be that you may have used your personal email (such as a GMail or Yahoo account) rather than your official university account to sign in. If that is the case, please use the official account and try again.{% endblocktrans %} {% endif %} -- {% blocktrans %}{{ RELATE }} staff{% endblocktrans %} +- {% blocktrans %}{{ relate_site_name }} staff{% endblocktrans %} diff --git a/course/templates/course/enrollment-request-email.txt b/course/templates/course/enrollment-request-email.txt index b91ec7de..3085512e 100644 --- a/course/templates/course/enrollment-request-email.txt +++ b/course/templates/course/enrollment-request-email.txt @@ -1,8 +1,8 @@ -{% load i18n %}{% trans relate_site_name as RELATE %}{% blocktrans with course_identifier=course.identifier admin_uri=admin_uri %}Dear course staff of {{ course_identifier }}, +{% load i18n %}{% blocktrans with course_identifier=course.identifier admin_uri=admin_uri %}Dear course staff of {{ course_identifier }}, User '{{user}}' has requested permission to enroll in your course. Please go to {{ admin_uri }} to approve or deny the request. To do so, select the course participations in question and use the "Approve enrollment" or "Deny enrollment" admin actions. {% endblocktrans %} -- {% blocktrans %}{{ RELATE }} staff{% endblocktrans %} \ No newline at end of file +- {% blocktrans %}{{ relate_site_name }} staff{% endblocktrans %} \ No newline at end of file diff --git a/course/templates/course/flow-completion-grade.html b/course/templates/course/flow-completion-grade.html index 788c66ad..1a47f503 100644 --- a/course/templates/course/flow-completion-grade.html +++ b/course/templates/course/flow-completion-grade.html @@ -1,10 +1,9 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block title %} - {{flow_desc.title}} - {{ RELATE }} + {{flow_desc.title}} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/flow-completion.html b/course/templates/course/flow-completion.html index 27d67d6a..c1e365bb 100644 --- a/course/templates/course/flow-completion.html +++ b/course/templates/course/flow-completion.html @@ -1,10 +1,9 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block title %} - {{flow_desc.title}} - {{ RELATE }} + {{flow_desc.title}} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/flow-confirm-completion.html b/course/templates/course/flow-confirm-completion.html index 039ff046..27f4d618 100644 --- a/course/templates/course/flow-confirm-completion.html +++ b/course/templates/course/flow-confirm-completion.html @@ -1,10 +1,9 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block title %} - {{flow_desc.title}} - {{ RELATE }} + {{flow_desc.title}} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/flow-page.html b/course/templates/course/flow-page.html index 95e364c2..ff6c1fc8 100644 --- a/course/templates/course/flow-page.html +++ b/course/templates/course/flow-page.html @@ -1,13 +1,12 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load crispy_forms_tags %} {% load static %} {% block title %} [{{ page_data.next_ordinal }}/{{ flow_session.page_count }}] - {{title}} - {{ flow_desc.title}} - {{ RELATE }} + {{title}} - {{ flow_desc.title}} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/flow-start.html b/course/templates/course/flow-start.html index ba819c3b..c4b2956e 100644 --- a/course/templates/course/flow-start.html +++ b/course/templates/course/flow-start.html @@ -1,9 +1,9 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} + {% block title %} - {{flow_desc.title}} - {{ RELATE }} + {{flow_desc.title}} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/generic-course-form.html b/course/templates/course/generic-course-form.html index bf9488b3..4ebf2909 100644 --- a/course/templates/course/generic-course-form.html +++ b/course/templates/course/generic-course-form.html @@ -1,11 +1,10 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load crispy_forms_tags %} {% block title %} - {{ form_description }} - {{ RELATE }} + {{ form_description }} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/grade-flow-page.html b/course/templates/course/grade-flow-page.html index eff8af7c..80b09e61 100644 --- a/course/templates/course/grade-flow-page.html +++ b/course/templates/course/grade-flow-page.html @@ -1,11 +1,10 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load crispy_forms_tags %} {% block title %} - {{ page_data.group_id }}/{{ page_data.page_id }} - {{ flow_identifier}} - {% trans "Grading" %} - {{ RELATE }} + {{ page_data.group_id }}/{{ page_data.page_id }} - {{ flow_identifier}} - {% trans "Grading" %} - {{ relate_site_name }} {% endblock %} {% block root_container %} diff --git a/course/templates/course/gradebook-by-opp.html b/course/templates/course/gradebook-by-opp.html index 2568c394..c80062ed 100644 --- a/course/templates/course/gradebook-by-opp.html +++ b/course/templates/course/gradebook-by-opp.html @@ -1,12 +1,11 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load crispy_forms_tags %} {% load static %} {% block title %} - {% trans "Grade book" %}: {{ opportunity.name }} - {{ RELATE }} + {% trans "Grade book" %}: {{ opportunity.name }} - {{ relate_site_name }} {% endblock %} {% block header_extra %} diff --git a/course/templates/course/gradebook-opp-list.html b/course/templates/course/gradebook-opp-list.html index ef12e646..06f3b83d 100644 --- a/course/templates/course/gradebook-opp-list.html +++ b/course/templates/course/gradebook-opp-list.html @@ -1,12 +1,11 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load static %} {% block title %} - {% trans "List of Grading Opportunities" %} - {{ RELATE }} + {% trans "List of Grading Opportunities" %} - {{ relate_site_name }} {% endblock %} {% block header_extra %} diff --git a/course/templates/course/gradebook-participant-list.html b/course/templates/course/gradebook-participant-list.html index 4889e323..4c0eb627 100644 --- a/course/templates/course/gradebook-participant-list.html +++ b/course/templates/course/gradebook-participant-list.html @@ -1,11 +1,10 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load static %} {% block title %} - {% trans "List of Participants" %} - {{ RELATE }} + {% trans "List of Participants" %} - {{ relate_site_name }} {% endblock %} {% block header_extra %} diff --git a/course/templates/course/gradebook-participant.html b/course/templates/course/gradebook-participant.html index bf56548e..68a4a2a9 100644 --- a/course/templates/course/gradebook-participant.html +++ b/course/templates/course/gradebook-participant.html @@ -1,11 +1,10 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load static %} {% block title %} - {% trans "My Grades" %} - {{ RELATE }} + {% trans "My Grades" %} - {{ relate_site_name }} {% endblock %} {% block header_extra %} diff --git a/course/templates/course/gradebook-single.html b/course/templates/course/gradebook-single.html index 0c2fd051..51350bfa 100644 --- a/course/templates/course/gradebook-single.html +++ b/course/templates/course/gradebook-single.html @@ -1,9 +1,8 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block title %} - {% trans "Grade book" %}: {{ opportunity.name }} - {{ RELATE }} + {% trans "Grade book" %}: {{ opportunity.name }} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/gradebook.html b/course/templates/course/gradebook.html index 732411cd..48154c70 100644 --- a/course/templates/course/gradebook.html +++ b/course/templates/course/gradebook.html @@ -1,9 +1,8 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block title %} - {% trans "Grade book" %} - {{ RELATE }} + {% trans "Grade book" %} - {{ relate_site_name }} {% endblock %} {% block header_extra %} diff --git a/course/templates/course/grading-statistics.html b/course/templates/course/grading-statistics.html index d4d47546..737f192b 100644 --- a/course/templates/course/grading-statistics.html +++ b/course/templates/course/grading-statistics.html @@ -1,9 +1,8 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block title %} - {% trans "Grader Statistics" %}: {{ flow_id }} - {{ RELATE }} + {% trans "Grader Statistics" %}: {{ flow_id }} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/home.html b/course/templates/course/home.html index 5a9558c4..f3ead5a1 100644 --- a/course/templates/course/home.html +++ b/course/templates/course/home.html @@ -1,11 +1,10 @@ {% extends "base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block content %} {% block cover %}
-

{% blocktrans %} Welcome to {{ RELATE }} {% endblocktrans %}

+

{% blocktrans %} Welcome to {{ relate_site_name }} {% endblocktrans %}

{% trans "RELATE is an Environment for Learning And TEaching" %}

{% trans "Learn more" %} » @@ -53,7 +52,7 @@ {% endblock %} {% endif %} {% else %} - {% blocktrans trimmed %} There are no courses hosted on this {{ RELATE }} site. {% endblocktrans %} + {% blocktrans trimmed %} There are no courses hosted on this {{ relate_site_name }} site. {% endblocktrans %} {% if not user.is_authenticated %} {% url "relate-sign_in_by_user_pw" as relate-sign_in_by_user_pw %} {% blocktrans trimmed %} diff --git a/course/templates/course/keypair.html b/course/templates/course/keypair.html index 8471d211..b75c31df 100644 --- a/course/templates/course/keypair.html +++ b/course/templates/course/keypair.html @@ -1,13 +1,12 @@ {% extends "base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block content %}

{% trans "SSH Key Pair" %}

{% trans "Private key:" %}

{% blocktrans trimmed %} - Copy and paste this block of text into the 'private key' field in {{ RELATE }}. + Copy and paste this block of text into the 'private key' field in {{ relate_site_name }}. {% endblocktrans %}

{{ public_key }}
diff --git a/course/templates/course/login.html b/course/templates/course/login.html index 5a579700..fbc2c8fc 100644 --- a/course/templates/course/login.html +++ b/course/templates/course/login.html @@ -1,6 +1,5 @@ {% extends "base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load crispy_forms_tags %} @@ -11,7 +10,7 @@ {% url "relate-sign_in_choice" as relate-sign_in_choice %} {% blocktrans trimmed %} - If you cannot or would not like to sign in using a {{ RELATE }}-specific + If you cannot or would not like to sign in using a {{ relate_site_name }}-specific user name or password, please choose a different method to sign in. {% endblocktrans %} diff --git a/course/templates/course/manage-auth-tokens.html b/course/templates/course/manage-auth-tokens.html index 1a188e27..ca8ce1eb 100644 --- a/course/templates/course/manage-auth-tokens.html +++ b/course/templates/course/manage-auth-tokens.html @@ -1,11 +1,10 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load crispy_forms_tags %} {% block title %} - {% trans "Manage Authentication Tokens" %}: - {{ RELATE }} + {% trans "Manage Authentication Tokens" %}: - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/course/templates/course/prompt-code-question.html b/course/templates/course/prompt-code-question.html index 5e2e2b20..50cc5755 100644 --- a/course/templates/course/prompt-code-question.html +++ b/course/templates/course/prompt-code-question.html @@ -1,6 +1,4 @@ {% load i18n %} -{% trans relate_site_name as RELATE %} - {{ prompt_html|safe }} {% if show_setup_code and setup_code%} @@ -21,7 +19,7 @@ This is the code that is used to set up the problem and produce test data for your submission. It is reproduced here for your information, or if you would like to run your submission outside - of {{ RELATE }}. + of {{ relate_site_name }}. You should not copy/paste this code into the code box below. This code is run automatically 'behind the scenes' before your submitted code. @@ -49,7 +47,7 @@ {% blocktrans trimmed %} This is the code that is used to generate feedback for your submission. It is reproduced here for your information, or - if you would like to run your submission outside of {{ RELATE }}. + if you would like to run your submission outside of {{ relate_site_name }}. You should not copy/paste this code into the code box below. This code is run automatically 'behind the scenes' after your submitted code. diff --git a/course/templates/course/query-participations.html b/course/templates/course/query-participations.html index 319dd38d..a6361301 100644 --- a/course/templates/course/query-participations.html +++ b/course/templates/course/query-participations.html @@ -1,11 +1,10 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load static %} {% load crispy_forms_tags %} {% block title %} - {% trans "Query Participations" %} - {{ RELATE }} + {% trans "Query Participations" %} - {{ relate_site_name }} {% endblock %} {% block header_extra %} diff --git a/course/templates/course/sandbox-page.html b/course/templates/course/sandbox-page.html index 1fe6cdae..9e89afd0 100644 --- a/course/templates/course/sandbox-page.html +++ b/course/templates/course/sandbox-page.html @@ -1,6 +1,5 @@ {% extends "course/course-base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load crispy_forms_tags %} {% load static %} @@ -15,7 +14,7 @@ {% blocktrans %}Page Sandbox{% endblocktrans %} {% endif %} - - {{ RELATE }} + {{ relate_site_name }} {% endblock %} {% block root_container %} diff --git a/course/templates/course/sign-in-email.txt b/course/templates/course/sign-in-email.txt index 14b1f401..7fd0356e 100644 --- a/course/templates/course/sign-in-email.txt +++ b/course/templates/course/sign-in-email.txt @@ -1,11 +1,11 @@ -{% load i18n %}{% trans relate_site_name as RELATE %}{% blocktrans trimmed with username=user.get_email_appellation %}Dear {{username}},{% endblocktrans %} +{% load i18n %}{% blocktrans trimmed with username=user.get_email_appellation %}Dear {{username}},{% endblocktrans %} {% blocktrans with sign_in_uri=sign_in_uri home_uri=home_uri %} -Welcome to {{ RELATE }}! Please click this link to sign in: +Welcome to {{ relate_site_name }}! Please click this link to sign in: {{ sign_in_uri }} -You have received this email because someone (maybe you) entered your email address into the {{ RELATE }} web site at +You have received this email because someone (maybe you) entered your email address into the {{ relate_site_name }} web site at {{ home_uri }} If this was not you, it is safe to disregard this email. {% endblocktrans %} -- {% blocktrans %}{{ RELATE }} staff{% endblocktrans %} +- {% blocktrans %}{{ relate_site_name }} staff{% endblocktrans %} diff --git a/course/templates/course/submit-notify.txt b/course/templates/course/submit-notify.txt index b0b95eb1..be0107a8 100644 --- a/course/templates/course/submit-notify.txt +++ b/course/templates/course/submit-notify.txt @@ -1,8 +1,8 @@ -{% load i18n %}{% trans relate_site_name as RELATE %}{% blocktrans with course_identifier=course.identifier %}Dear course staff of {{ course_identifier }},{% endblocktrans %} +{% load i18n %}{% blocktrans with course_identifier=course.identifier %}Dear course staff of {{ course_identifier }},{% endblocktrans %} {% if flow_session.participation and not use_masked_profile %}{% blocktrans with participant=flow_session.participation.user %}Participant '{{ participant }}'{% endblocktrans %}{% else %}{% trans "A participant" %}{% endif %}{% blocktrans with flow_id=flow_session.flow_id course_identifier=course.identifier %} has just submitted his/her work on '{{ flow_id }}'. Click here to review it: {{ review_uri }} {% endblocktrans %} -- {% blocktrans %}{{ RELATE }} staff{% endblocktrans %} +- {% blocktrans %}{{ relate_site_name }} staff{% endblocktrans %} diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index ca71710d..a12227fb 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-09 02:06+0800\n" +"POT-Creation-Date: 2018-01-08 15:43+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -356,8 +356,8 @@ msgid "Email-based sign-in is not being used" msgstr "Email-basierte Anmeldung wird nicht verwendet" #, python-format -msgid "Your %(relate_site_name)s sign-in link" -msgstr "Ihr %(relate_site_name)s Amelde-Link" +msgid "Your %(RELATE)s sign-in link" +msgstr "Ihr %(RELATE)s Amelde-Link" #, fuzzy #| msgid "Institutional ID" @@ -3487,7 +3487,7 @@ msgid "" msgstr "" #, python-format -msgid "%(RELATE)s staff" +msgid "%(relate_site_name)s staff" msgstr "" #, python-format @@ -4255,8 +4255,9 @@ msgstr "" msgid "Total" msgstr "" -#, python-format -msgid " Welcome to %(RELATE)s " +#, fuzzy, python-format +#| msgid " Welcome to %(RELATE)s " +msgid " Welcome to %(relate_site_name)s " msgstr "Willkommen bei %(RELATE)s " msgid "RELATE is an Environment for Learning And TEaching" @@ -4274,7 +4275,7 @@ msgid "Past Courses" msgstr "Vergangene Kurse" #, python-format -msgid "There are no courses hosted on this %(RELATE)s site." +msgid "There are no courses hosted on this %(relate_site_name)s site." msgstr "" #, python-format @@ -4314,7 +4315,8 @@ msgstr "" #, python-format msgid "" -"Copy and paste this block of text into the 'private key' field in %(RELATE)s." +"Copy and paste this block of text into the 'private key' field in %" +"(relate_site_name)s." msgstr "" msgid "Public key:" @@ -4358,9 +4360,9 @@ msgstr "" #, python-format msgid "" -"If you cannot or would not like to sign in using a %(RELATE)s-specific user " -"name or password, please " -"choose a different method to sign in." +"If you cannot or would not like to sign in using a %(relate_site_name)s-" +"specific user name or password, please choose a different method to sign in." msgstr "" msgid "" @@ -4429,9 +4431,9 @@ msgstr "(klicken zum Ansehen)" msgid "" "This is the code that is used to set up the problem and produce test data " "for your submission. It is reproduced here for your information, or if you " -"would like to run your submission outside of %(RELATE)s. You should not copy/paste this code into the code box below. This code is run " -"automatically 'behind the scenes' before your submitted code." +"would like to run your submission outside of %(relate_site_name)s. You " +"should not copy/paste this code into the code box below. This code " +"is run automatically 'behind the scenes' before your submitted code." msgstr "" #, fuzzy @@ -4443,9 +4445,9 @@ msgstr "Benotungs-Code" msgid "" "This is the code that is used to generate feedback for your submission. It " "is reproduced here for your information, or if you would like to run your " -"submission outside of %(RELATE)s. You should not copy/paste this " -"code into the code box below. This code is run automatically 'behind the " -"scenes' after your submitted code." +"submission outside of %(relate_site_name)s. You should not copy/" +"paste this code into the code box below. This code is run automatically " +"'behind the scenes' after your submitted code." msgstr "" #. Translators: starter code for code question @@ -4478,11 +4480,11 @@ msgstr "(Seitenvorschau erscheint hier)" #, python-format msgid "" "\n" -"Welcome to %(RELATE)s! Please click this link to sign in:\n" +"Welcome to %(relate_site_name)s! Please click this link to sign in:\n" "%(sign_in_uri)s\n" "\n" "You have received this email because someone (maybe you) entered your email " -"address into the %(RELATE)s web site at\n" +"address into the %(relate_site_name)s web site at\n" "%(home_uri)s\n" "\n" "If this was not you, it is safe to disregard this email.\n" @@ -5107,9 +5109,37 @@ msgstr "" msgid "Edit Course" msgstr "Kurs bearbeiten" +#, fuzzy +#| msgid "Counts" +msgid "About Us" +msgstr "Anzahlen" + msgid "RELATE" msgstr "" +#, python-format +msgid " Welcome to %(RELATE)s " +msgstr "Willkommen bei %(RELATE)s " + +#, fuzzy +#| msgid "Courses" +msgid "Open courses" +msgstr "Kurse" + +#, fuzzy +#| msgid "in progress" +msgid "My Courses in Progress" +msgstr "im Gange" + +#, fuzzy +#| msgid "Past Courses" +msgid "My past Courses" +msgstr "Vergangene Kurse" + +msgctxt "The start and end time of a course" +msgid "Time" +msgstr "" + msgid "403 Forbidden" msgstr "" @@ -5162,7 +5192,7 @@ msgid "" msgstr "" #, python-format -msgid "%(RELATE)s Administration" +msgid "%(relate_site_name)s Administration" msgstr "" #, python-format @@ -5217,12 +5247,14 @@ msgstr "Bitte wählen Sie Ihren Identity Provider aus der folgenden Liste:" #, python-format msgid "" -"%(RELATE)s is currently in maintenance mode. Sorry for the interruption, " -"we'll be back shortly." +"%(relate_site_name)s is currently in maintenance mode. Sorry for the " +"interruption, we'll be back shortly." msgstr "" -msgid "Sign in to %(RELATE)s" -msgstr "Bei %(RELATE)s Anmelden" +#, fuzzy, python-format +#| msgid "Signed in as %(username)s" +msgid "Sign in to %(relate_site_name)s" +msgstr "Als %(username)s angemeldet" msgid "Sign in using your institution's login" msgstr "Via Institutions-Login anmelden" @@ -5236,8 +5268,10 @@ msgstr "Neues Konto erstellen" msgid "Sign in using an exam ticket" msgstr "Mit Prüfungsticket anmelden" -msgid "Sign in with a %(RELATE)s-specific user name and password" -msgstr "Mit einem %(RELATE)s-spezifischen Benutzernamen anmelden" +#, fuzzy, python-format +#| msgid "Sign in with a RELATE-specific user name and password" +msgid "Sign in with a %(relate_site_name)s-specific user name and password" +msgstr "Mit einem RELATE-spezifischen Benutzernamen anmelden" msgid "You're already signed in" msgstr "" @@ -5251,6 +5285,30 @@ msgstr "Abmelden" msgid "User Profile" msgstr "Benutzerprofil" +msgid "my English" +msgstr "" + +msgid "Simplified Chinese" +msgstr "" + +#, fuzzy +#| msgid "Grading" +msgid "German" +msgstr "Benotung" + +#, fuzzy +#| msgid "Finish" +msgid "English" +msgstr "Beenden" + +msgid "Korean" +msgstr "" + +#, fuzzy +#| msgid "Fetch" +msgid "French" +msgstr "Abholen" + #~ msgid "" #~ "Enter a valid username. This value may contain only letters, numbers and " #~ "@/./+/-/_ characters." @@ -5275,6 +5333,9 @@ msgstr "Benutzerprofil" #~ msgid "Git source must be specified" #~ msgstr "Git-Quelle muss angegeben werden" +#~ msgid "Sign in to RELATE" +#~ msgstr "Bei RELATE Anmelden" + #~ msgid "only instructors and TAs may do that" #~ msgstr "Nur Instruktoren und Assistenten dürfen das" @@ -5316,9 +5377,6 @@ msgstr "Benutzerprofil" #~ msgid "Submit assignment" #~ msgstr "Antwort einreichen" -#~ msgid "in progress" -#~ msgstr "im Gange" - #, fuzzy #~| msgid "" #~| "Now impersonating %(last_name)s, %(first_name)s (user: %(username)s, " diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 252027a3..d4cdc672 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-09 02:05+0800\n" +"POT-Creation-Date: 2018-01-08 15:43+0800\n" "Last-Translator: Dong Zhuang \n" "Language-Team: Dong Zhuang \n" "MIME-Version: 1.0\n" @@ -3317,8 +3317,8 @@ msgstr "" "系, 例如回复此邮件来说明您的情况. " #, python-format -msgid "%(RELATE)s staff" -msgstr "%(RELATE)s站务" +msgid "%(relate_site_name)s staff" +msgstr "%(relate_site_name)s站务" #, python-format msgid "" @@ -4044,8 +4044,8 @@ msgid "Total" msgstr "总计" #, python-format -msgid " Welcome to %(RELATE)s " -msgstr "欢迎来到%(RELATE)s " +msgid " Welcome to %(relate_site_name)s " +msgstr "欢迎来到%(relate_site_name)s " msgid "RELATE is an Environment for Learning And TEaching" msgstr "" @@ -4060,8 +4060,8 @@ msgid "Past Courses" msgstr "以往的课程" #, python-format -msgid "There are no courses hosted on this %(RELATE)s site." -msgstr "本(%(RELATE)s)网站还没有挂载课程. " +msgid "There are no courses hosted on this %(relate_site_name)s site." +msgstr "本(%(relate_site_name)s)网站还没有挂载课程. " #, python-format msgid "Sign in to get started." @@ -4100,8 +4100,9 @@ msgstr "私有密钥:" #, python-format msgid "" -"Copy and paste this block of text into the 'private key' field in %(RELATE)s." -msgstr "将这块文本复制粘贴到%(RELATE)s网站的\"私有密钥\"字段中." +"Copy and paste this block of text into the 'private key' field in %" +"(relate_site_name)s." +msgstr "将这块文本复制粘贴到%(relate_site_name)s网站的\"私有密钥\"字段中." msgid "Public key:" msgstr "公共密钥:" @@ -4150,12 +4151,12 @@ msgstr "" #, python-format msgid "" -"If you cannot or would not like to sign in using a %(RELATE)s-specific user " -"name or password, please " -"choose a different method to sign in." +"If you cannot or would not like to sign in using a %(relate_site_name)s-" +"specific user name or password, please choose a different method to sign in." msgstr "" -"如果你不能或者不想使用%(RELATE)s特有的用户名密码方式登入，请尝试使用别的方式登录." +"如果你不能或者不想使用%(relate_site_name)s特有的用户名密码方式登入，请尝试使用别的方式登录." msgid "" "Note that the user name and password needed to use this form is not " @@ -4211,14 +4212,14 @@ msgstr "(点击查看)" msgid "" "This is the code that is used to set up the problem and produce test data " "for your submission. It is reproduced here for your information, or if you " -"would like to run your submission outside of %(RELATE)s. You should not copy/paste this code into the code box below. This code is run " -"automatically 'behind the scenes' before your submitted code." +"would like to run your submission outside of %(relate_site_name)s. You " +"should not copy/paste this code into the code box below. This code " +"is run automatically 'behind the scenes' before your submitted code." msgstr "" "这部分代码是用来设定问题以及产生您提交结果测试数据的代码。将其展示在这里是为" -"了向您提供信息，或者您想在%(RELATE)s网站之外时使用这部分代码。请您 不" -"要 把这部分代码 复制/粘贴 到下面的代码框中。当您提交代码时，这部分代" -"码会自动在后台运行。" +"了向您提供信息，或者您想在%(relate_site_name)s网站之外时使用这部分代码。请您 " +"不要 把这部分代码 复制/粘贴 到下面的代码框中。当您提交代码" +"时，这部分代码会自动在后台运行。" msgid "Testing code" msgstr "测试代码" @@ -4227,14 +4228,14 @@ msgstr "测试代码" msgid "" "This is the code that is used to generate feedback for your submission. It " "is reproduced here for your information, or if you would like to run your " -"submission outside of %(RELATE)s. You should not copy/paste this " -"code into the code box below. This code is run automatically 'behind the " -"scenes' after your submitted code." +"submission outside of %(relate_site_name)s. You should not copy/" +"paste this code into the code box below. This code is run automatically " +"'behind the scenes' after your submitted code." msgstr "" "这部分代码是用来产生您提交的代码所得到的反馈信息。将其展示在这里是为了向您提" -"供信息，或者您想在%(RELATE)s网站之外时使用这部分代码。请您 不要 把这部分代码 复制/粘贴 到下面的代码框中。当您提交代码时，这部分代码会" -"自动在后台运行。" +"供信息，或者您想在%(relate_site_name)s网站之外时使用这部分代码。请您 " +"不要 把这部分代码 复制/粘贴 到下面的代码框中。当您提交代码时，这部分" +"代码会自动在后台运行。" #. Translators: starter code for code question msgid "Starter code" @@ -4266,20 +4267,20 @@ msgstr "(在这里预览Page)" #, python-format msgid "" "\n" -"Welcome to %(RELATE)s! Please click this link to sign in:\n" +"Welcome to %(relate_site_name)s! Please click this link to sign in:\n" "%(sign_in_uri)s\n" "\n" "You have received this email because someone (maybe you) entered your email " -"address into the %(RELATE)s web site at\n" +"address into the %(relate_site_name)s web site at\n" "%(home_uri)s\n" "\n" "If this was not you, it is safe to disregard this email.\n" msgstr "" "\n" -" 欢迎来到%(RELATE)s! 请点击以下链接以登录网站:\n" +" 欢迎来到%(relate_site_name)s! 请点击以下链接以登录网站:\n" "%(sign_in_uri)s\n" "\n" -" 您收到了这封邮件是因为有人（可能是您）在%(RELATE)s网站\n" +" 您收到了这封邮件是因为有人（可能是您）在%(relate_site_name)s网站\n" "%(home_uri)s\n" "输入了您的电子邮件. 如果不是您操作的, 可忽略此邮件. \n" @@ -4928,9 +4929,25 @@ msgstr "课程设置更新失败." msgid "Edit Course" msgstr "编辑课程" +msgid "About Us" +msgstr "关于我们" + msgid "RELATE" msgstr "" +msgid "Open courses" +msgstr "开放课程" + +msgid "My Courses in Progress" +msgstr "我正在学习的课程" + +msgid "My past Courses" +msgstr "我以往学习的课程" + +msgctxt "The start and end time of a course" +msgid "Time" +msgstr "时间" + msgid "403 Forbidden" msgstr "403 禁止访问" @@ -4991,8 +5008,8 @@ msgstr "" "谢谢！" #, python-format -msgid "%(RELATE)s Administration" -msgstr "%(RELATE)s管理" +msgid "%(relate_site_name)s Administration" +msgstr "%(relate_site_name)s管理" #, python-format msgid "" @@ -5042,15 +5059,15 @@ msgstr "请从以下列表选择你的ID提供者: " #, python-format msgid "" -"%(RELATE)s is currently in maintenance mode. Sorry for the interruption, " -"we'll be back shortly." +"%(relate_site_name)s is currently in maintenance mode. Sorry for the " +"interruption, we'll be back shortly." msgstr "" -"%(RELATE)s网站目前正在维护. 我们对因此为你带来不便深表抱歉, 我们很快将会恢" -"复. " +"%(relate_site_name)s网站目前正在维护. 我们对因此为你带来不便深表抱歉, 我们很" +"快将会恢复. " #, python-format -msgid "Sign in to %(RELATE)s" -msgstr "登录%(RELATE)s" +msgid "Sign in to %(relate_site_name)s" +msgstr "登录用户： %(username)s" msgid "Sign in using your institution's login" msgstr "使用你所属机构的登录方式" @@ -5065,8 +5082,8 @@ msgid "Sign in using an exam ticket" msgstr "使用测验ticket登录" #, python-format -msgid "Sign in with a %(RELATE)s-specific user name and password" -msgstr "使用%(RELATE)s用户名密码登录" +msgid "Sign in with a %(relate_site_name)s-specific user name and password" +msgstr "使用%(relate_site_name)s用户名密码登录" msgid "You're already signed in" msgstr "您已经登录. " @@ -5078,4 +5095,4 @@ msgid "Sign out" msgstr "退出登录" msgid "User Profile" -msgstr "用户信息" +msgstr "用户信息" \ No newline at end of file diff --git a/relate/templates/admin/base_site.html b/relate/templates/admin/base_site.html index 52105744..719ff40d 100644 --- a/relate/templates/admin/base_site.html +++ b/relate/templates/admin/base_site.html @@ -2,5 +2,5 @@ {% load i18n %} {% block branding %} -

{% blocktrans with RELATE= relate_site_name%}{{ RELATE }} Administration{% endblocktrans %}

+

{% blocktrans %}{{ relate_site_name }} Administration{% endblocktrans %}

{% endblock %} diff --git a/relate/templates/base.html b/relate/templates/base.html index d23c5527..d2162028 100644 --- a/relate/templates/base.html +++ b/relate/templates/base.html @@ -1,7 +1,6 @@ {% load i18n %} {% load static %} -{% trans relate_site_name as RELATE %} @@ -9,7 +8,7 @@ - {% block title %}{{ RELATE }}{% endblock %} + {% block title %}{{ relate_site_name }}{% endblock %} {% block header_main %} @@ -56,7 +55,7 @@ - {%block brand %}{{ RELATE }}{% endblock %} + {%block brand %}{{ relate_site_name }}{% endblock %}
{% if not maintenance_mode %} diff --git a/relate/templates/generic-form.html b/relate/templates/generic-form.html index 387d10a9..41a92225 100644 --- a/relate/templates/generic-form.html +++ b/relate/templates/generic-form.html @@ -1,11 +1,10 @@ {% extends "base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% load crispy_forms_tags %} {% block title %} - {{ form_description }} - {{ RELATE }} + {{ form_description }} - {{ relate_site_name }} {% endblock %} {% block content %} diff --git a/relate/templates/maintenance.html b/relate/templates/maintenance.html index f30bab77..75446a68 100644 --- a/relate/templates/maintenance.html +++ b/relate/templates/maintenance.html @@ -1,12 +1,11 @@ {% extends "base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block content %}
{% blocktrans trimmed %} - {{ RELATE }} is currently in maintenance mode. Sorry for the interruption, + {{ relate_site_name }} is currently in maintenance mode. Sorry for the interruption, we'll be back shortly. {% endblocktrans %}
diff --git a/relate/templates/sign-in-choice.html b/relate/templates/sign-in-choice.html index cd497c40..7c24d247 100644 --- a/relate/templates/sign-in-choice.html +++ b/relate/templates/sign-in-choice.html @@ -1,9 +1,8 @@ {% extends "base.html" %} {% load i18n %} -{% trans relate_site_name as RELATE %} {% block content %} -

{% blocktrans %}Sign in to {{ RELATE }}{% endblocktrans %}

+

{% blocktrans %}Sign in to {{ relate_site_name }}{% endblocktrans %}

diff --git a/tests/test_misc.py b/tests/test_misc.py index 11ad67a2..df4321ea 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -282,9 +282,10 @@ class RelateSiteNameTest(SingleCourseTestMixin, LocmemBackendTestsMixin, TestCas self.assertEqual(resp.status_code, 200) self.assertContains(resp, "%s" % my_site_name, html=True) - # Translated twice, once in home.html, once in base.html + # Three translations in nav_bar brand, html title and + # "Welcome to RELATE", respectively self.assertEqual( - self.get_translation_count(mock_trans, my_site_name), 2) + self.get_translation_count(mock_trans, my_site_name), 3) mock_trans.reset_mock() # course page @@ -297,7 +298,7 @@ class RelateSiteNameTest(SingleCourseTestMixin, LocmemBackendTestsMixin, TestCas # One translation in html title self.assertEqual( - self.get_translation_count(mock_trans, my_site_name), 2) + self.get_translation_count(mock_trans, my_site_name), 1) # email with override_settings(RELATE_REGISTRATION_ENABLED=True, USE_I18N=True): @@ -322,7 +323,7 @@ class RelateSiteNameTest(SingleCourseTestMixin, LocmemBackendTestsMixin, TestCas # Three RELATE in the email template self.assertEqual( - self.get_translation_count(mock_trans, my_site_name), 1) + self.get_translation_count(mock_trans, my_site_name), 3) @override_settings() def test_default_configure(self): -- GitLab