Merge pull request openedx#396 from jauzzz/sso

i18n 5.8
xavierchan · May 8, 2019 · 722398f · 722398f
2 parents 8658ba8 + 4c494a7
commit 722398f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/conf/locale/en/LC_MESSAGES/django.po b/conf/locale/en/LC_MESSAGES/django.po
@@ -25801,7 +25801,7 @@ msgid " days"
 msgstr ""
 
 #: membership/templates/membership/card.html
-msgid "Tuition:"
+msgid "Tuition: "
 msgstr ""
 
 #: membership/templates/membership/card.html
@@ -26151,7 +26151,7 @@ msgstr ""
 
 #: membership/templates/membership/wechat_paying.html
 msgid ""
-"Please complete the payment within 2 hours, otherwise the purchase may fail"
+"Please complete the payment within 2 hours, otherwise the purchase may fail."
 msgstr ""
 
 #: membership/templates/membership/wechat_paying.html

diff --git a/conf/locale/en/LC_MESSAGES/djangojs.po b/conf/locale/en/LC_MESSAGES/djangojs.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2019-05-08 10:38+0800\n"
-"PO-Revision-Date: 2019-05-08 02:38:05.201977\n"
+"POT-Creation-Date: 2019-05-08 16:24+0800\n"
+"PO-Revision-Date: 2019-05-08 08:24:29.290918\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: en\n"

diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.po b/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -26334,7 +26334,7 @@ msgid " days"
 msgstr "天"
 
 #: membership/templates/membership/card.html
-msgid "Tuition:"
+msgid "Tuition: "
 msgstr "学费："
 
 #: membership/templates/membership/card.html
@@ -26460,7 +26460,7 @@ msgstr "美国波士顿学院经济学博士"
 #: membership/templates/membership/index.html
 msgid ""
 "*EliteMBA reserves the right of final interpretation for all course updates."
-msgstr "*英荔商学院保留所有课程的更新和最终解释权。"
+msgstr "*英荔商学院保留所有课程更新的最终解释权。"
 
 #: membership/templates/membership/index.html
 msgid "World-Class Faculty"
@@ -26594,7 +26594,7 @@ msgstr "月均"
 #: membership/templates/membership/index.html
 msgctxt "Membership"
 msgid "Professional"
-msgstr "教授"
+msgstr "全栈职场修炼"
 
 #: membership/templates/membership/index.html
 msgctxt "Membership"
@@ -26684,7 +26684,7 @@ msgstr "实付金额："
 
 #: membership/templates/membership/wechat_paying.html
 msgid ""
-"Please complete the payment within 2 hours, otherwise the purchase may fail"
+"Please complete the payment within 2 hours, otherwise the purchase may fail."
 msgstr "请在2小时内完成支付，否则可能导致购买失败"
 
 #: membership/templates/membership/wechat_paying.html

diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
@@ -53,7 +53,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2019-05-08 10:38+0800\n"
+"POT-Creation-Date: 2019-05-08 16:24+0800\n"
 "PO-Revision-Date: 2018-12-07 12:23+0000\n"
 "Last-Translator: fengri <173770922@qq.com>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/e-ducation/teams/93939/zh_CN/)\n"

diff --git a/conf/locale/zh_HANS/LC_MESSAGES/django.po b/conf/locale/zh_HANS/LC_MESSAGES/django.po
@@ -26334,7 +26334,7 @@ msgid " days"
 msgstr "天"
 
 #: membership/templates/membership/card.html
-msgid "Tuition:"
+msgid "Tuition: "
 msgstr "学费："
 
 #: membership/templates/membership/card.html
@@ -26460,7 +26460,7 @@ msgstr "美国波士顿学院经济学博士"
 #: membership/templates/membership/index.html
 msgid ""
 "*EliteMBA reserves the right of final interpretation for all course updates."
-msgstr "*英荔商学院保留所有课程的更新和最终解释权。"
+msgstr "*英荔商学院保留所有课程更新的最终解释权。"
 
 #: membership/templates/membership/index.html
 msgid "World-Class Faculty"
@@ -26594,7 +26594,7 @@ msgstr "月均"
 #: membership/templates/membership/index.html
 msgctxt "Membership"
 msgid "Professional"
-msgstr "教授"
+msgstr "全栈职场修炼"
 
 #: membership/templates/membership/index.html
 msgctxt "Membership"
@@ -26684,7 +26684,7 @@ msgstr "实付金额："
 
 #: membership/templates/membership/wechat_paying.html
 msgid ""
-"Please complete the payment within 2 hours, otherwise the purchase may fail"
+"Please complete the payment within 2 hours, otherwise the purchase may fail."
 msgstr "请在2小时内完成支付，否则可能导致购买失败"
 
 #: membership/templates/membership/wechat_paying.html

diff --git a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po
@@ -53,7 +53,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2019-05-08 10:38+0800\n"
+"POT-Creation-Date: 2019-05-08 16:24+0800\n"
 "PO-Revision-Date: 2018-12-07 12:23+0000\n"
 "Last-Translator: fengri <173770922@qq.com>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/e-ducation/teams/93939/zh_CN/)\n"

diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
@@ -32,6 +32,7 @@
 from django.shortcuts import redirect
 from django.utils.html import strip_tags
 from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy
 from django.views.decorators.cache import cache_control
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.views.decorators.http import require_http_methods, require_POST
@@ -142,7 +143,7 @@
 
 TASK_SUBMISSION_OK = 'created'
 
-SUCCESS_MESSAGE_TEMPLATE = _("The {report_type} report is being created. "
+SUCCESS_MESSAGE_TEMPLATE = ugettext_lazy("The {report_type} report is being created. "
                              "To view the status of the report, see Pending Tasks below.")