{% 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 8471d2111c294dd9be9cf358ab149dd834282a61..b75c31dfbf77bc96658cfe1db6a0c3316d4b1eb9 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 5a57970082be261630edc4251a17e15a2fc2d679..fbc2c8fc7c9a0204bbd80999255473f41889d3cf 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 1a188e27c84adff21c546a8418b5ad5cfbac41ec..ca8ce1eb8c24f538cd004ca380de11ecc18c6494 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 5e2e2b2060192cb3273b90ebee8d74db1dacfbf9..50cc57557d7087afc9d0564bb4e4631cd2cd61d5 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 319dd38d8b632cb1c6b8d19ebc6ad4f18a02ea81..a6361301502ee6bafa9788692e0706224676540d 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 1fe6cdae40dfd92aab1a0a42c7681e22523c1408..9e89afd0cd949abe1614f9bae6e22b61a74e97bf 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 14b1f401abc2393bdbafda49a48dd7595f8b5554..7fd0356e62f7b643f7757054d66f7d79a6ee5e5e 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 b0b95eb1ad098d0916d576b596ab78804798f3a9..be0107a855975e5eef73d034a78505fb5acbbebf 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 ca71710daeb61b7d8fc6f9a414bf309f5e17e9b6..a12227fbefea92dcf5190c8484ebc3b9e5b8c7fa 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 252027a3208716c4dd8c9d7aca8b20bdbd108a9e..d4cdc67223d874046644dccfd064cd6d7f393772 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 5210574470efbfdaf48eec25a239f74d3c4ec515..719ff40ddf265c3b48c609a633d0a633bd9bad62 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 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 %}
{% blocktrans %}Sign in to {{ RELATE }}{% endblocktrans %}
+
{% blocktrans %}Sign in to {{ relate_site_name }}{% endblocktrans %}
{% if relate_sign_in_by_saml2_enabled %}
@@ -48,7 +47,7 @@
class="btn btn-primary"
href="{% url 'relate-sign_in_by_user_pw' %}{{next_uri}}"
role="button">
- {% blocktrans %}Sign in with a {{ RELATE }}-specific user name and password{% endblocktrans %} »
+ {% blocktrans %}Sign in with a {{ relate_site_name }}-specific user name and password{% endblocktrans %} »
{% endif %}
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 11ad67a2ed5bab00ff45e5fbddb7132d890ad04f..df4321ea72eb590df9dd36b57e0a0b3aef7f06a8 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):