Index: tests/regressiontests/django_views/locale/en/LC_MESSAGES/djangojs.mo =================================================================== No se puede mostrar: el archivo está marcado como binario. svn:mime-type = application/octet-stream Cambios de propiedades en tests/regressiontests/django_views/locale/en/LC_MESSAGES/djangojs.mo ___________________________________________________________________ Nombre: svn:mime-type + application/octet-stream Index: tests/regressiontests/django_views/locale/en/LC_MESSAGES/djangojs.po =================================================================== --- tests/regressiontests/django_views/locale/en/LC_MESSAGES/djangojs.po (revisión: 0) +++ tests/regressiontests/django_views/locale/en/LC_MESSAGES/djangojs.po (revisión: 0) @@ -0,0 +1,20 @@ +# 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 , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-15 16:45+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "this is to be translated" +msgstr "this is to be translated in english" Index: tests/regressiontests/django_views/locale/es/LC_MESSAGES/djangojs.mo =================================================================== No se puede mostrar: el archivo está marcado como binario. svn:mime-type = application/octet-stream Cambios de propiedades en tests/regressiontests/django_views/locale/es/LC_MESSAGES/djangojs.mo ___________________________________________________________________ Nombre: svn:mime-type + application/octet-stream Index: tests/regressiontests/django_views/locale/es/LC_MESSAGES/djangojs.po =================================================================== --- tests/regressiontests/django_views/locale/es/LC_MESSAGES/djangojs.po (revisión: 0) +++ tests/regressiontests/django_views/locale/es/LC_MESSAGES/djangojs.po (revisión: 0) @@ -0,0 +1,21 @@ +# 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 , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-15 16:45+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: media/js/translate.js:1 +msgid "this is to be translated" +msgstr "esto tiene que ser traducido" Index: tests/regressiontests/django_views/locale/fr/LC_MESSAGES/djangojs.mo =================================================================== No se puede mostrar: el archivo está marcado como binario. svn:mime-type = application/octet-stream Cambios de propiedades en tests/regressiontests/django_views/locale/fr/LC_MESSAGES/djangojs.mo ___________________________________________________________________ Nombre: svn:mime-type + application/octet-stream Index: tests/regressiontests/django_views/locale/fr/LC_MESSAGES/djangojs.po =================================================================== --- tests/regressiontests/django_views/locale/fr/LC_MESSAGES/djangojs.po (revisión: 0) +++ tests/regressiontests/django_views/locale/fr/LC_MESSAGES/djangojs.po (revisión: 0) @@ -0,0 +1,20 @@ +# 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 , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-15 19:15+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "this is to be translated" +msgstr "il faut le traduire" Index: tests/regressiontests/django_views/views.py =================================================================== --- tests/regressiontests/django_views/views.py (revisión: 0) +++ tests/regressiontests/django_views/views.py (revisión: 0) @@ -0,0 +1,13 @@ +from django.http import HttpResponse +from django.template import RequestContext +from django.shortcuts import render_to_response + + +def index_page(request): + """ Dummy index page """ + return HttpResponse('Dummy page') + + +def jsi18n_test(request): + """ View for testing javascript message files """ + return render_to_response('js_i18n.html', {}) \ Sin fin-de-línea al final del archivo Index: tests/regressiontests/django_views/__init__.py =================================================================== Index: tests/regressiontests/django_views/models.py =================================================================== --- tests/regressiontests/django_views/models.py (revisión: 0) +++ tests/regressiontests/django_views/models.py (revisión: 0) @@ -0,0 +1,37 @@ +""" +Regression tests for Django Views +""" + +from os import path +import gettext + +from django.conf import settings +from django.test import Client, TestCase +from django.contrib.sessions.models import Session +from django.utils.translation import activate + +class I18NTests(TestCase): + """ Tests django views in django/views/i18n.py """ + + def test_setlang(self): + """ Test set_language view """ + for lang_code, lang_name in settings.LANGUAGES: + response = self.change_language(lang_code, '/django_views/') + self.assertRedirects(response, 'http://testserver/django_views/') + self.assertEquals(self.client.session['django_language'], lang_code) + + def test_jsi18n(self): + """ Test javascript_catalog view """ + for lang_code in ['es', 'fr', 'en']: + activate(lang_code) + locale_dir = path.join(path.dirname(__file__), 'locale') + catalog = gettext.translation('djangojs', locale_dir, [lang_code]) + trans_txt = catalog.ugettext('this is to be translated') + response = self.client.get('/django_views/jsi18n/') + # in response content must to be a line like that: + # catalog['this is to be translated'] = 'same_that_trans_txt' + self.assertContains(response, trans_txt, 1) + + def change_language(self, language, next): + post_data = dict(language=language, next=next) + return self.client.post('/django_views/i18n/setlang/', data=post_data) Index: tests/regressiontests/django_views/urls.py =================================================================== --- tests/regressiontests/django_views/urls.py (revisión: 0) +++ tests/regressiontests/django_views/urls.py (revisión: 0) @@ -0,0 +1,14 @@ +from django.conf.urls.defaults import * +import views + +js_info_dict = { + 'domain': 'djangojs', + 'packages': ('regressiontests.django_views',), +} + +urlpatterns = patterns('', + (r'^$', views.index_page), + (r'^i18n/', include('django.conf.urls.i18n')), + (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), + (r'^jsi18n_test/$', views.jsi18n_test), +) Index: tests/urls.py =================================================================== --- tests/urls.py (revisión: 6342) +++ tests/urls.py (copia de trabajo) @@ -11,4 +11,7 @@ # test urlconf for {% url %} template tag (r'^url_tag/', include('regressiontests.templates.urls')), + + # django views tests urls + (r'^django_views/', include('regressiontests.django_views.urls')), ) Index: tests/runtests.py =================================================================== --- tests/runtests.py (revisión: 6342) +++ tests/runtests.py (copia de trabajo) @@ -132,7 +132,6 @@ except Exception, e: sys.stderr.write("Error while importing %s:" % model_name + ''.join(traceback.format_exception(*sys.exc_info())[1:])) continue - # Add tests for invalid models. extra_tests = [] for model_dir, model_name in get_invalid_models(): Index: tests/templates/js_i18n.html =================================================================== --- tests/templates/js_i18n.html (revisión: 0) +++ tests/templates/js_i18n.html (revisión: 0) @@ -0,0 +1,6 @@ +{% extends "base.html" %} +{% load i18n %} +{% block title %}{% trans "Js Tests" %}{% endblock %} +{% block content %} + +{% endblock %} Index: AUTHORS =================================================================== --- AUTHORS (revisión: 6342) +++ AUTHORS (copia de trabajo) @@ -257,6 +257,7 @@ Brian Rosner Oliver Rutherfurd ryankanno + Manuel Saelices Ivan Sagalaev (Maniac) Vinay Sajip David Schein