diff --git a/.travis.yml b/.travis.yml index 4cd9b15..530ea1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ script: - make selfcheck - make quality - make test - - make validate_translations + - travis_retry make validate_translations notifications: email: false diff --git a/Makefile b/Makefile index b6a1ac2..661ad9f 100644 --- a/Makefile +++ b/Makefile @@ -84,9 +84,9 @@ extract_translations: ## extract strings to be translated, outputting .po files @# django-admin makemessages -l en -v1 -d djangojs -e js # Extract Handlebars i18n strings - echo > locale/en/LC_MESSAGES/textjs.po # Ensure it's empty + > locale/en/LC_MESSAGES/textjs.po # Ensure it's empty # The sort to avoid bash arbitrary file order - ls poll/public/handlebars/*.handlebars | sort \ + ls poll/public/handlebars/*.handlebars \ | xargs node node_modules/.bin/xgettext-template --from-code utf8 \ --language Handlebars \ --force-po \ diff --git a/package.json b/package.json index cf27e4f..0b59fec 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "xgettext-template": "^3.4.2" + "xgettext-template": "^4.0.2" } } diff --git a/poll/translations/ar/LC_MESSAGES/text.mo b/poll/translations/ar/LC_MESSAGES/text.mo index 8f3ec90..2799930 100644 Binary files a/poll/translations/ar/LC_MESSAGES/text.mo and b/poll/translations/ar/LC_MESSAGES/text.mo differ diff --git a/poll/translations/de_DE/LC_MESSAGES/text.mo b/poll/translations/de_DE/LC_MESSAGES/text.mo index 6d04dbf..b4182f6 100644 Binary files a/poll/translations/de_DE/LC_MESSAGES/text.mo and b/poll/translations/de_DE/LC_MESSAGES/text.mo differ diff --git a/poll/translations/en/LC_MESSAGES/text.mo b/poll/translations/en/LC_MESSAGES/text.mo index 7c64e87..6c5906d 100644 Binary files a/poll/translations/en/LC_MESSAGES/text.mo and b/poll/translations/en/LC_MESSAGES/text.mo differ diff --git a/poll/translations/en/LC_MESSAGES/text.po b/poll/translations/en/LC_MESSAGES/text.po index 91d768b..3104f6f 100644 --- a/poll/translations/en/LC_MESSAGES/text.po +++ b/poll/translations/en/LC_MESSAGES/text.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-07 09:53+0000\n" +"POT-Creation-Date: 2020-03-17 14:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,7 +90,7 @@ msgstr "" msgid "Private results may not be False when Maximum Submissions is not 1." msgstr "" -#: poll/poll.py:449 poll/poll.py:841 +#: poll/poll.py:449 poll/poll.py:842 msgid "Poll" msgstr "" @@ -118,7 +118,7 @@ msgstr "" msgid "The answer options on this poll." msgstr "" -#: poll/poll.py:464 poll/poll.py:867 +#: poll/poll.py:464 poll/poll.py:868 msgid "Total tally of answers from students." msgstr "" @@ -126,7 +126,7 @@ msgstr "" msgid "The student's answer" msgstr "" -#: poll/poll.py:673 poll/poll.py:1147 +#: poll/poll.py:673 poll/poll.py:1148 msgid "You have already voted in this poll." msgstr "" @@ -140,7 +140,7 @@ msgstr "" msgid "No key \"{choice}\" in answers table." msgstr "" -#: poll/poll.py:696 poll/poll.py:1155 +#: poll/poll.py:696 poll/poll.py:1156 msgid "You have already voted as many times as you are allowed." msgstr "" @@ -148,59 +148,59 @@ msgstr "" msgid "You must specify a question." msgstr "" -#: poll/poll.py:729 poll/poll.py:826 poll/poll.py:1209 poll/poll.py:1336 +#: poll/poll.py:729 poll/poll.py:826 poll/poll.py:1210 poll/poll.py:1338 msgid "Answer" msgstr "" -#: poll/poll.py:825 poll/poll.py:1210 poll/poll.py:1335 +#: poll/poll.py:825 poll/poll.py:1211 poll/poll.py:1337 msgid "Question" msgstr "" -#: poll/poll.py:827 poll/poll.py:1337 +#: poll/poll.py:828 poll/poll.py:1339 msgid "Submissions count" msgstr "" -#: poll/poll.py:838 +#: poll/poll.py:839 msgid "Survey" msgstr "" -#: poll/poll.py:844 +#: poll/poll.py:845 msgid "Yes" msgstr "" -#: poll/poll.py:845 +#: poll/poll.py:846 msgid "No" msgstr "" -#: poll/poll.py:846 +#: poll/poll.py:847 msgid "Maybe" msgstr "" -#: poll/poll.py:848 +#: poll/poll.py:849 msgid "Answer choices for this Survey" msgstr "" -#: poll/poll.py:852 +#: poll/poll.py:853 msgid "Are you enjoying the course?" msgstr "" -#: poll/poll.py:854 +#: poll/poll.py:855 msgid "Would you recommend this course to your friends?" msgstr "" -#: poll/poll.py:858 +#: poll/poll.py:859 msgid "Do you think you will learn a lot?" msgstr "" -#: poll/poll.py:860 +#: poll/poll.py:861 msgid "Questions for this Survey" msgstr "" -#: poll/poll.py:869 +#: poll/poll.py:870 msgid "The user's answers" msgstr "" -#: poll/poll.py:1163 +#: poll/poll.py:1164 msgid "" "Not all questions were included, or unknown questions were included. Try " "refreshing and trying again." @@ -208,7 +208,7 @@ msgstr "" #. Translators: {answer_key} uniquely identifies a specific answer belonging to a poll or survey. #. {question_key} uniquely identifies a specific question belonging to a poll or survey. -#: poll/poll.py:1176 +#: poll/poll.py:1177 #, python-brace-format msgid "Found unknown answer '{answer_key}' for question key '{question_key}'" msgstr "" diff --git a/poll/translations/eo/LC_MESSAGES/text.mo b/poll/translations/eo/LC_MESSAGES/text.mo index fb5c4fe..2dd6a34 100644 Binary files a/poll/translations/eo/LC_MESSAGES/text.mo and b/poll/translations/eo/LC_MESSAGES/text.mo differ diff --git a/poll/translations/eo/LC_MESSAGES/text.po b/poll/translations/eo/LC_MESSAGES/text.po index ca5794b..13643dd 100644 --- a/poll/translations/eo/LC_MESSAGES/text.po +++ b/poll/translations/eo/LC_MESSAGES/text.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-07 09:53+0000\n" +"POT-Creation-Date: 2020-03-17 14:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/poll/translations/es_419/LC_MESSAGES/text.mo b/poll/translations/es_419/LC_MESSAGES/text.mo index 604e749..26723ce 100644 Binary files a/poll/translations/es_419/LC_MESSAGES/text.mo and b/poll/translations/es_419/LC_MESSAGES/text.mo differ diff --git a/poll/translations/fr/LC_MESSAGES/text.mo b/poll/translations/fr/LC_MESSAGES/text.mo index 105fa7f..9b32d6e 100644 Binary files a/poll/translations/fr/LC_MESSAGES/text.mo and b/poll/translations/fr/LC_MESSAGES/text.mo differ diff --git a/poll/translations/fr_CA/LC_MESSAGES/text.mo b/poll/translations/fr_CA/LC_MESSAGES/text.mo index 9725b36..5858678 100644 Binary files a/poll/translations/fr_CA/LC_MESSAGES/text.mo and b/poll/translations/fr_CA/LC_MESSAGES/text.mo differ diff --git a/poll/translations/he/LC_MESSAGES/text.mo b/poll/translations/he/LC_MESSAGES/text.mo index 7b3cdd4..1ab08e8 100644 Binary files a/poll/translations/he/LC_MESSAGES/text.mo and b/poll/translations/he/LC_MESSAGES/text.mo differ diff --git a/poll/translations/hi/LC_MESSAGES/text.mo b/poll/translations/hi/LC_MESSAGES/text.mo index b0f7ad0..c4c84a0 100644 Binary files a/poll/translations/hi/LC_MESSAGES/text.mo and b/poll/translations/hi/LC_MESSAGES/text.mo differ diff --git a/poll/translations/ja_JP/LC_MESSAGES/text.mo b/poll/translations/ja_JP/LC_MESSAGES/text.mo index f20a136..86687e4 100644 Binary files a/poll/translations/ja_JP/LC_MESSAGES/text.mo and b/poll/translations/ja_JP/LC_MESSAGES/text.mo differ diff --git a/poll/translations/ko_KR/LC_MESSAGES/text.mo b/poll/translations/ko_KR/LC_MESSAGES/text.mo index d343566..128071e 100644 Binary files a/poll/translations/ko_KR/LC_MESSAGES/text.mo and b/poll/translations/ko_KR/LC_MESSAGES/text.mo differ diff --git a/poll/translations/pl/LC_MESSAGES/text.mo b/poll/translations/pl/LC_MESSAGES/text.mo index 384da03..d715849 100644 Binary files a/poll/translations/pl/LC_MESSAGES/text.mo and b/poll/translations/pl/LC_MESSAGES/text.mo differ diff --git a/poll/translations/pt_BR/LC_MESSAGES/text.mo b/poll/translations/pt_BR/LC_MESSAGES/text.mo index 96e0d0e..10c3e52 100644 Binary files a/poll/translations/pt_BR/LC_MESSAGES/text.mo and b/poll/translations/pt_BR/LC_MESSAGES/text.mo differ diff --git a/poll/translations/ru/LC_MESSAGES/text.mo b/poll/translations/ru/LC_MESSAGES/text.mo index f3ac718..53bd1c6 100644 Binary files a/poll/translations/ru/LC_MESSAGES/text.mo and b/poll/translations/ru/LC_MESSAGES/text.mo differ diff --git a/poll/translations/zh_CN/LC_MESSAGES/text.mo b/poll/translations/zh_CN/LC_MESSAGES/text.mo index 76d394a..1f888be 100644 Binary files a/poll/translations/zh_CN/LC_MESSAGES/text.mo and b/poll/translations/zh_CN/LC_MESSAGES/text.mo differ diff --git a/requirements-dev.txt b/requirements-dev.txt index 77493bf..b44d68c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ Django==1.11.25 django-statici18n==1.8.2 transifex-client==0.12.1 -edx-i18n-tools==0.4.5 +edx-i18n-tools==0.5.0 pycodestyle==2.4.0 pylint tox==3.14.0 diff --git a/tests/integration/test_max_submissions.py b/tests/integration/test_max_submissions.py index 8aba956..5122655 100644 --- a/tests/integration/test_max_submissions.py +++ b/tests/integration/test_max_submissions.py @@ -53,7 +53,7 @@ def test_infinite_submissions(self, page, names): self.go_to_page(page) for ___ in range(1, 5): self.do_submit(names) - self.assertTrue(self.get_submit().is_enabled()) + self.wait_until_exists('input[name=poll-submit]:enabled') @unpack @data(*scenarios_max)