Merge pull request #913 from edx/ddumesnil/i18n

Changed requirements to pull edx-i18n-tools from PyPI and .gitignore …

.gitignore

@@ -50,10 +50,9 @@ acceptance_tests/xunit.xml
 !django.mo
 !djangojs.po
 !djangojs.mo
-conf/locale/fake*/LC_MESSAGES/*.po
-conf/locale/fake*/LC_MESSAGES/*.mo
-conf/locale/messages.mo
-
+ecommerce/conf/locale/fake*/LC_MESSAGES/*.po
+ecommerce/conf/locale/fake*/LC_MESSAGES/*.mo
+ecommerce/conf/locale/messages.mo
 
 # Mr Developer
 .mr.developer.cfg

Makefile

@@ -92,13 +92,14 @@ accept:
 	nosetests --with-ignore-docstrings -v acceptance_tests --with-xunit --xunit-file=acceptance_tests/xunit.xml
 
 extract_translations:
-	cd ecommerce && i18n_tool extract -v
+	python manage.py makemessages -l en -v1 -d django --ignore="docs/*" --ignore="src/*" --ignore="i18n/*" --ignore="assets/*" --ignore="node_modules/*" --ignore="ecommerce/static/bower_components/*" --ignore="ecommerce/static/build/*"
+	python manage.py makemessages -l en -v1 -d djangojs --ignore="docs/*" --ignore="src/*" --ignore="i18n/*" --ignore="assets/*" --ignore="node_modules/*" --ignore="ecommerce/static/bower_components/*" --ignore="ecommerce/static/build/*"
 
 dummy_translations:
-	cd ecommerce && i18n_tool dummy -v
+	cd ecommerce && i18n_tool dummy
 
 compile_translations:
-	cd ecommerce && i18n_tool generate -v
+	python manage.py compilemessages
 
 fake_translations: extract_translations dummy_translations compile_translations
 

ecommerce/conf/locale/config.yaml

@@ -16,6 +16,7 @@ locales:
     - da  # Danish
     - de_DE  # German (Germany)
     - el  # Greek
+    - en  # English
     - en_GB  # English (United Kingdom)
     # Don't pull these until we figure out why pages randomly display in these locales,
     # when the user's browser is in English and the user is not logged in.
@@ -90,6 +91,9 @@ ignore_dirs:
     - src
     - i18n
     - assets
+    - node_modules
+    - static/bower_components
+    - static/build
 
 generate_merge:
     django.po:

requirements/local.txt

@@ -6,4 +6,4 @@ django-debug-toolbar==1.4
 
 # i18n
 transifex-client==0.11
-git+https://github.com/edx/i18n-tools.git@v0.1.4#egg=i18n_tools==0.1.4
+edx-i18n-tools==0.3.3