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

Updated i18n-tool version, .travis.yml and Makefile files

.travis.yml

@@ -32,8 +32,10 @@ before_script:
 
 script:
     # Ensure documentation can be compiled
-    - cd docs && make html
-    - cd ..
+    - cd docs && make html && cd ..
+
+    # Check if translation files are up-to-date
+    - make validate_translations
 
     # Compile static assets and validate the code
     - make static -e DJANGO_SETTINGS_MODULE="course_discovery.settings.test"

Makefile

@@ -7,27 +7,29 @@ NODE_BIN=./node_modules/.bin
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  help                       display this help message"
-	@echo "  make accept                run acceptance tests"
-	@echo "  clean                      delete generated byte code and coverage reports"
-	@echo "  compile_translations       compile translation files, outputting .po files for each supported language"
-	@echo "  dummy_translations         generate dummy translation (.po) files"
-	@echo "  extract_translations       extract strings to be translated, outputting .mo files"
-	@echo "  fake_translations          generate and compile dummy translation files"
-	@echo "  html_coverage              generate and view HTML coverage report"
-	@echo "  migrate                    apply database migrations"
-	@echo "  pull_translations          pull translations from Transifex"
-	@echo "  push_translations          push source translation files (.po) from Transifex"
-	@echo "  quality                    run PEP8 and Pylint"
-	@echo "  production-requirements    install requirements for production"
-	@echo "  requirements               install requirements for local development"
-	@echo "  requirements.js            install JS requirements for local development and production"
-	@echo "  test                       run tests and generate coverage report"
-	@echo "  validate                   run tests and quality checks"
-	@echo "  static                     gather all static assets for production"
-	@echo "  clean_static               remove all generated static files"
-	@echo "  start-devstack             run a local development copy of the server"
-	@echo "  open-devstack              open a shell on the server started by start-devstack"
+	@echo "  help                                 display this help message"
+	@echo "  make accept                          run acceptance tests"
+	@echo "  clean                                delete generated byte code and coverage reports"
+	@echo "  compile_translations                 compile translation files, outputting .po files for each supported language"
+	@echo "  dummy_translations                   generate dummy translation (.po) files"
+	@echo "  extract_translations                 extract strings to be translated, outputting .mo files"
+	@echo "  fake_translations                    generate and compile dummy translation files"
+	@echo "  html_coverage                        generate and view HTML coverage report"
+	@echo "  migrate                              apply database migrations"
+	@echo "  pull_translations                    pull translations from Transifex"
+	@echo "  push_translations                    push source translation files (.po) from Transifex"
+	@echo "  quality                              run PEP8 and Pylint"
+	@echo "  production-requirements              install requirements for production"
+	@echo "  requirements                         install requirements for local development"
+	@echo "  requirements.js                      install JS requirements for local development and production"
+	@echo "  test                                 run tests and generate coverage report"
+	@echo "  validate                             run tests and quality checks"
+	@echo "  static                               gather all static assets for production"
+	@echo "  clean_static                         remove all generated static files"
+	@echo "  start-devstack                       run a local development copy of the server"
+	@echo "  open-devstack                        open a shell on the server started by start-devstack"
+	@echo "  detect_changed_source_translations   check if translation files are up-to-date"
+	@echo "  validate_translations                install fake translations and check if translation files are up-to-date"
 	@echo ""
 
 static:
@@ -71,8 +73,8 @@ html_coverage:
 	coverage html && open htmlcov/index.html
 
 extract_translations:
-	python manage.py makemessages -l en -v1 -d django
-	python manage.py makemessages -l en -v1 -d djangojs
+	python manage.py makemessages -l en -v1 -d django --ignore="docs/*" --ignore="course_discovery/assets/*" --ignore="node_modules/*" --ignore="course_discovery/static/bower_components/*" --ignore="course_discovery/static/build/*"
+	python manage.py makemessages -l en -v1 -d djangojs --ignore="docs/*" --ignore="course_discovery/assets/*" --ignore="node_modules/*" --ignore="course_discovery/static/bower_components/*" --ignore="course_discovery/static/build/*"
 
 dummy_translations:
 	cd course_discovery && i18n_tool dummy
@@ -101,3 +103,8 @@ accept:
 make dev.test:
 	coverage run ./manage.py test course_discovery --settings=course_discovery.settings.devstack_test --keepdb
 	coverage report
+
+detect_changed_source_translations:
+	cd course_discovery && i18n_tool changed
+
+validate_translations: fake_translations detect_changed_source_translations

course_discovery/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 13:42+0000\n"
+"POT-Creation-Date: 2016-10-13 14:43+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"

course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-10-13 14:43+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: course_discovery/static/js/catalogs-change-form.js
+msgid "Preview"
+msgstr "Prévïéw Ⱡ'σяєм ιρѕυм #"

requirements/local.txt

@@ -6,7 +6,7 @@ django-debug-toolbar==1.5
 django-elasticsearch-debug-toolbar==1.0.4
 # i18n
 transifex-client==0.12.2
-edx-i18n-tools==0.3.3
+edx-i18n-tools==0.3.4
 
 # docker devstack
 docker-compose>=1.7.1,<2.0.0