Author: leidel
Date: Mon Dec 8 03:01:02 2008
New Revision: 270
Added:
trunk/pages/locale/
trunk/pages/locale/de/
trunk/pages/locale/de/LC_MESSAGES/
trunk/pages/locale/de/LC_MESSAGES/django.mo (contents, props changed)
trunk/pages/locale/de/LC_MESSAGES/django.po
Modified:
trunk/pages/admin/__init__.py
trunk/pages/admin/forms.py
trunk/pages/models.py
trunk/pages/templates/admin/pages/page/change_form.html
trunk/pages/templates/admin/pages/page/change_list.html
Log:
Added some more modifications for smoother i18n and a German translation
Modified: trunk/pages/admin/__init__.py
==============================================================================
--- trunk/pages/admin/__init__.py (original)
+++ trunk/pages/admin/__init__.py Mon Dec 8 03:01:02 2008
@@ -181,6 +181,7 @@
initial_title = obj.title(language=language, fallback=False)
form.base_fields['slug'].initial = initial_slug
form.base_fields['title'].initial = initial_title
+ form.base_fields['slug'].label = _('slug')
template = get_template_from_request(request, obj)
if settings.PAGE_TEMPLATES:
Modified: trunk/pages/admin/forms.py
==============================================================================
--- trunk/pages/admin/forms.py (original)
+++ trunk/pages/admin/forms.py Mon Dec 8 03:01:02 2008
@@ -6,15 +6,27 @@
from pages.models import Page, Content, tagging
class PageForm(forms.ModelForm):
- title = forms.CharField(widget=forms.TextInput(),
- help_text=_('The default title'))
- slug = forms.CharField(widget=forms.TextInput(),
- help_text=_('The part of the title that is used in permalinks'))
- language = forms.ChoiceField(choices=settings.PAGE_LANGUAGES,
- help_text=_('The current language of the content fields.'))
- template = forms.ChoiceField(choices=settings.PAGE_TEMPLATES,
required=False,
- help_text=_('The template used to render the content.'))
-
+ title = forms.CharField(
+ label=_('title'),
+ widget=forms.TextInput(),
+ help_text=_('The default title')
+ )
+ slug = forms.CharField(
+ label=_('slug'),
+ widget=forms.TextInput(),
+ help_text=_('The part of the title that is used in permalinks')
+ )
+ language = forms.ChoiceField(
+ label=_('language'),
+ choices=settings.PAGE_LANGUAGES,
+ help_text=_('The current language of the content fields.'),
+ )
+ template = forms.ChoiceField(
+ required=False,
+ label=_('template'),
+ choices=settings.PAGE_TEMPLATES,
+ help_text=_('The template used to render the content.')
+ )
if tagging:
from tagging.forms import TagField
from pages.admin.widgets import AutoCompleteTagInput
Added: trunk/pages/locale/de/LC_MESSAGES/django.mo
==============================================================================
Binary file. No diff available.
Added: trunk/pages/locale/de/LC_MESSAGES/django.po
==============================================================================
--- (empty file)
+++ trunk/pages/locale/de/LC_MESSAGES/django.po Mon Dec 8 03:01:02 2008
@@ -0,0 +1,252 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-12-08 11:41+0100\n"
+"PO-Revision-Date: 2008-12-07 16:24+0100\n"
+"Last-Translator: Jannis Leidel <[EMAIL PROTECTED]>\n"
+"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: models.py:35
+msgid "Draft"
+msgstr "Entwurf"
+
+#: models.py:36
+msgid "Published"
+msgstr "Veröffentlicht"
+
+#: models.py:38
+msgid "author"
+msgstr "Autor"
+
+#: models.py:39
+msgid "parent"
+msgstr "Eltern"
+
+#: models.py:40 models.py:208
+msgid "creation date"
+msgstr "Erstellungsdatum"
+
+#: models.py:41
+msgid "publication date"
+msgstr "Veröffentlichungsdatum"
+
+#: models.py:41
+msgid ""
+"When the page should go live. Status must be \"Published\" for page to
go "
+"live."
+msgstr ""
+"Gibt an, wann die Seite live geschaltet ist. Status muss
\"Veröffentlicht\" "
+"sein, damit sie öffentlich erscheint."
+
+#: models.py:42
+msgid "publication end date"
+msgstr "Veröffentlichungsende"
+
+#: models.py:42
+msgid "When to expire the page. Leave empty to never expire."
+msgstr ""
+"Gibt an, wann die Seite verfallen soll. Leer lassen, um nicht zu
verfallen."
+
+#: models.py:44
+msgid "status"
+msgstr "Status"
+
+#: models.py:45 admin/forms.py:26
+#: templates/admin/pages/page/change_list_table.html:9
+msgid "template"
+msgstr "Template"
+
+#: models.py:46
+msgid "The site(s) the page is accessible at."
+msgstr "Die Webseiten, auf denen diese Seite erreichbar ist."
+
+#: models.py:46
+msgid "sites"
+msgstr "Webseiten"
+
+#: models.py:55 models.py:188 models.py:206 admin/__init__.py:268
+msgid "page"
+msgstr "Seite"
+
+#: models.py:56
+msgid "pages"
+msgstr "Seiten"
+
+#: models.py:184
+msgid "All"
+msgstr "Alle"
+
+#: models.py:185
+msgid "This page only"
+msgstr "Nur diese Seite"
+
+#: models.py:186
+msgid "This page and all childrens"
+msgstr "Diese Seite und all ihre Abkömmlinge"
+
+#: models.py:189
+msgid "user"
+msgstr "Benutzer"
+
+#: models.py:190 models.py:205
+msgid "type"
+msgstr "Typ"
+
+#: models.py:195
+msgid "page permission"
+msgstr "Berechtigung"
+
+#: models.py:196
+msgid "page permissions"
+msgstr "Berechtigungen"
+
+#: models.py:203 admin/forms.py:20
+msgid "language"
+msgstr "Sprache"
+
+#: models.py:204
+msgid "body"
+msgstr "Hauptteil"
+
+#: models.py:212 admin/__init__.py:146 admin/__init__.py:147
+msgid "content"
+msgstr "Inhalt"
+
+#: models.py:213
+msgid "contents"
+msgstr "Inhalte"
+
+#: admin/__init__.py:47
+msgid "General"
+msgstr "Allgemein"
+
+#: admin/__init__.py:51
+msgid "Options"
+msgstr "Optionen"
+
+#: admin/__init__.py:54
+msgid "Note: This page reloads if you change the selection"
+msgstr "Achtung: Diese Seite wird neu geladen, sobald Sie die Auswahl
ändern"
+
+#: admin/__init__.py:184 admin/forms.py:15
+msgid "slug"
+msgstr "Kürzel"
+
+#: admin/__init__.py:189
+msgid "Default template"
+msgstr "Standard-Template"
+
+#: admin/__init__.py:196
+msgid "Note: This field is evaluated as template code."
+msgstr "Achtung: Dieses Feld wird als Template-Code evaluaiert."
+
+#: admin/__init__.py:290
+msgid "Page could not been moved."
+msgstr "Seite konnte nicht verschoben werden."
+
+#: admin/forms.py:10 templates/admin/pages/page/change_list_table.html:5
+msgid "title"
+msgstr "Titel"
+
+#: admin/forms.py:12
+msgid "The default title"
+msgstr "Standard-Titel"
+
+#: admin/forms.py:17
+msgid "The part of the title that is used in permalinks"
+msgstr "Teil des Titels, der in Permalinks benutzt wird"
+
+#: admin/forms.py:22
+msgid "The current language of the content fields."
+msgstr "Gegenwärtige Sprache der Inhaltsfelder."
+
+#: admin/forms.py:28
+msgid "The template used to render the content."
+msgstr "Template das zum Rendern des Inhalts verwendet wird."
+
+#: admin/forms.py:43 admin/forms.py:45
+msgid "Another page with this slug already exists"
+msgstr "Es existiert bereits eine Seite mit diesem Kürzel."
+
+#: templates/admin/pages/page/change_form.html:3
+msgid "Change a page"
+msgstr "Seite ändern"
+
+#: templates/admin/pages/page/change_form.html:16
+msgid "View on site"
+msgstr "Seite anzeigen"
+
+#: templates/admin/pages/page/change_form.html:28
+msgid "Translation helper"
+msgstr "Übersetzungshilfen"
+
+#: templates/admin/pages/page/change_form.html:30
+msgid "Language:"
+msgstr "Sprache:"
+
+#: templates/admin/pages/page/change_list.html:3
+msgid "List of pages"
+msgstr "Seitenliste"
+
+#: templates/admin/pages/page/change_list.html:8
+msgid "Home"
+msgstr "Start"
+
+#: templates/admin/pages/page/change_list.html:27
+#, python-format
+msgid "Add %(name)s"
+msgstr "%(name)s hinzufügen"
+
+#: templates/admin/pages/page/change_list_table.html:6
+msgid "quick actions"
+msgstr "Schnellaktionen"
+
+#: templates/admin/pages/page/change_list_table.html:7
+msgid "translations"
+msgstr "Übersetzungen"
+
+#: templates/admin/pages/page/change_list_table.html:8
+msgid "published"
+msgstr "Veröffentlicht"
+
+#: templates/admin/pages/page/change_list_table.html:10
+msgid "creator"
+msgstr "Autor"
+
+#: templates/admin/pages/page/menu.html:18
+msgid "move"
+msgstr "Verschieben"
+
+#: templates/admin/pages/page/menu.html:19
+msgid "add"
+msgstr "Hinzufügen"
+
+#: templates/admin/pages/page/menu.html:20
+msgid "view"
+msgstr "Anzeigen"
+
+#: templates/admin/pages/page/menu.html:21
+msgid "delete"
+msgstr "Löschen"
+
+#: templates/pages/revisions.html:4
+msgid "Revisions"
+msgstr "Revisionen"
+
+#: templates/pages/revisions.html:8
+msgid "DATETIME_FORMAT"
+msgstr "j. N Y, H:i"
+
+#: templates/pages/traduction_helper.html:4
+msgid "Wanted language has not been translated yet."
+msgstr "Die gewünschte Sprache wurde noch nicht übersetzt."
+
+#: templatetags/pages_tags.py:14
+#, python-format
+msgid "[Placeholder %(name)s had syntax error: %(error)s]"
+msgstr "[Placeholder %(name)s hat einen Syntaxerror: %(error)s]"
Modified: trunk/pages/models.py
==============================================================================
--- trunk/pages/models.py (original)
+++ trunk/pages/models.py Mon Dec 8 03:01:02 2008
@@ -189,9 +189,13 @@
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()
-
+
+ class Meta:
+ verbose_name = _('page permission')
+ verbose_name_plural = _('page permissions')
+
def __unicode__(self):
return "%s :: %s" % (self.user,
unicode(PagePermission.TYPES[self.type][1]))
@@ -204,6 +208,10 @@
creation_date = models.DateTimeField(_('creation date'),
editable=False, default=datetime.now)
objects = ContentManager()
+
+ class Meta:
+ verbose_name = _('content')
+ verbose_name_plural = _('contents')
def __unicode__(self):
return "%s :: %s" % (self.page.slug(), self.body[0:15])
Modified: trunk/pages/templates/admin/pages/page/change_form.html
==============================================================================
--- trunk/pages/templates/admin/pages/page/change_form.html (original)
+++ trunk/pages/templates/admin/pages/page/change_form.html Mon Dec 8
03:01:02 2008
@@ -6,8 +6,6 @@
<script type="text/javascript" src="{%
admin_media_prefix %}js/urlify.js"></script>
{% endblock %}
-{% block content_title %}<h1>{% if add %}{% trans "Add" %}{% else %}{%
trans "Change" %}{% endif %} {% trans "page" %}</h1>{% endblock %}
-
{% block content %}
<!-- Content -->
<div id="content-main">
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 Mon Dec 8
03:01:02 2008
@@ -20,13 +20,11 @@
{% endblock %}
-{% block content_title %}<h1>{% trans "Select" %} {{ name }} {% trans "to
change" %}</h1>{% endblock %}
-
{% block content %}
<div id="content-main">
{% if has_add_permission %}
-<ul class="object-tools"><li><a href="add/" class="addlink">{%
trans "Add" %} {{ name }}</a></li></ul>
+<ul class="object-tools"><li><a href="add/" class="addlink">{%
blocktrans %}Add {{ name }}{% endblocktrans %}</a></li></ul>
{% endif %}
<div class="module" id="changelist">
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
