Proversity/new translations ar (openedx#672) (openedx#673) (openedx#674)

UPD: translations for recap and freetext FIX: protecting agnostic block, if not installed, ignore ENH: honor to honour
eduNEXT · Mar 5, 2018 · b2358b9 · b2358b9
1 parent 659c00b
commit b2358b9
Show file tree

Hide file tree

Showing 13 changed files with 124 additions and 10 deletions.
diff --git a/conf/locale/ar/LC_MESSAGES/django.mo b/conf/locale/ar/LC_MESSAGES/django.mo
diff --git a/conf/locale/ar/LC_MESSAGES/django.po b/conf/locale/ar/LC_MESSAGES/django.po
@@ -313,6 +313,14 @@ msgstr "إنّك مسجَّل كطالب يحمل شهادة ميثاق الشر
 msgid "Honor Code"
 msgstr "ميثاق الشرف الأكاديمي"
 
+#: common/djangoapps/course_modes/helpers.py lms/djangoapps/branding/api.py
+#: openedx/core/djangoapps/user_api/api.py
+#: lms/templates/static_templates/honor.html
+#: themes/stanford-style/lms/templates/footer.html
+#: themes/stanford-style/lms/templates/static_templates/tos.html
+msgid "Honour Code"
+msgstr "ميثاق الشرف الأكاديمي"
+
 #: common/djangoapps/course_modes/helpers.py
 msgid "You're enrolled as a professional education student"
 msgstr "إنّك مسجَّل كطالب تعليم مهني."
@@ -5171,6 +5179,10 @@ msgstr "تبرَّع"
 msgid "Terms of Service & Honor Code"
 msgstr "شروط الخدمة وميثاق الشرف الأكاديمي"
 
+#: lms/djangoapps/branding/api.py
+msgid "Terms of Service & Honour Code"
+msgstr "شروط الخدمة وميثاق الشرف الأكاديمي"
+
 #. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: A 'Privacy Policy' is a legal document/statement describing a
 #. website's use of personal information
@@ -5525,6 +5537,12 @@ msgstr "شهادة غير صالحة"
 msgid "Terms of Service &amp; Honor Code"
 msgstr "شروط الخدمة وميثاق الشرف الأكاديمي"
 
+#. Translators: The &amp; characters represent an ampersand character and can
+#. be ignored
+#: lms/djangoapps/certificates/views/webview.py
+msgid "Terms of Service &amp; Honour Code"
+msgstr "شروط الخدمة وميثاق الشرف الأكاديمي"
+
 #. Translators: This line appears as a byline to a header image and describes
 #. the purpose of the page
 #: lms/djangoapps/certificates/views/webview.py
@@ -10875,16 +10893,30 @@ msgstr "حدد بلد أو منطقة إقامتك. البلد أو منطقة
 msgid "Review the Honor Code"
 msgstr "استعراض ميثاق الشرف"
 
+#: openedx/core/djangoapps/user_api/api.py
+msgid "Review the Honour Code"
+msgstr "استعراض ميثاق الشرف"
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/api.py
 msgid "Terms of Service and Honor Code"
 msgstr "شروط الخدمة وميثاق الشرف الأكاديمي"
 
+#. Translators: This is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/api.py
+msgid "Terms of Service and Honour Code"
+msgstr "شروط الخدمة وميثاق الشرف الأكاديمي"
+
 #: openedx/core/djangoapps/user_api/api.py
 msgid "Review the Terms of Service and Honor Code"
 msgstr "استعراض شروط الخدمة وميثاق الشرف"
 
+#: openedx/core/djangoapps/user_api/api.py
+msgid "Review the Terms of Service and Honour Code"
+msgstr "استعراض شروط الخدمة وميثاق الشرف"
+
 #. Translators: "Terms of Service" is a legal document users must agree to
 #. in order to register a new account.
 #. Translators: "Terms of service" is a legal document users must agree to
@@ -24933,6 +24965,11 @@ msgstr "9.4. اختيار القانون/ دائرة الاختصاص"
 msgid "HONOR CODE"
 msgstr "ميثاق الشرف"
 
+#: lms/templates/static_templates/honor.html
+#: lms/templates/static_templates/tos.html
+msgid "HONOUR CODE"
+msgstr "ميثاق الشرف"
+
 #: lms/templates/static_templates/honor.html
 #: lms/templates/static_templates/tos.html
 msgid "1. Collaboration Policy"
@@ -24948,6 +24985,11 @@ msgstr "2. عهد الشرف"
 msgid "3. Changing the Honor Code"
 msgstr "3. تغيير ميثاق الشرف"
 
+#: lms/templates/static_templates/honor.html
+#: lms/templates/static_templates/tos.html
+msgid "3. Changing the Honour Code"
+msgstr "3. تغيير ميثاق الشرف"
+
 #: lms/templates/static_templates/privacy.html
 msgid "PRIVACY POLICY"
 msgstr "سياسة الخصوصية"
@@ -25034,4 +25076,27 @@ msgstr ""
 
 #: lms/templates/courseware/courses.html
 msgid "Find your course"
-msgstr "ابحث عن المساق"
+msgstr "ابحث عن المساق"
+
+msgid "Checking..."
+msgstr "التحقق"
+
+msgid "Your response must be between {min} and {max} word."
+msgid_plural "Your response must be between {min} and {max} words."
+msgstr[0] "10 عدد الكلمات غير صالح، يتراوح عدد كلمات الجواب ما بين كلمة واحدة وحتى "
+msgstr[1] "10 عدد الكلمات غير صالح، يتراوح عدد كلمات الجواب ما بين كلمة واحدة وحتى "
+
+msgid "Invalid Word Count. {word_count_message}"
+msgstr "آلاف كلمة {word_count_message}"
+
+msgid "Answer submitted"
+msgstr "تم إرسال الجواب"
+
+msgid "Your submission has been received"
+msgstr "تم استلام ما أرسلته"
+
+msgid "Nothing to recap."
+msgstr "لايوجد شيء لتلخيصه"
+
+msgid "You have used {count_attempts} of {max_attempts} submission"
+msgstr "استخدمت {count_attempts}  من {max_attempts}  من محاولات الإرسال"
diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.mo b/conf/locale/ar/LC_MESSAGES/djangojs.mo
diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.po b/conf/locale/ar/LC_MESSAGES/djangojs.po
@@ -4605,7 +4605,11 @@ msgstr "يُرجى التحقق من بريدك الإلكتروني لتأكي
 
 #: lms/static/js/student_account/tos_modal.js
 msgid "Terms of Service and Honor Code"
-msgstr ""
+msgstr "شروط الخدمة وميثاق الشرف الأكاديمي"
+
+#: lms/static/js/student_account/tos_modal.js
+msgid "Terms of Service and Honour Code"
+msgstr "شروط الخدمة وميثاق الشرف الأكاديمي"
 
 #: lms/static/js/student_account/views/FinishAuthView.js
 msgid "Saving your email preference"

diff --git a/conf/locale/cy/LC_MESSAGES/django-partial.mo b/conf/locale/cy/LC_MESSAGES/django-partial.mo
diff --git a/conf/locale/cy/LC_MESSAGES/django-partial.po b/conf/locale/cy/LC_MESSAGES/django-partial.po
@@ -139,6 +139,11 @@ msgstr "Rydych wedi'ch cofrestru fel myfyriwr côd anrhydedd"
 msgid "Honor Code"
 msgstr "Côd anrhydedd"
 
+#: common/djangoapps/course_modes/helpers.py lms/djangoapps/branding/api.py
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Honour Code"
+msgstr "Côd anrhydedd"
+
 #: common/djangoapps/course_modes/helpers.py
 msgid "You're enrolled as a professional education student"
 msgstr "Rydych wedi'ch cofrestru fel myfyriwr addysg broffesiynol"

diff --git a/conf/locale/cy/LC_MESSAGES/django.mo b/conf/locale/cy/LC_MESSAGES/django.mo
diff --git a/conf/locale/cy/LC_MESSAGES/django.po b/conf/locale/cy/LC_MESSAGES/django.po
@@ -138,6 +138,11 @@ msgstr "Rydych wedi'ch cofrestru fel myfyriwr côd anrhydedd"
 msgid "Honor Code"
 msgstr "Côd anrhydedd"
 
+#: common/djangoapps/course_modes/helpers.py lms/djangoapps/branding/api.py
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Honour Code"
+msgstr "Côd anrhydedd"
+
 #: common/djangoapps/course_modes/helpers.py
 msgid "You're enrolled as a professional education student"
 msgstr "Rydych wedi'ch cofrestru fel myfyriwr addysg broffesiynol"
@@ -4935,6 +4940,10 @@ msgstr "Rhoddi"
 msgid "Terms of Service & Honor Code"
 msgstr "Telerau Gwasanaeth a Chôd Anrhydedd"
 
+#: lms/djangoapps/branding/api.py
+msgid "Terms of Service & Honour Code"
+msgstr "Telerau Gwasanaeth a Chôd Anrhydedd"
+
 #: cms/templates/widgets/footer.html
 #: lms/templates/static_templates/privacy.html
 #: themes/red-theme/lms/templates/footer.html
@@ -5279,6 +5288,12 @@ msgstr "Tystysgrif annilys"
 msgid "Terms of Service &amp; Honor Code"
 msgstr "Telerau gwasanaeth &amp; Côd anrhydedd"
 
+#. Translators: The &amp; characters represent an ampersand character and can
+#. be ignored
+#: lms/djangoapps/certificates/views/webview.py
+msgid "Terms of Service &amp; Honour Code"
+msgstr "Telerau gwasanaeth &amp; Côd anrhydedd"
+
 #. Translators: This line appears as a byline to a header image and describes
 #. the purpose of the page
 #: lms/djangoapps/certificates/views/webview.py
@@ -10458,16 +10473,30 @@ msgstr "Dewiswch eich gwlad."
 msgid "Review the Honor Code"
 msgstr "Adolygu'r côd anrhydedd"
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honour Code"
+msgstr "Adolygu'r côd anrhydedd"
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr "Telerau Gwasanaeth a Chôd Anrhydedd"
 
+#. Translators: This is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Terms of Service and Honour Code"
+msgstr "Telerau Gwasanaeth a Chôd Anrhydedd"
+
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Review the Terms of Service and Honor Code"
 msgstr "Adolygu Telerau Gwasanaeth a Chôd Anrhydedd"
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service and Honour Code"
+msgstr "Adolygu Telerau Gwasanaeth a Chôd Anrhydedd"
+
 #. Translators: "Terms of Service" is a legal document users must agree to
 #. in order to register a new account.
 #. Translators: "Terms of service" is a legal document users must agree to

diff --git a/conf/locale/cy/LC_MESSAGES/mako.mo b/conf/locale/cy/LC_MESSAGES/mako.mo
diff --git a/conf/locale/cy/LC_MESSAGES/mako.po b/conf/locale/cy/LC_MESSAGES/mako.po
@@ -8480,6 +8480,13 @@ msgstr "Cwestiynau cyffredin"
 msgid "Honor Code"
 msgstr "Côd anrhydedd"
 
+#: lms/templates/static_templates/honor.html
+#: lms/templates/static_templates/honor.html
+#: themes/stanford-style/lms/templates/footer.html
+#: themes/stanford-style/lms/templates/static_templates/tos.html
+msgid "Honour Code"
+msgstr "Côd anrhydedd"
+
 #: lms/templates/static_templates/jobs.html
 #: lms/templates/static_templates/jobs.html
 #: themes/red-theme/lms/templates/footer.html
@@ -9060,7 +9067,10 @@ msgid "Review the Terms of Service and Honor Code"
 msgstr "Adolygu'r Telerau Gwasanaeth a Chod Honor"
 
 msgid "I agree to the {platform_name} Terms of Service and Honor Code"
-msgstr "Rwy'n cytuno i Amodau Gwasanaeth {platform_name} a Honor Cod"
+msgstr "Rwy'n cytuno i Amodau Gwasanaeth {platform_name} a Honor Code"
+
+msgid "I agree to the {platform_name} Terms of Service and Honour Code"
+msgstr "Rwy'n cytuno i Amodau Gwasanaeth {platform_name} a Honor Code"
 
 msgid "CREATE ACCOUNT"
 msgstr "Creu cyfrif"

diff --git a/lms/djangoapps/student_account/views.py b/lms/djangoapps/student_account/views.py
@@ -181,7 +181,6 @@ def login_and_registration_form(request, initial_mode="login"):
 
     response = render_to_response('student_account/login_and_register.html', context)
 
-    log.error("rendering respone {}".format(response))
     handle_enterprise_cookies_for_logistration(request, response, context)
 
     return response

diff --git a/lms/urls.py b/lms/urls.py
@@ -1100,7 +1100,9 @@
 
 urlpatterns.extend(plugin_urls.get_patterns(plugin_constants.ProjectType.LMS))
 
-
-urlpatterns += (
-    url(r'^subscription/', include('agnosticcontentxblock.urls')),
-)
+try:
+    urlpatterns += (
+        url(r'^subscription/', include('agnosticcontentxblock.urls')),
+    )
+except:
+    pass
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
@@ -105,8 +105,8 @@ git+https://github.com/mitodl/edx-sga.git@d019b8a050c056db535e3ff13c93096145a932
 git+https://github.com/proversity-org/xblock-poll.git@v1.4.0#egg=xblock-poll==1.4.0
 git+https://github.com/proversity-org/xblock-drag-and-drop-v2.git@v2.1.0#egg=xblock-drag-and-drop-v2==2.1.0
 git+https://github.com/proversity-org/edx-xblock-bibblio.git#egg=edx-xblock-bibblio
-git+https://github.com/proversity-org/xblock-free-text-response.git@0.2.1#egg=xblock-free-text-response==0.2.1
-git+https://github.com/proversity-org/recap-xblock.git@0.3.0#egg=recap-xblock==0.3.0
+git+https://github.com/proversity-org/xblock-free-text-response.git@0.2.2#egg=xblock-free-text-response==0.2.2
+git+https://github.com/proversity-org/recap-xblock.git@0.3.1#egg=recap-xblock==0.3.1
 git+https://github.com/proversity-org/badger-xblock.git@0.2.3#egg=badger-xblock==0.2.3
 git+https://github.com/eduNEXT/flow-control-xblock@v0.2.0#egg=flow-control-xblock==0.2.0
 git+https://github.com/proversity-org/xblock-pdf.git@v1.0.0#egg=xblock-pdf==1.0.0