Merge branch 'master' of github.com:edx/edx-ora2 into nsprenkle/waffl…

…e-flag-docs

docs/developers_guide.rst

@@ -85,16 +85,16 @@ If any changes are made to the .html files, it is necessary to re-do the transla
 
 The above command will generate translations files which will have to be checked into git.
 
-Building JS
+Building Static Files
 ------------
-This is required if there were any JS changes:
+This is required if there were any JS/SCSS changes:
 
 - from local directory (not in lms shell)
 - ``npm run build``
 
-Hot reload JS
+Hot Reload Frontend Changes
 ------------
-This is required if there were any JS changes:
+This is required if there were any JS/SCSS changes:
 
 - from local directory (not in lms shell)
 - ``npm run start`` to start dev server
@@ -103,15 +103,6 @@ This is required if there were any JS changes:
 - ``make lms-restart studio-restart``
   - **NOTE**: cms does not support hot reload at the moment
 
-Minifying CSS
------------------
-This is required if there were any SCSS changes:
-
-- be inside the shell
-- ``cd /edx/src/edx-ora2``
-- ``source edx-ora2/bin/activate``
-- ``make sass``
-
 Running Unit Tests
 ------------------
 ORA2 supports pytest. In order to run unit tests, do the following:

openassessment/locale/ar/LC_MESSAGES/django.po

@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 10:54-0400\n"
-"PO-Revision-Date: 2021-08-05 21:24+0000\n"
+"POT-Creation-Date: 2021-09-01 14:15-0400\n"
+"PO-Revision-Date: 2021-09-01 15:24+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Arabic (http://www.transifex.com/open-edx/edx-platform/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Response Files"
 msgstr ""
 
-#: openassessment/data.py:1349
+#: openassessment/data.py:1360
 msgid "No description provided."
 msgstr "لم يتم تقديم أي وصف."
 
@@ -389,42 +389,27 @@ msgstr ""
 msgid "Open Response Assessment"
 msgstr "تقييم الردود المفتوحة"
 
-#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:5
+#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:8
 #: openassessment/templates/openassessmentblock/edit/oa_edit_prompt.html:7
 msgid "Prompt"
 msgstr "علامة الاستعداد"
 
-#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:6
+#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:15
 msgid "Rubric"
 msgstr "سلّم التقييم"
 
-#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:7
+#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:22
 msgid "Schedule"
 msgstr "جدول"
 
-#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:8
+#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:29
 msgid "Assessment steps"
 msgstr "خطوات المهمة"
 
-#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:9
+#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:36
 msgid "Settings"
 msgstr "الإعدادات"
 
-#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:16
-msgid "Rubric Change Impacts Settings Section"
-msgstr "يؤثّر سلّم التقييم على قسم الإعدادات "
-
-#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:17
-msgid ""
-"A change that you made to this assessment's rubric has an impact on some "
-"examples laid out in the settings tab. For more information, go to the "
-"Settings section and fix the areas highlighted in red."
-msgstr "إنّ للتغيير الذي أدخلته على سلّم التقييم تأثير على بعض الأمثلة المطروحة في تبويبة الإعدادات. وللحصول على المزيد من المعلومات، يُرجى الذهاب إلى قسم الإعدادات وإصلاح الأشياء المحدّدة باللون الأحمر."
-
-#: openassessment/templates/openassessmentblock/edit/oa_edit_header_and_validation.html:21
-msgid "close alert"
-msgstr "إغلاق التنبيه"
-
 #: openassessment/templates/openassessmentblock/edit/oa_edit_option.html:5
 msgid "Option"
 msgstr "خيار"
@@ -1400,12 +1385,12 @@ msgid "Your Response "
 msgstr "إجابتك"
 
 #: openassessment/templates/openassessmentblock/response/oa_response.html:173
-#: openassessment/templates/openassessmentblock/response/oa_response.html:242
+#: openassessment/templates/openassessmentblock/response/oa_response.html:244
 msgid "(Required)"
 msgstr "(مطلوب)"
 
 #: openassessment/templates/openassessmentblock/response/oa_response.html:175
-#: openassessment/templates/openassessmentblock/response/oa_response.html:244
+#: openassessment/templates/openassessmentblock/response/oa_response.html:246
 msgid "(Optional)"
 msgstr "(اختياري)"
 
@@ -1424,111 +1409,111 @@ msgstr "\nينبغي على الفرق تعيين عضو واحد في الفر
 msgid "Enter your response to the prompt above."
 msgstr "يُرجى إدخال ردّك على السؤال أعلاه."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:206
+#: openassessment/templates/openassessmentblock/response/oa_response.html:208
 #, python-format
 msgid ""
 "\n"
-"                                    You are currently on Team %(team_name)s. Since you were on Team %(previous_team_name)s\n"
-"                                    when they submitted a response to this assignment, you are seeing Team %(previous_team_name)s’s\n"
-"                                    response and will receive the same grade for this assignment as your former teammates.\n"
-"                                    You will not be part of Team %(team_name)s’s submission for this assignment and will not\n"
-"                                    receive a grade for their submission.\n"
-"                                "
-msgstr "\nأنت الآن في فريق%(team_name)s. عندما كنت في فريق%(previous_team_name)s\nعندما قدموا إجابة على هذه المهمة، أنت تستعرض إجابة فريق%(previous_team_name)s وستحصل على الدرجة نفسها لزملائك في فريقك السابق\nلن يكون تقييمك ضمن إجابة فريق %(team_name)sلهذه المهمة ولن تحصل على درجة تقييمهم."
+"                                      You are currently on Team %(team_name)s. Since you were on Team %(previous_team_name)s\n"
+"                                      when they submitted a response to this assignment, you are seeing Team %(previous_team_name)s’s\n"
+"                                      response and will receive the same grade for this assignment as your former teammates.\n"
+"                                      You will not be part of Team %(team_name)s’s submission for this assignment and will not\n"
+"                                      receive a grade for their submission.\n"
+"                                  "
+msgstr ""
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:219
+#: openassessment/templates/openassessmentblock/response/oa_response.html:221
 msgid "We could not save your progress"
 msgstr "عذرًا، لم نستطع حفظ التقدّم الذي أحرزته."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:226
+#: openassessment/templates/openassessmentblock/response/oa_response.html:228
 msgid "Save your progress"
 msgstr "حفظ التقدّم الذي أحرزته"
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:230
+#: openassessment/templates/openassessmentblock/response/oa_response.html:232
 msgid "Your Submission Status"
 msgstr "حالة تقديمك"
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:240
+#: openassessment/templates/openassessmentblock/response/oa_response.html:242
 msgid "File Uploads "
 msgstr "تحميلات الملف"
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:248
+#: openassessment/templates/openassessmentblock/response/oa_response.html:250
 msgid ""
 "\n"
-"                                Upload files and review files uploaded by you and your teammates below. Be sure to add\n"
-"                                descriptions to your files to help your teammates identify them.\n"
-"                            "
-msgstr "\nحمل الملفات واستعرض الملفات التي حملتها وحملها زملائك في الفريق أدناه، تأكد من إضافة \nوصف لملفاتك لمساعدة زملائك على التعرف عليها."
+"                                  Upload files and review files uploaded by you and your teammates below. Be sure to add\n"
+"                                  descriptions to your files to help your teammates identify them.\n"
+"                              "
+msgstr ""
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:256
+#: openassessment/templates/openassessmentblock/response/oa_response.html:258
 msgid "We could not upload files"
 msgstr "لم نتمكّن من تحميل الملفات."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:262
+#: openassessment/templates/openassessmentblock/response/oa_response.html:264
 msgid "We could not delete files"
 msgstr "لم نتمكّن من حذف الملفات."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:269
+#: openassessment/templates/openassessmentblock/response/oa_response.html:271
 msgid "Select one or more files to upload for this submission."
 msgstr "اختر ملف أو أكثر لرفعها في هذا التقديم."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:271
+#: openassessment/templates/openassessmentblock/response/oa_response.html:273
 msgid "Select a file to upload for this submission."
 msgstr "اختر ملفًا لتحميله مع هذا التقديم"
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:276
+#: openassessment/templates/openassessmentblock/response/oa_response.html:278
 msgid "Supported file types: "
 msgstr "أنواع الملفات المدعومة:"
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:280
+#: openassessment/templates/openassessmentblock/response/oa_response.html:282
 msgid "Upload files"
 msgstr "تحميل الملفات"
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:282
+#: openassessment/templates/openassessmentblock/response/oa_response.html:284
 msgid "Upload file"
 msgstr "تحميل ملف"
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:298
+#: openassessment/templates/openassessmentblock/response/oa_response.html:300
 msgid "You may continue to work on your response until you submit it."
 msgstr "يمكنك مواصلة العمل على ردّك حتى لحظة تقديمك له."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:304
+#: openassessment/templates/openassessmentblock/response/oa_response.html:306
 msgid "This is a team submission."
 msgstr "هذا تقديم فريق."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:306
+#: openassessment/templates/openassessmentblock/response/oa_response.html:308
 msgid ""
 "One team member should submit a response with the team’s shared files and a "
 "text response on behalf of the entire team."
 msgstr "يجب على عضو واحد في الفريق تقديم إجابة مرفقة بملفات الفريق وإجابة نصية نيابة عن كامل أعضاء الفريق."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:308
+#: openassessment/templates/openassessmentblock/response/oa_response.html:310
 msgid ""
 "One team member should submit a response with the team’s shared files on "
 "behalf of the entire team."
 msgstr "يجب على عضو واحد في الفريق تقديم إجابة مرفقة بملفات الفريق وإجابة نصية نيابة عن كامل أعضاء الفريق."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:310
+#: openassessment/templates/openassessmentblock/response/oa_response.html:312
 msgid ""
 "One team member should submit a text response on behalf of the entire team."
 msgstr "يجب على عضو واحد في الفريق تقديم إجابة نصية نيابة عن كامل أعضاء الفريق."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:312
+#: openassessment/templates/openassessmentblock/response/oa_response.html:314
 msgid "One team member should submit on behalf of the entire team."
 msgstr "يجب على عضو واحد في الفريق تقديم إجابة نيابة عن كامل أعضاء الفريق."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:314
+#: openassessment/templates/openassessmentblock/response/oa_response.html:316
 msgid ""
 "\n"
-"                Learn more about team assignments here: (<a href=\"\" >link</a>)\n"
-"                "
-msgstr "\nتعرّف على مهام الفريق هنا: (<a href=\"\" >رابط</a>)"
+"                  Learn more about team assignments here: (<a href=\"\" >link</a>)\n"
+"                  "
+msgstr ""
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:322
+#: openassessment/templates/openassessmentblock/response/oa_response.html:324
 msgid "We could not submit your response"
 msgstr "عذرًا، لم نتمكّن من تقديم ردّك."
 
-#: openassessment/templates/openassessmentblock/response/oa_response.html:332
+#: openassessment/templates/openassessmentblock/response/oa_response.html:334
 msgid "Submit your response and move to the next step"
 msgstr "يُرجى تقديم ردّك ثمّ الانتقال إلى الخطوة التالية."
 
@@ -2500,31 +2485,31 @@ msgstr "يجب أن تكون الخيارات المنتقاة options_selected
 msgid "Your scores could not be checked."
 msgstr "عذرًا، لم يمكن التحقّق من درجاتك."
 
-#: openassessment/xblock/studio_mixin.py:210
-#: openassessment/xblock/studio_mixin.py:222
+#: openassessment/xblock/studio_mixin.py:226
+#: openassessment/xblock/studio_mixin.py:238
 msgid "Error updating XBlock configuration"
 msgstr "نأسف لحدوث خطأ في تحديث إعدادات إكس بلوك XBlock."
 
-#: openassessment/xblock/studio_mixin.py:227
+#: openassessment/xblock/studio_mixin.py:243
 msgid "Error: Text Response and File Upload Response cannot both be disabled"
 msgstr ""
 
-#: openassessment/xblock/studio_mixin.py:231
+#: openassessment/xblock/studio_mixin.py:247
 msgid ""
 "Error: When Text Response is disabled, File Upload Response must be Required"
 msgstr ""
 
-#: openassessment/xblock/studio_mixin.py:234
+#: openassessment/xblock/studio_mixin.py:250
 msgid ""
 "Error: When File Upload Response is disabled, Text Response must be Required"
 msgstr ""
 
-#: openassessment/xblock/studio_mixin.py:258
+#: openassessment/xblock/studio_mixin.py:274
 #, python-brace-format
 msgid "Validation error: {error}"
 msgstr "خطأ في التحقّق: {error}"
 
-#: openassessment/xblock/studio_mixin.py:289
+#: openassessment/xblock/studio_mixin.py:305
 msgid "Successfully updated OpenAssessment XBlock"
 msgstr "نجح تحديث OpenAssessment XBlock."