Merge remote-tracking branch 'origin/master'

.gitignore

@@ -2,7 +2,7 @@
 *.sw[po]
 /.coverage
 /weblate/repos/
-locale/*/*/*.mo
+/weblate/locale/*/*/*.mo
 /weblate/whoosh-index/
 /weblate/avatar-cache/
 weblate-*.tar.*

MANIFEST.in

@@ -12,6 +12,8 @@ recursive-include weblate/static *
 recursive-include weblate/html *.txt
 recursive-include weblate/html *.html
 recursive-include weblate/html *.svg
+recursive-include weblate/locale *.po
+recursive-include weblate/locale *.mo
 recursive-include docs *.rst
 include docs/images/*
 include docs/conf.py
@@ -22,8 +24,6 @@ include docs/_ext/*.py
 include docs/_static/*.png
 include docs/_templates/*.html
 recursive-include examples *
-recursive-include locale *.po
-recursive-include locale *.mo
 include weblate/trans/tests/data/*
 include weblate/trans/widget-images/*.png
 include weblate/lang/plurals.txt

scripts/update-locales

@@ -10,11 +10,11 @@ set -e
 ./manage.py makemessages --keep-pot -a -i 'data/*' -i 'docs/*' -i 'examples/*' -i 'build/*' -d djangojs --settings=weblate.settings_test
 
 # Fix Report-Msgid-Bugs-To as it gets removed
-sed -i 's/"Report-Msgid-Bugs-To:.*/"Report-Msgid-Bugs-To: weblate@lists.cihar.com\\n"/' locale/*/*/*.po
+sed -i 's/"Report-Msgid-Bugs-To:.*/"Report-Msgid-Bugs-To: weblate@lists.cihar.com\\n"/' weblate/locale/*/*/*.po
 
 # Commit changes
-git add locale/*/*/*.po
-git add locale/django.pot locale/djangojs.pot
+git add weblate/locale/*/*/*.po
+git add weblate/locale/django.pot weblate/locale/djangojs.pot
 
 git commit -s -m "Update po files
 

weblate/settings_example.py

@@ -288,8 +288,6 @@ INSTALLED_APPS = (
     'weblate',
 )
 
-LOCALE_PATHS = (os.path.join(BASE_DIR, '..', 'locale'), )
-
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.auth.context_processors.auth',