Commits

Anonymous committed 6f146d0

Locale's fixed and languages translations [es & ca]

Comments (0)

Files changed (7)

 *~
 *.pyc
-
+*.mo
+*.directory
+sqlitedb.sql
+static/*
+project/properties.py

frontend/templates/base.html

                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Languages" %}<b class="caret"></b></a>
                 <ul class="dropdown-menu">
                     {% for lang in LANGUAGES %}
-                    <form class="form-lang" name="setLang{{ lang.1 }}" action="/i18n/setlang/" method="POST">
+                    <form class="form-lang" name="setLang{{ lang.1 }}" action="{% url 'set_language' %}" method="POST">
                         {% csrf_token %}
                         <input name="next" type="hidden" value="{{ request.path }}" />
                         <input type="hidden" name="language" value="{{ lang.0 }}" />
 from frontend.facebook import facebook_view
 
 urlpatterns = patterns('',
-    url(r'^$', home, name='home'),
     url(r'^contact/$', contact, name='contact'),
     url(r'^about/$', about, name='about'),
     url(r'^fb/', facebook_view, name='fb_app'),
     url(r'^done/$', done, name='done'),
     url(r'^logout/$', logout, name='logout'),
     url(r'^i18n/', include('django.conf.urls.i18n')),
+    url(r'^$', home, name='home'),
     #url(r'^error/$', error, name='error'),
     #url(r'^config/$', config, name='config'),
 )

locale/ca/LC_MESSAGES/django.po

+# -*- coding: utf-8 -*- 
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-25 18:04+0100\n"
+"POT-Creation-Date: 2013-03-26 11:07+0100\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"
 msgstr "Contacte"
 
 #: frontend/templates/base.html:59
-#, fuzzy
 msgid "Languages"
-msgstr "Llengua"
+msgstr "Llengues"
 
 #: frontend/templates/base.html:95
 #: frontend/templates/registration/password_change_form.html:16
 msgid "Password change"
-msgstr ""
+msgstr "Canviar contrasenya"
 
 #: frontend/templates/base.html:96
 msgid "Logout"
 
 #: frontend/templates/base.html:108
 msgid "Sign up"
-msgstr ""
+msgstr "Registrar-se"
 
 #: frontend/templates/base.html:109
 #: frontend/templates/registration/password_reset_form.html:16
 msgid "Password reset"
-msgstr ""
+msgstr "Resetjar contrasenya"
 
 #: frontend/templates/config.html:10
 msgid "Settings"
 
 #: frontend/templates/registration/password_change_done.html:16
 msgid "Password change successful"
-msgstr ""
+msgstr "Contrasenya canviada correctament"
 
 #: frontend/templates/registration/password_change_done.html:17
 msgid "Your password was changed."
-msgstr ""
+msgstr "La teva contrasenya ha estat canviada"
 
 #: frontend/templates/registration/password_change_form.html:18
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
-msgstr ""
+msgstr "Per favor, introueix la teva antiga contrasenya, per questió de seguretat, y després "
+"introueix la nova dues vegades, per verificar que l'has escrita correctament."
 
 #: frontend/templates/registration/password_change_form.html:23
 msgid "Old password:"
-msgstr ""
+msgstr "Contrasenya antiga:"
 
 #: frontend/templates/registration/password_change_form.html:25
 #: frontend/templates/registration/password_reset_confirm.html:24
 msgid "New password:"
-msgstr ""
+msgstr "Nova contrasenya:"
 
 #: frontend/templates/registration/password_change_form.html:27
 #: frontend/templates/registration/password_reset_confirm.html:26
 msgid "Confirm password:"
-msgstr ""
+msgstr "Confirma la contrasenya:"
 
 #: frontend/templates/registration/password_change_form.html:29
 #: frontend/templates/registration/password_reset_confirm.html:27
 msgid "Change my password"
-msgstr ""
+msgstr "Canviar la meva contrasenya"
 
 #: frontend/templates/registration/password_reset_complete.html:16
 msgid "Password reset complete"
-msgstr ""
+msgstr "Contrasenya resetajada"
 
 #: frontend/templates/registration/password_reset_complete.html:18
 msgid "Your password has been set.  You may go ahead and log in now."
-msgstr ""
+msgstr "La teva contrasenya ha estat introduida. Pot serguir endevant i iniciar sessió ara."
 
 #: frontend/templates/registration/password_reset_complete.html:20
 msgid "Log in"
-msgstr ""
+msgstr "Iniciar sessió"
 
 #: frontend/templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
-msgstr ""
+msgstr "Introdueix la nova contrasenya"
 
 #: frontend/templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
-msgstr ""
+msgstr "Per favor, introueix la teva contrasenya dues vegades per tal de comprovar que "
+"l'has escrita be."
 
 #: frontend/templates/registration/password_reset_confirm.html:32
 msgid "Password reset unsuccessful"
-msgstr ""
+msgstr "Canvi de password incorrecte"
 
 #: frontend/templates/registration/password_reset_confirm.html:34
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
-msgstr ""
+msgstr "El enllaç per resetjar contrasenya es invalid, possiblement perque ja ha "
+"estat empleat. Per favor, torna a demanar el reseteig de contrasenya."
 
 #: frontend/templates/registration/password_reset_done.html:16
 msgid "Password reset successful"
-msgstr ""
+msgstr "Contrasenya resetajada correctament"
 
 #: frontend/templates/registration/password_reset_done.html:18
 msgid ""
 "We've e-mailed you instructions for setting your password to the e-mail "
 "address you submitted. You should be receiving it shortly."
-msgstr ""
+msgstr "Hem enviat un correu electrónic amb instruccions per canviar la contrasenya "
+"a la adreça que has introduit. L'hauries de rebre en poc temps."
 
 #: frontend/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
-msgstr ""
+msgstr "Has rebut aquest correu perque has solicitat un canvi de contrasenya"
 
 #: frontend/templates/registration/password_reset_email.html:3
 #, python-format
 msgid "for your user account at %(site_name)s"
-msgstr ""
+msgstr "per el teu conta de %(site_name)s"
 
 #: frontend/templates/registration/password_reset_email.html:5
 msgid "Please go to the following page and choose a new password:"
-msgstr ""
+msgstr "Per favor, segueix el seguent enllaç per canviar la contrasenya:"
 
 #: frontend/templates/registration/password_reset_email.html:9
 msgid "Your username, in case you've forgotten:"
-msgstr ""
+msgstr "El teu nom d'usuari, en el cas de haberlo perdut:"
 
 #: frontend/templates/registration/password_reset_email.html:11
 msgid "Thanks for using our site!"
-msgstr ""
+msgstr "Moltes gràcies per emplear la nostra pàgina!"
 
 #: frontend/templates/registration/password_reset_email.html:13
 #, python-format
 msgid "The %(site_name)s team"
-msgstr ""
+msgstr "L'equip de %(site_name)s"
 
 #: frontend/templates/registration/password_reset_form.html:18
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll e-mail "
 "instructions for setting a new one."
-msgstr ""
+msgstr "Has per la teva contrasenya? Introdueix la teva adreça de correu i t'enviarem "
+"instruccions detallades per triar una de nova."
 
 #: frontend/templates/registration/password_reset_form.html:23
-#, fuzzy
 msgid "E-mail address:"
-msgstr "Direcció de correu electrónic"
+msgstr "Direcció de correu electrónic:"
 
 #: frontend/templates/registration/password_reset_form.html:23
 msgid "Reset my password"
-msgstr ""
+msgstr "Resetjar la contrasenya"
 
 #: frontend/templates/registration/registration_form.html:83
 msgid "Register"
-msgstr ""
+msgstr "Registrar-se"
 
 #: frontend/templatetags/extras.py:70
 #, python-format

locale/es/LC_MESSAGES/django.po

+# -*- coding: utf-8 -*- 
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-25 18:04+0100\n"
+"POT-Creation-Date: 2013-03-26 11:07+0100\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"
 msgstr "Contacto"
 
 #: frontend/templates/base.html:59
-#, fuzzy
 msgid "Languages"
-msgstr "Idioma"
+msgstr "Idiomas"
 
 #: frontend/templates/base.html:95
 #: frontend/templates/registration/password_change_form.html:16
 msgid "Password change"
-msgstr ""
+msgstr "Cambiar contraseña"
 
 #: frontend/templates/base.html:96
 msgid "Logout"
 
 #: frontend/templates/base.html:108
 msgid "Sign up"
-msgstr ""
+msgstr "Registrarse"
 
 #: frontend/templates/base.html:109
 #: frontend/templates/registration/password_reset_form.html:16
 msgid "Password reset"
-msgstr ""
+msgstr "Resetear contraseña"
 
 #: frontend/templates/config.html:10
 msgid "Settings"
 
 #: frontend/templates/registration/password_change_done.html:16
 msgid "Password change successful"
-msgstr ""
+msgstr "Contraseña cambiada satisfactoriamente"
 
 #: frontend/templates/registration/password_change_done.html:17
 msgid "Your password was changed."
-msgstr ""
+msgstr "Tu contraseña ha sido cambiada"
 
 #: frontend/templates/registration/password_change_form.html:18
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
 msgstr ""
+"Por favor entra tu antigua contraseña, por seguridad, y luego introduce tu "
+"nueva contraseña dos veces para verificar que se ha introducido "
+"correctamente."
 
 #: frontend/templates/registration/password_change_form.html:23
 msgid "Old password:"
-msgstr ""
+msgstr "Contraseña antigua"
 
 #: frontend/templates/registration/password_change_form.html:25
 #: frontend/templates/registration/password_reset_confirm.html:24
 msgid "New password:"
-msgstr ""
+msgstr "Contraseña nueva"
 
 #: frontend/templates/registration/password_change_form.html:27
 #: frontend/templates/registration/password_reset_confirm.html:26
 msgid "Confirm password:"
-msgstr ""
+msgstr "Confirma la contraseña"
 
 #: frontend/templates/registration/password_change_form.html:29
 #: frontend/templates/registration/password_reset_confirm.html:27
 msgid "Change my password"
-msgstr ""
+msgstr "Cambiar mi contraseña"
 
 #: frontend/templates/registration/password_reset_complete.html:16
 msgid "Password reset complete"
-msgstr ""
+msgstr "Contraseña reseteada"
 
 #: frontend/templates/registration/password_reset_complete.html:18
 msgid "Your password has been set.  You may go ahead and log in now."
-msgstr ""
+msgstr "Tu contraseña está reseteada. Quizá quieras continuar y loguearte."
 
 #: frontend/templates/registration/password_reset_complete.html:20
 msgid "Log in"
-msgstr ""
+msgstr "Identificarse"
 
 #: frontend/templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
-msgstr ""
+msgstr "Introduce la nueva contraseña"
 
 #: frontend/templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
+"Por favor, introduce tu nueva contraseña dos veces para verificar que la has "
+"escrito correctamente."
 
 #: frontend/templates/registration/password_reset_confirm.html:32
 msgid "Password reset unsuccessful"
-msgstr ""
+msgstr "La contraseña no se ha podido resetear"
 
 #: frontend/templates/registration/password_reset_confirm.html:34
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
+"El link para resetear la contraseña es inválido, posiblemente por que ya ha "
+"sido usado. Por favor, solicita un nuevo reseteo de contraseña."
 
 #: frontend/templates/registration/password_reset_done.html:16
 msgid "Password reset successful"
-msgstr ""
+msgstr "Contraseña reseteada"
 
 #: frontend/templates/registration/password_reset_done.html:18
 msgid ""
 "We've e-mailed you instructions for setting your password to the e-mail "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
+"Te hemos enviado a tu correo electrónico instrucciones para cambiar tu "
+"contraseña a la dirección de correo que nos has enviado. Deberías recibirlo "
+"en breve."
 
 #: frontend/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
-msgstr ""
+msgstr "Has recibido este correo porque has solicitado un cambio de contraseña"
 
 #: frontend/templates/registration/password_reset_email.html:3
 #, python-format
 msgid "for your user account at %(site_name)s"
-msgstr ""
+msgstr "para tu cuenta de usuario en %(site_name)s"
 
 #: frontend/templates/registration/password_reset_email.html:5
 msgid "Please go to the following page and choose a new password:"
 msgstr ""
+"Por favor, ves a la siguiente página para escoger una nueva contraseña:"
 
 #: frontend/templates/registration/password_reset_email.html:9
 msgid "Your username, in case you've forgotten:"
-msgstr ""
+msgstr "Tu nombre de usuario, en caso de haberlo olvidado:"
 
 #: frontend/templates/registration/password_reset_email.html:11
 msgid "Thanks for using our site!"
-msgstr ""
+msgstr "Gracias por utilizar nuestro sitio!"
 
 #: frontend/templates/registration/password_reset_email.html:13
 #, python-format
 msgid "The %(site_name)s team"
-msgstr ""
+msgstr "El equipo de %(site_name)s"
 
 #: frontend/templates/registration/password_reset_form.html:18
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll e-mail "
 "instructions for setting a new one."
 msgstr ""
+"¿Olvidaste tu contraseña? Introduce tu dirección de correo a continuación, y "
+"te escribiremos con las instrucciones para resetear con una nueva."
 
 #: frontend/templates/registration/password_reset_form.html:23
-#, fuzzy
 msgid "E-mail address:"
-msgstr "Dirección de correo electrónico"
+msgstr "Dirección de correo electrónico:"
 
 #: frontend/templates/registration/password_reset_form.html:23
 msgid "Reset my password"
-msgstr ""
+msgstr "Resetear mi contraseña"
 
 #: frontend/templates/registration/registration_form.html:83
 msgid "Register"
-msgstr ""
+msgstr "Registrarse"
 
 #: frontend/templatetags/extras.py:70
 #, python-format

project/settings.py

     ('ca', 'Català'),
 )
 
+LOCALE_PATHS = (
+    '/home/edu/git/proyecto/locale',
+)
+
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
     'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',
     # Uncomment the next line for simple clickjacking protection:
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
     url(r'^robots\.txt$', lambda r: HttpResponse("", mimetype="text/plain")),
     url(r'', include('frontend.urls')),
     url(r'', include('social_auth.urls')),
-    url(r'^accounts/', include('registration.backends.default.urls')),
+#    url(r'^accounts/', include('registration.backends.default.urls')),
     url(r'^admin/', include(admin.site.urls)),
 )