Changeset 369:f98caac01351

Timestamp:

19/03/11 20:52:49 (2 years ago)

Author:

nicoechaniz <nico@…>

Branch:

default

Message:

updated layout middleware. updated some spanish translation for Contacts.

Location:

cyclope

Files:

• apps/contacts/admin.py (modified) (1 diff)
• apps/contacts/forms.py (modified) (2 diffs)
• default_settings.py (modified) (1 diff)
• locale/es/LC_MESSAGES/django.po (modified) (3 diffs)
• locale/fr/LC_MESSAGES/django.po (modified) (3 diffs)
• locale/it/LC_MESSAGES/django.po (modified) (3 diffs)
• locale/pt/LC_MESSAGES/django.po (modified) (3 diffs)
• middleware.py (modified) (2 diffs)

cyclope/apps/contacts/admin.py

@@ -45 +45 @@
     list_filter = CollectibleAdmin.list_filter + ('gender', )
     list_display = ('given_name', 'surname', 'gender', 'email', 'web', 'mobile_phone_number')
+    search_fields = ('given_name', 'surname', 'email', 'web', 'mobile_phone_number')
 
     fieldsets = (

cyclope/apps/contacts/forms.py

@@ -23 +23 @@
 from django import forms
 from django.forms.extras.widgets import SelectDateWidget
+from django.utils.translation import ugettext_lazy as _
 
 from models import Contact
@@ -30 +31 @@
 
 class ContactForm(forms.ModelForm):
-    birth_date = forms.DateField(widget=SelectDateWidget(years=range(1900, actual_year)), required=False)
+    birth_date = forms.DateField(label=_('Birth date'), widget=SelectDateWidget(years=range(1900, actual_year)), required=False)
 
     class Meta:

cyclope/default_settings.py

@@ -37 +37 @@
 SITE_ID = 1
 USE_I18N = True
-#USE_L10N = True
-
-LANGUAGE_CODE = 'es'
+USE_L10N = True
+
+## LANGUAGE_CODE = 'en'
 LANGUAGES = (
     ('es', u'Español'),

cyclope/locale/es/LC_MESSAGES/django.po

@@ -5 +5 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-19 19:09-0300\n"
+"POT-Creation-Date: 2011-03-19 19:50-0300\n"
 "PO-Revision-Date: 2010-10-29 22:16\n"
 "Last-Translator: <a@a.com>\n"
@@ -638 +638 @@
 msgstr "Más"
 
+#: apps/contacts/forms.py:33
+#: apps/contacts/templates/contacts/contact_detail.html:55
+msgid "Birth date"
+msgstr "Fecha de nacimiento"
+
 #: apps/contacts/frontend_views.py:38
 msgid "detailed view of the selected Contact"
@@ -721 +726 @@
 msgid "Surname"
 msgstr "Apellido"
-
-#: apps/contacts/templates/contacts/contact_detail.html:55
-msgid "Birth date"
-msgstr "Fecha de nacimiento"
 
 #: apps/contacts/templates/contacts/contact_detail.html:56

cyclope/locale/fr/LC_MESSAGES/django.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-19 19:09-0300\n"
+"POT-Creation-Date: 2011-03-19 19:50-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -636 +636 @@
 msgstr ""
 
+#: apps/contacts/forms.py:33
+#: apps/contacts/templates/contacts/contact_detail.html:55
+msgid "Birth date"
+msgstr ""
+
 #: apps/contacts/frontend_views.py:38
 msgid "detailed view of the selected Contact"
@@ -718 +723 @@
 #: apps/contacts/templates/contacts/contact_detail.html:54
 msgid "Surname"
-msgstr ""
-
-#: apps/contacts/templates/contacts/contact_detail.html:55
-msgid "Birth date"
 msgstr ""
 

cyclope/locale/it/LC_MESSAGES/django.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-19 19:09-0300\n"
+"POT-Creation-Date: 2011-03-19 19:50-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -636 +636 @@
 msgstr ""
 
+#: apps/contacts/forms.py:33
+#: apps/contacts/templates/contacts/contact_detail.html:55
+msgid "Birth date"
+msgstr ""
+
 #: apps/contacts/frontend_views.py:38
 msgid "detailed view of the selected Contact"
@@ -718 +723 @@
 #: apps/contacts/templates/contacts/contact_detail.html:54
 msgid "Surname"
-msgstr ""
-
-#: apps/contacts/templates/contacts/contact_detail.html:55
-msgid "Birth date"
 msgstr ""
 

cyclope/locale/pt/LC_MESSAGES/django.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-19 19:09-0300\n"
+"POT-Creation-Date: 2011-03-19 19:50-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -635 +635 @@
 msgstr ""
 
+#: apps/contacts/forms.py:33
+#: apps/contacts/templates/contacts/contact_detail.html:55
+msgid "Birth date"
+msgstr ""
+
 #: apps/contacts/frontend_views.py:38
 msgid "detailed view of the selected Contact"
@@ -717 +722 @@
 #: apps/contacts/templates/contacts/contact_detail.html:54
 msgid "Surname"
-msgstr ""
-
-#: apps/contacts/templates/contacts/contact_detail.html:55
-msgid "Birth date"
 msgstr ""
 

cyclope/middleware.py

@@ -30 +30 @@
     def process_request(self, request):
         menu_item = cyclope.utils.menu_item_for_request(request)
+        default_template = cyclope.settings.CYCLOPE_DEFAULT_TEMPLATE
         if menu_item:
-            default_template = cyclope.settings.CYCLOPE_DEFAULT_TEMPLATE
             ## we force the layout for items with custom URL (external apps)
             ## so they can use the correct template to extend from
@@ -37 +37 @@
                 layout = menu_item.get_layout()
                 request.session['layout'] = layout
+                request.session['layout_template'] = layout.get_template_path()
+                
             else:
                 if request.session.has_key('layout'):
                     del request.session['layout']
+        else:
+            ## if no layout_template has been set we set it to the default so external apps'
+            ## templates will work (sort of) even when accessed through a direct URL
+            if not 'layout_template' in request.session:
+                request.session['layout_template'] = default_template