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:
install:
- pip install -U codecov
- pip install -U pip wheel
- pip install -r requirements/test.txt
- pip install -r requirements/docs.txt
- make requirements.js
- make requirements
script:
# Ensure documentation can be compiled
- cd docs && make html
- cd ..
# Check if translation files are up-to-date
- make validate_translations
# Compile assets and run validation
- make clean_static
- make static
......
Makefile
......@@ -12,7 +12,7 @@ help:
@echo ' make clean delete generated byte code and coverage reports '
@echo ' make validate_js run JavaScript unit tests and linting '
@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 validate Run Python and JavaScript unit tests and linting '
@echo ' make html_coverage generate and view HTML coverage report '
......@@ -23,8 +23,10 @@ help:
@echo ' make fake_translations install fake translations '
@echo ' make pull_translations pull translations from Transifex '
@echo ' make update_translations install new translations from Transifex '
@echo ' make clean_static delete compiled/compressed static assets'
@echo ' make static compile and compress static assets'
@echo ' make clean_static delete compiled/compressed 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 ' '
requirements.js:
......@@ -111,6 +113,12 @@ push_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
.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 \
......
ecommerce/conf/locale/en/LC_MESSAGES/djangojs.po
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\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"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,19 +33,19 @@ msgstr ""
msgid "At least one seat type must be selected."
msgstr ""
#: ecommerce/static/js/models/coupon_model.js:51
#: ecommerce/static/js/models/coupon_model.js:52
msgid "A valid course ID is required"
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."
msgstr ""
#: ecommerce/static/js/models/coupon_model.js:123
#: ecommerce/static/js/models/coupon_model.js:128
msgid "Must occur before end date"
msgstr ""
#: ecommerce/static/js/models/coupon_model.js:138
#: ecommerce/static/js/models/coupon_model.js:143
msgid "Must occur after start date"
msgstr ""
......@@ -96,12 +96,12 @@ msgid "The upgrade deadline must occur BEFORE the verification deadline."
msgstr ""
#: 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"
msgstr ""
#: 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"
msgstr ""
......@@ -185,34 +185,38 @@ msgstr ""
msgid "Redeem"
msgstr ""
#: ecommerce/static/js/views/coupon_detail_view.js:97
#: ecommerce/static/js/views/coupon_form_view.js:58
#: ecommerce/static/js/utils/validation_patterns.js:15
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"
msgstr ""
#: ecommerce/static/js/views/coupon_detail_view.js:99
#: ecommerce/static/js/views/coupon_form_view.js:66
#: ecommerce/static/js/views/coupon_detail_view.js:107
#: ecommerce/static/js/views/coupon_form_view.js:68
msgid "Can be used multiple times by multiple customers"
msgstr ""
#: ecommerce/static/js/views/coupon_detail_view.js:101
#: ecommerce/static/js/views/coupon_form_view.js:62
#: ecommerce/static/js/views/coupon_detail_view.js:109
#: ecommerce/static/js/views/coupon_form_view.js:64
msgid "Can be used once by multiple customers"
msgstr ""
#: ecommerce/static/js/views/coupon_form_view.js:47
#: ecommerce/static/js/views/coupon_form_view.js:49
msgid "Enrollment Code"
msgstr ""
#: ecommerce/static/js/views/coupon_form_view.js:51
#: ecommerce/static/js/views/coupon_form_view.js:53
msgid "Discount Code"
msgstr ""
#: ecommerce/static/js/views/coupon_form_view.js:573
#: ecommerce/static/js/views/coupon_form_view.js:588
msgid "Save Changes"
msgstr ""
#: ecommerce/static/js/views/coupon_form_view.js:591
#: ecommerce/static/js/views/coupon_form_view.js:603
msgid "Create Coupon"
msgstr ""
......@@ -254,33 +258,30 @@ msgstr ""
msgid "Coupon Report"
msgstr ""
#: ecommerce/static/js/views/course_form_view.js:55
#: ecommerce/static/js/views/course_form_view.js:57
msgid "Free (Audit)"
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."
msgstr ""
#: ecommerce/static/js/views/course_form_view.js:61
#: ecommerce/static/js/views/course_form_view.js:63
msgid ""
"Paid certificate track with initial verification and Verified Certificate"
msgstr ""
#: ecommerce/static/js/views/course_form_view.js:65
#: ecommerce/static/js/views/course_form_view.js:67
msgid "Professional Education"
msgstr ""
#: ecommerce/static/js/views/course_form_view.js:66
msgid ""
"Paid certificate track with initial verification and Professional Education "
"Certificate"
#: ecommerce/static/js/views/course_form_view.js:68
msgid "Paid certificate track with initial verification and Professional "
msgstr ""
#: ecommerce/static/js/views/course_form_view.js:72
#: ecommerce/static/js/views/course_form_view.js:74
msgid ""
"Paid certificate track with initial verification and Verified Certificate, "
"and option to purchase credit"
msgstr ""
#. Translators: _START_, _END_, and _TOTAL_ are placeholders. Do NOT translate them.
......@@ -314,53 +315,48 @@ msgstr ""
msgid "Seat type"
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."
msgstr ""
#: ecommerce/static/js/views/form_view.js:99
#: ecommerce/static/js/views/form_view.js:165
#: ecommerce/static/js/views/form_view.js:205
#: ecommerce/static/js/views/form_view.js:77
#: ecommerce/static/js/views/form_view.js:171
msgid "Error!"
msgstr ""
#: ecommerce/static/js/views/form_view.js:156
#: ecommerce/static/js/views/form_view.js:122
msgid "Saving..."
msgstr ""
#: ecommerce/static/js/views/form_view.js:165
msgid "You must complete all required fields."
#: ecommerce/static/js/views/form_view.js:131
msgid "Please complete all required fields."
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."
msgstr ""
#: ecommerce/static/js/views/offer_view.js:173
#: ecommerce/static/js/views/offer_view.js:194
msgid "Ellipsis"
msgstr ""
#: ecommerce/static/js/views/offer_view.js:180
#: ecommerce/static/js/views/offer_view.js:201
msgid "Load the records for page "
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"
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"
msgstr ""
#: ecommerce/static/js/views/payment_button_view.js:89
msgid "An error has occurred. Please try again."
msgstr ""
#: ecommerce/static/js/views/provider_selection_view.js:31
#: ecommerce/static/js/views/provider_selection_view.js:33
msgid "Select"
msgstr ""
#: ecommerce/static/js/views/provider_selection_view.js:32
#: ecommerce/static/js/views/provider_selection_view.js:34
msgid "Selected"
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
# i18n
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