Author: leidel
Date: Sun Dec 7 07:13:02 2008
New Revision: 267
Modified:
trunk/pages/admin/__init__.py
trunk/pages/admin/forms.py
trunk/pages/models.py
trunk/pages/templates/admin/pages/page/change_list.html
trunk/pages/templates/pages/revisions.html
Log:
Added some translation strings and fixed breadcumb links in admin
Modified: trunk/pages/admin/__init__.py
==============================================================================
--- trunk/pages/admin/__init__.py (original)
+++ trunk/pages/admin/__init__.py Sun Dec 7 07:13:02 2008
@@ -257,6 +257,7 @@
context = {
'name': _("page"),
'pages': Page.objects.root().order_by("tree_id"),
+ 'opts': self.model._meta,
}
context.update(extra_context or {})
change_list = self.changelist_view(request, context)
Modified: trunk/pages/admin/forms.py
==============================================================================
--- trunk/pages/admin/forms.py (original)
+++ trunk/pages/admin/forms.py Sun Dec 7 07:13:02 2008
@@ -1,6 +1,6 @@
from django import forms
from django.template.defaultfilters import slugify
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import ugettext_lazy as _
from pages import settings
from pages.models import Page, Content, tagging
@@ -28,7 +28,7 @@
if settings.PAGE_UNIQUE_SLUG_REQUIRED:
if self.instance.id:
if
Content.objects.exclude(page=self.instance).filter(body=slug,
type="slug").count():
- raise forms.ValidationError(ugettext_lazy('Another
page with this slug already exists'))
+ raise forms.ValidationError(_('Another page with this
slug already exists'))
elif Content.objects.filter(body=slug, type="slug").count():
- raise forms.ValidationError(ugettext_lazy('Another page
with this slug already exists'))
+ raise forms.ValidationError(_('Another page with this slug
already exists'))
return slug
Modified: trunk/pages/models.py
==============================================================================
--- trunk/pages/models.py (original)
+++ trunk/pages/models.py Sun Dec 7 07:13:02 2008
@@ -35,15 +35,15 @@
(DRAFT, _('Draft')),
(PUBLISHED, _('Published')),
)
- author = models.ForeignKey(User)
- parent = models.ForeignKey('self', null=True, blank=True,
related_name='children')
- creation_date = models.DateTimeField(editable=False,
default=datetime.now)
- publication_date = models.DateTimeField(null=True, blank=True,
help_text=_('When the page should go live. Status must be "Published" for
page to go live.'))
- publication_end_date = models.DateTimeField(null=True, blank=True,
help_text=_('When to expire the page. Leave empty to never expire.'))
-
- status = models.IntegerField(choices=STATUSES, default=DRAFT)
- template = models.CharField(max_length=100, null=True, blank=True)
- sites = models.ManyToManyField(Site, default=[settings.SITE_ID],
help_text=_('The site(s) the page is accessible at.'))
+ author = models.ForeignKey(User, verbose_name=_('author'))
+ parent = models.ForeignKey('self', null=True, blank=True,
related_name='children', verbose_name=_('parent'))
+ creation_date = models.DateTimeField(_('creation date'),
editable=False, default=datetime.now)
+ publication_date = models.DateTimeField(_('publication date'),
null=True, blank=True, help_text=_('When the page should go live. Status
must be "Published" for page to go live.'))
+ publication_end_date = models.DateTimeField(_('publication end date'),
null=True, blank=True, help_text=_('When to expire the page. Leave empty to
never expire.'))
+
+ status = models.IntegerField(_('status'), choices=STATUSES,
default=DRAFT)
+ template = models.CharField(_('template'), max_length=100, null=True,
blank=True)
+ sites = models.ManyToManyField(Site, default=[settings.SITE_ID],
help_text=_('The site(s) the page is accessible at.'),
verbose_name=_('sites'))
# Managers
objects = PageManager()
@@ -186,9 +186,9 @@
(1, _('This page only')),
(2, _('This page and all childrens')),
)
- page = models.ForeignKey(Page, null=True, blank=True)
- user = models.ForeignKey(User)
- type = models.IntegerField(choices=TYPES, default=0)
+ page = models.ForeignKey(Page, null=True, blank=True,
verbose_name=_('page'))
+ user = models.ForeignKey(User, verbose_name=_('user'))
+ type = models.IntegerField(_('type'), choices=TYPES, default=0)
objects = PagePermissionManager()
@@ -197,12 +197,12 @@
class Content(models.Model):
"""A block of content, tied to a page, for a particular language"""
- language = models.CharField(max_length=3, blank=False)
- body = models.TextField()
- type = models.CharField(max_length=100, blank=False)
- page = models.ForeignKey(Page)
+ language = models.CharField(_('language'), max_length=3, blank=False)
+ body = models.TextField(_('body'))
+ type = models.CharField(_('type'), max_length=100, blank=False)
+ page = models.ForeignKey(Page, verbose_name=_('page'))
- creation_date = models.DateTimeField(editable=False,
default=datetime.now)
+ creation_date = models.DateTimeField(_('creation date'),
editable=False, default=datetime.now)
objects = ContentManager()
def __unicode__(self):
Modified: trunk/pages/templates/admin/pages/page/change_list.html
==============================================================================
--- trunk/pages/templates/admin/pages/page/change_list.html (original)
+++ trunk/pages/templates/admin/pages/page/change_list.html Sun Dec 7
07:13:02 2008
@@ -1,6 +1,6 @@
{% extends "admin/change_list.html" %}
{% load adminmedia admin_list i18n pages_tags %}
-{% block title %}List of pages{% endblock %}
+{% block title %}{% trans "List of pages" %}{% endblock %}
{% block bodyclass %}change-list{% endblock %}
{% if not is_popup %}{% block breadcrumbs %}
Modified: trunk/pages/templates/pages/revisions.html
==============================================================================
--- trunk/pages/templates/pages/revisions.html (original)
+++ trunk/pages/templates/pages/revisions.html Sun Dec 7 07:13:02 2008
@@ -1,10 +1,11 @@
+{% load i18n %}
{% if revisions %}
<div class="revisions">
- <h4>Revisions</h4>
+ <h4>{% trans "Revisions" %}</h4>
<ul class="revisions-list">
{% for revision in revisions %}
- <li><a href="./get-content/{{ revision.id }}/" {% if
forloop.first %} class="selected"{% endif %}>{{ revision.creation_date|
date:"H:i - d M Y" }}</a></li>
+ <li><a href="./get-content/{{ revision.id }}/" {% if
forloop.first %} class="selected"{% endif %}>{{ revision.creation_date|
date:_("DATETIME_FORMAT") }}</a></li>
{% endfor %}
</ul>
</div>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
