Skip to content

E
ecommerce
Commit 1b54af8c by Ivan Ivic Committed by GitHub
Options

Merge pull request #966 from edx/iivic/SOL-2053b 

Updated i18n-tool version, .travis.yml and Makefile files changed
parents dbd17a4e 4efe1f8b
Showing with 57 additions and 52 deletions
.travis.yml
...@@ -21,14 +21,15 @@ before_install: ...@@ -21,14 +21,15 @@ before_install:
install: install:
- pip install -U codecov - pip install -U codecov
- pip install -U pip wheel - pip install -U pip wheel
- pip install -r requirements/test.txt - make requirements
- pip install -r requirements/docs.txt
- make requirements.js
script: script:
# Ensure documentation can be compiled # Ensure documentation can be compiled
- cd docs && make html - cd docs && make html
- cd .. - cd ..
# Check if translation files are up-to-date
- make validate_translations
# Compile assets and run validation # Compile assets and run validation
- make clean_static - make clean_static
- make static - make static
......
Makefile
...@@ -12,7 +12,7 @@ help: ...@@ -12,7 +12,7 @@ help:
@echo ' make clean delete generated byte code and coverage reports ' @echo ' make clean delete generated byte code and coverage reports '
@echo ' make validate_js run JavaScript unit tests and linting ' @echo ' make validate_js run JavaScript unit tests and linting '
@echo ' make validate_python run Python unit tests and quality checks ' @echo ' make validate_python run Python unit tests and quality checks '
@echo ' make fast_validate_python run Python unit tests (in parallel) and quality checks ' @echo ' make fast_validate_python run Python unit tests (in parallel) and quality checks '
@echo ' make quality run PEP8 and Pylint ' @echo ' make quality run PEP8 and Pylint '
@echo ' make validate Run Python and JavaScript unit tests and linting ' @echo ' make validate Run Python and JavaScript unit tests and linting '
@echo ' make html_coverage generate and view HTML coverage report ' @echo ' make html_coverage generate and view HTML coverage report '
...@@ -23,8 +23,10 @@ help: ...@@ -23,8 +23,10 @@ help:
@echo ' make fake_translations install fake translations ' @echo ' make fake_translations install fake translations '
@echo ' make pull_translations pull translations from Transifex ' @echo ' make pull_translations pull translations from Transifex '
@echo ' make update_translations install new translations from Transifex ' @echo ' make update_translations install new translations from Transifex '
@echo ' make clean_static delete compiled/compressed static assets' @echo ' make clean_static delete compiled/compressed static assets '
@echo ' make static compile and compress static assets' @echo ' make static compile and compress static assets '
@echo ' make detect_changed_source_translations check if translation files are up-to-date '
@echo ' make validate_translations install fake translations and check if translation files are up-to-date'
@echo ' ' @echo ' '
requirements.js: requirements.js:
...@@ -111,6 +113,12 @@ push_translations: ...@@ -111,6 +113,12 @@ push_translations:
update_translations: pull_translations fake_translations update_translations: pull_translations fake_translations
# extract_translations should be called before this command can detect changes
detect_changed_source_translations:
cd ecommerce && i18n_tool changed
validate_translations: fake_translations detect_changed_source_translations
# Targets in a Makefile which do not produce an output file with the same name as the target name # Targets in a Makefile which do not produce an output file with the same name as the target name
.PHONY: help requirements migrate serve clean validate_python quality validate_js validate html_coverage accept \ .PHONY: help requirements migrate serve clean validate_python quality validate_js validate html_coverage accept \
extract_translations dummy_translations compile_translations fake_translations pull_translations \ extract_translations dummy_translations compile_translations fake_translations pull_translations \
......
ecommerce/conf/locale/en/LC_MESSAGES/djangojs.po
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-09-09 08:38-0400\n" "POT-Creation-Date: 2016-10-10 13:26+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -33,19 +33,19 @@ msgstr "" ...@@ -33,19 +33,19 @@ msgstr ""
msgid "At least one seat type must be selected." msgid "At least one seat type must be selected."
msgstr "" msgstr ""
#: ecommerce/static/js/models/coupon_model.js:51 #: ecommerce/static/js/models/coupon_model.js:52
msgid "A valid course ID is required" msgid "A valid course ID is required"
msgstr "" msgstr ""
#: ecommerce/static/js/models/coupon_model.js:98 #: ecommerce/static/js/models/coupon_model.js:99
msgid "This field must be empty or contain 1-16 alphanumeric characters." msgid "This field must be empty or contain 1-16 alphanumeric characters."
msgstr "" msgstr ""
#: ecommerce/static/js/models/coupon_model.js:123 #: ecommerce/static/js/models/coupon_model.js:128
msgid "Must occur before end date" msgid "Must occur before end date"
msgstr "" msgstr ""
#: ecommerce/static/js/models/coupon_model.js:138 #: ecommerce/static/js/models/coupon_model.js:143
msgid "Must occur after start date" msgid "Must occur after start date"
msgstr "" msgstr ""
...@@ -96,12 +96,12 @@ msgid "The upgrade deadline must occur BEFORE the verification deadline." ...@@ -96,12 +96,12 @@ msgid "The upgrade deadline must occur BEFORE the verification deadline."
msgstr "" msgstr ""
#: ecommerce/static/js/models/course_seats/course_seat.js:71 #: ecommerce/static/js/models/course_seats/course_seat.js:71
#: ecommerce/static/js/views/course_form_view.js:60 #: ecommerce/static/js/views/course_form_view.js:62
msgid "Verified" msgid "Verified"
msgstr "" msgstr ""
#: ecommerce/static/js/models/course_seats/course_seat.js:73 #: ecommerce/static/js/models/course_seats/course_seat.js:73
#: ecommerce/static/js/views/course_form_view.js:71 #: ecommerce/static/js/views/course_form_view.js:73
msgid "Credit" msgid "Credit"
msgstr "" msgstr ""
...@@ -185,34 +185,38 @@ msgstr "" ...@@ -185,34 +185,38 @@ msgstr ""
msgid "Redeem" msgid "Redeem"
msgstr "" msgstr ""
#: ecommerce/static/js/views/coupon_detail_view.js:97 #: ecommerce/static/js/utils/validation_patterns.js:15
#: ecommerce/static/js/views/coupon_form_view.js:58 msgid "The course ID is invalid."
msgstr ""
#: ecommerce/static/js/views/coupon_detail_view.js:105
#: ecommerce/static/js/views/coupon_form_view.js:60
msgid "Can be used once by one customer" msgid "Can be used once by one customer"
msgstr "" msgstr ""
#: ecommerce/static/js/views/coupon_detail_view.js:99 #: ecommerce/static/js/views/coupon_detail_view.js:107
#: ecommerce/static/js/views/coupon_form_view.js:66 #: ecommerce/static/js/views/coupon_form_view.js:68
msgid "Can be used multiple times by multiple customers" msgid "Can be used multiple times by multiple customers"
msgstr "" msgstr ""
#: ecommerce/static/js/views/coupon_detail_view.js:101 #: ecommerce/static/js/views/coupon_detail_view.js:109
#: ecommerce/static/js/views/coupon_form_view.js:62 #: ecommerce/static/js/views/coupon_form_view.js:64
msgid "Can be used once by multiple customers" msgid "Can be used once by multiple customers"
msgstr "" msgstr ""
#: ecommerce/static/js/views/coupon_form_view.js:47 #: ecommerce/static/js/views/coupon_form_view.js:49
msgid "Enrollment Code" msgid "Enrollment Code"
msgstr "" msgstr ""
#: ecommerce/static/js/views/coupon_form_view.js:51 #: ecommerce/static/js/views/coupon_form_view.js:53
msgid "Discount Code" msgid "Discount Code"
msgstr "" msgstr ""
#: ecommerce/static/js/views/coupon_form_view.js:573 #: ecommerce/static/js/views/coupon_form_view.js:588
msgid "Save Changes" msgid "Save Changes"
msgstr "" msgstr ""
#: ecommerce/static/js/views/coupon_form_view.js:591 #: ecommerce/static/js/views/coupon_form_view.js:603
msgid "Create Coupon" msgid "Create Coupon"
msgstr "" msgstr ""
...@@ -254,33 +258,30 @@ msgstr "" ...@@ -254,33 +258,30 @@ msgstr ""
msgid "Coupon Report" msgid "Coupon Report"
msgstr "" msgstr ""
#: ecommerce/static/js/views/course_form_view.js:55 #: ecommerce/static/js/views/course_form_view.js:57
msgid "Free (Audit)" msgid "Free (Audit)"
msgstr "" msgstr ""
#: ecommerce/static/js/views/course_form_view.js:56 #: ecommerce/static/js/views/course_form_view.js:58
msgid "Free audit track. No certificate." msgid "Free audit track. No certificate."
msgstr "" msgstr ""
#: ecommerce/static/js/views/course_form_view.js:61 #: ecommerce/static/js/views/course_form_view.js:63
msgid "" msgid ""
"Paid certificate track with initial verification and Verified Certificate" "Paid certificate track with initial verification and Verified Certificate"
msgstr "" msgstr ""
#: ecommerce/static/js/views/course_form_view.js:65 #: ecommerce/static/js/views/course_form_view.js:67
msgid "Professional Education" msgid "Professional Education"
msgstr "" msgstr ""
#: ecommerce/static/js/views/course_form_view.js:66 #: ecommerce/static/js/views/course_form_view.js:68
msgid "" msgid "Paid certificate track with initial verification and Professional "
"Paid certificate track with initial verification and Professional Education "
"Certificate"
msgstr "" msgstr ""
#: ecommerce/static/js/views/course_form_view.js:72 #: ecommerce/static/js/views/course_form_view.js:74
msgid "" msgid ""
"Paid certificate track with initial verification and Verified Certificate, " "Paid certificate track with initial verification and Verified Certificate, "
"and option to purchase credit"
msgstr "" msgstr ""
#. Translators: _START_, _END_, and _TOTAL_ are placeholders. Do NOT translate them. #. Translators: _START_, _END_, and _TOTAL_ are placeholders. Do NOT translate them.
...@@ -314,53 +315,48 @@ msgstr "" ...@@ -314,53 +315,48 @@ msgstr ""
msgid "Seat type" msgid "Seat type"
msgstr "" msgstr ""
#: ecommerce/static/js/views/form_view.js:89 #: ecommerce/static/js/views/form_view.js:67
msgid "A course with the specified ID already exists." msgid "A course with the specified ID already exists."
msgstr "" msgstr ""
#: ecommerce/static/js/views/form_view.js:99 #: ecommerce/static/js/views/form_view.js:77
#: ecommerce/static/js/views/form_view.js:165 #: ecommerce/static/js/views/form_view.js:171
#: ecommerce/static/js/views/form_view.js:205
msgid "Error!" msgid "Error!"
msgstr "" msgstr ""
#: ecommerce/static/js/views/form_view.js:156 #: ecommerce/static/js/views/form_view.js:122
msgid "Saving..." msgid "Saving..."
msgstr "" msgstr ""
#: ecommerce/static/js/views/form_view.js:165 #: ecommerce/static/js/views/form_view.js:131
msgid "You must complete all required fields." msgid "Please complete all required fields."
msgstr "" msgstr ""
#: ecommerce/static/js/views/form_view.js:192 #: ecommerce/static/js/views/form_view.js:158
msgid "An error occurred while saving the data." msgid "An error occurred while saving the data."
msgstr "" msgstr ""
#: ecommerce/static/js/views/offer_view.js:173 #: ecommerce/static/js/views/offer_view.js:194
msgid "Ellipsis" msgid "Ellipsis"
msgstr "" msgstr ""
#: ecommerce/static/js/views/offer_view.js:180 #: ecommerce/static/js/views/offer_view.js:201
msgid "Load the records for page " msgid "Load the records for page "
msgstr "" msgstr ""
#: ecommerce/static/js/views/offer_view.js:187 #: ecommerce/static/js/views/offer_view.js:208
msgid "Load the records for the next page" msgid "Load the records for the next page"
msgstr "" msgstr ""
#: ecommerce/static/js/views/offer_view.js:195 #: ecommerce/static/js/views/offer_view.js:216
msgid "Load the records for the previous page" msgid "Load the records for the previous page"
msgstr "" msgstr ""
#: ecommerce/static/js/views/payment_button_view.js:89 #: ecommerce/static/js/views/provider_selection_view.js:33
msgid "An error has occurred. Please try again."
msgstr ""
#: ecommerce/static/js/views/provider_selection_view.js:31
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: ecommerce/static/js/views/provider_selection_view.js:32 #: ecommerce/static/js/views/provider_selection_view.js:34
msgid "Selected" msgid "Selected"
msgstr "" msgstr ""
......
ecommerce/conf/locale/eo/LC_MESSAGES/django.po
This source diff could not be displayed because it is too large. You can view the blob instead.
requirements/local.txt
...@@ -6,4 +6,4 @@ django-debug-toolbar==1.4 ...@@ -6,4 +6,4 @@ django-debug-toolbar==1.4
# i18n # i18n
transifex-client==0.11 transifex-client==0.11
edx-i18n-tools==0.3.3 edx-i18n-tools==0.3.4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment