From bd00ce90b4928d2779222854675817d112036f7a Mon Sep 17 00:00:00 2001 From: Marco Bonetti Date: Wed, 17 Sep 2014 10:40:41 +0200 Subject: [PATCH] initial fixes for testing against django 1.7 final, fixes some translations --- rosetta/locale/de/LC_MESSAGES/django.mo | Bin 2734 -> 2739 bytes rosetta/locale/ru/LC_MESSAGES/django.po | 2 +- rosetta/locale/uk/LC_MESSAGES/django.po | 2 +- runtests_multi_venv.sh | 20 ++++++++++---------- testproject/settings.py | 8 ++++++++ 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/rosetta/locale/de/LC_MESSAGES/django.mo b/rosetta/locale/de/LC_MESSAGES/django.mo index 44ea90a22dcef18d5087eeb1c1fa9d62989c9e8a..279b356e9580e6665c26214699fbd88da2c37a54 100644 GIT binary patch delta 134 zcmZ1{x>z1_p*Z91IN8f%GpR%?+d{aWXJy0_k}`nhi*w0McAQ`aF=<0MfUh zd}g2^KakG{qy>Sr9FQ&p(gr{pWX|%W={Z;Asl^^pL3Kj7H^K>3}*xY DD=Zd{ diff --git a/rosetta/locale/ru/LC_MESSAGES/django.po b/rosetta/locale/ru/LC_MESSAGES/django.po index 6edc7d0..d37a05c 100644 --- a/rosetta/locale/ru/LC_MESSAGES/django.po +++ b/rosetta/locale/ru/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2014-02-28 13:36+0100\n" "PO-Revision-Date: 2010-07-04 13:42+0200\n" "Last-Translator: Nazar Leush \n" -"Language-Team: LANGUAGE \n" +"Language-Team: ru \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/rosetta/locale/uk/LC_MESSAGES/django.po b/rosetta/locale/uk/LC_MESSAGES/django.po index fbf99f0..83043ca 100644 --- a/rosetta/locale/uk/LC_MESSAGES/django.po +++ b/rosetta/locale/uk/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2014-02-28 13:36+0100\n" "PO-Revision-Date: 2010-07-04 13:42+0200\n" "Last-Translator: Nazar Leush \n" -"Language-Team: LANGUAGE \n" +"Language-Team: uk \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/runtests_multi_venv.sh b/runtests_multi_venv.sh index b5025cf..736e247 100755 --- a/runtests_multi_venv.sh +++ b/runtests_multi_venv.sh @@ -35,19 +35,19 @@ then pip install --use-mirrors coverage python3-memcached six Django==1.6.1 requests==2.1.0 polib==1.0.4 microsofttranslator==0.5 deactivate fi -if [ ! -d .venv_17b ] +if [ ! -d .venv_17 ] then - virtualenv --no-site-packages --distribute --python=python2.7 .venv_17b - . .venv_17b/bin/activate - pip install https://www.djangoproject.com/download/1.7.b4/tarball/ + virtualenv --no-site-packages --distribute --python=python2.7 .venv_17 + . .venv_17/bin/activate + pip install Django==1.7 pip install --use-mirrors coverage python-memcached six requests==2.1.0 polib==1.0.4 microsofttranslator==0.5 deactivate fi -if [ ! -d .venv_17b_p3 ] +if [ ! -d .venv_17_p3 ] then - virtualenv --no-site-packages --distribute --python=python3 .venv_17b_p3 - . .venv_17b_p3/bin/activate - pip install https://www.djangoproject.com/download/1.7.b4/tarball/ + virtualenv --no-site-packages --distribute --python=python3 .venv_17_p3 + . .venv_17_p3/bin/activate + pip install Django==1.7 pip install --use-mirrors coverage python3-memcached six requests==2.1.0 polib==1.0.4 microsofttranslator==0.5 deactivate fi @@ -93,7 +93,7 @@ python manage.py test rosetta cd .. deactivate -. .venv_17b/bin/activate +. .venv_17/bin/activate cd testproject python manage.py --version python --version @@ -101,7 +101,7 @@ python manage.py test rosetta cd .. deactivate -. .venv_17b_p3/bin/activate +. .venv_17_p3/bin/activate cd testproject python manage.py --version python --version diff --git a/testproject/settings.py b/testproject/settings.py index 5d52f1c..3f33405 100644 --- a/testproject/settings.py +++ b/testproject/settings.py @@ -46,6 +46,14 @@ INSTALLED_APPS = [ ] LANGUAGE_CODE = "en" +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware' +) + LANGUAGES = ( ('ja', u'日本語'), ('xx', u'XXXXX'),