Commits

Anonymous committed bf08c26

some fixes (and tried to add an archive widget)

Comments (0)

Files changed (8)

locale/de/LC_MESSAGES/django.mo

Binary file modified.

locale/de/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: limited 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-05 14:38+0200\n"
-"PO-Revision-Date: 2010-05-05 14:39+0100\n"
+"POT-Creation-Date: 2010-05-06 15:31+0200\n"
+"PO-Revision-Date: 2010-05-06 15:35+0200\n"
 "Last-Translator: Keba <info@kebay.org>\n"
 "Language-Team: Keba <info@kebay.org>\n"
 "MIME-Version: 1.0\n"
 
 #: responses.py:35
 msgid "You're comment has been saved successfully. You're being redirected..."
-msgstr "Dein Kommentar wurde erfolgreich gespeichert. Du wirst weitergeleitet..."
+msgstr ""
+"Dein Kommentar wurde erfolgreich gespeichert. Du wirst weitergeleitet..."
 
 #: responses.py:36
 msgid "In case you're not being redirected, please click"
 #: pages/views.py:143
 #, python-format
 msgid "The the word '%s' is blacklisted. Please avoid it in your comments."
-msgstr "Das Word '%s' steht auf der schwarzen Liste. Bitte vermeide es in deienn Kommentaren zu nutzen."
+msgstr ""
+"Das Word '%s' steht auf der schwarzen Liste. Bitte vermeide es in deienn "
+"Kommentaren zu nutzen."
 
 #: pages/views.py:150
 msgid "Please fill out all fields!"
 msgstr "Fülle bitte alle Felder aus!"
 
-#: pages/models/__init__.py:30
+#: pages/models/__init__.py:34
 msgid "Title"
 msgstr "Titel"
 
-#: pages/models/__init__.py:31
+#: pages/models/__init__.py:35
 msgid "Text"
 msgstr "Text"
 
-#: pages/models/__init__.py:32
-#: pages/models/__init__.py:92
+#: pages/models/__init__.py:36 pages/models/__init__.py:92
 msgid "Slug"
 msgstr "Slug"
 
-#: pages/models/__init__.py:34
-#: pages/models/__init__.py:91
+#: pages/models/__init__.py:38 pages/models/__init__.py:91
 #: pages/models/__init__.py:96
 msgid "Tag"
 msgstr "Tag"
 
-#: pages/models/__init__.py:35
+#: pages/models/__init__.py:39
 msgid "Language"
 msgstr "Sprache"
 
-#: pages/models/__init__.py:37
+#: pages/models/__init__.py:41
 msgid "Other languages"
 msgstr "Andere Sprachen"
 
-#: pages/models/__init__.py:38
+#: pages/models/__init__.py:42
 msgid "(comma separated post ids)"
 msgstr "(durch Kommata getrennte Post-IDs)"
 
-#: pages/models/__init__.py:40
+#: pages/models/__init__.py:44
 msgid "Is a blog entry"
 msgstr "Ist ein Blog Eintrag"
 
-#: pages/models/__init__.py:45
+#: pages/models/__init__.py:49
 msgid "Is a popular entry"
 msgstr "Ist ein populärer Beitrag"
 
-#: pages/models/__init__.py:46
-#: pages/models/__init__.py:75
+#: pages/models/__init__.py:50 pages/models/__init__.py:75
 msgid "Is public (published)"
 msgstr "Ist öffentlicht (veröffentlicht)"
 
-#: pages/models/__init__.py:47
+#: pages/models/__init__.py:51
 msgid "Showed in top navigation"
 msgstr "In der Navigationsleiste angezeigt"
 
-#: pages/models/__init__.py:54
-#: pages/templates/pagination.html:15
+#: pages/models/__init__.py:58 pages/templates/pagination.html:15
 msgid "Page"
 msgstr "Seite"
 
-#: pages/models/__init__.py:55
+#: pages/models/__init__.py:59
 msgid "Pages"
 msgstr "Seiten"
 
 msgid "Name"
 msgstr "Name"
 
-#: pages/models/__init__.py:74
-#: pages/models/__init__.py:80
-#: pages/templates/blog.html:84
+#: pages/models/__init__.py:74 pages/models/__init__.py:80
+#: pages/templates/blog.html:89
 msgid "Comment"
 msgstr "Kommentar"
 
 msgid "Creation time"
 msgstr "Erstellt am"
 
-#: pages/models/__init__.py:81
-#: pages/templates/blog.html:56
+#: pages/models/__init__.py:81 pages/templates/blog.html:61
 msgid "Comments"
 msgstr "Kommentare"
 
 msgid "Comment %(#)s by \"%(name)s\")"
 msgstr "Kommentar %(#)s von \"%(name)s\")"
 
-#: pages/models/__init__.py:97
-#: templates/widgets/tag_widget.html:2
+#: pages/models/__init__.py:97 templates/widgets/tag_widget.html:2
 msgid "Tags"
 msgstr "Tags"
 
-#: pages/models/__init__.py:106
-#: pages/models/__init__.py:118
+#: pages/models/__init__.py:106 pages/models/__init__.py:118
 msgid "Picture"
 msgstr "Bild"
 
 msgid "Pictures"
 msgstr "Bilder"
 
-#: pages/models/__init__.py:122
-#: pages/models/__init__.py:126
+#: pages/models/__init__.py:122 pages/models/__init__.py:126
 msgid "File"
 msgstr "Datei"
 
 msgid "Blog archive for"
 msgstr "Blog-Archiv für"
 
-#: pages/templates/archive.html:13
-#: pages/templates/blog.html:24
+#: pages/templates/archive.html:13 pages/templates/blog.html:24
 #: pages/templates/page.html:28
 msgid "posted"
 msgstr "veröffentlicht"
 
-#: pages/templates/archive.html:22
-#: pages/templates/archive_overview.html:31
+#: pages/templates/archive.html:22 pages/templates/archive_overview.html:31
 msgid "Archive overview"
 msgstr "Archiv-Überblick"
 
-#: pages/templates/archive.html:28
-#: pages/templates/archive.html.py:36
+#: pages/templates/archive.html:28 pages/templates/archive.html.py:36
+#: pages/templates/archive_overview.html:14
 #: pages/templates/archive_overview.html:19
+#: templates/widgets/archive_widget.html:8
+#: templates/widgets/archive_widget.html:13
 msgid "Archive for"
 msgstr "Archiv für"
 
 msgstr "Blog-Archiv: Überblick"
 
 #: pages/templates/archive_overview.html:10
+#: templates/widgets/archive_widget.html:4
 msgid "Blog archive"
 msgstr "Blog-Archiv"
 
-#: pages/templates/archive_overview.html:14
 #: pages/templates/archive_overview.html:31
+#: templates/widgets/navigation_widget.html:7
 msgid "Archive"
 msgstr "Archiv"
 
 msgid "Posts tagged with"
 msgstr "Beiträge getaggt mit"
 
-#: pages/templates/blog.html:58
+#: pages/templates/blog.html:52
+msgid "last edited:"
+msgstr "zuletzt geändert:"
+
+#: pages/templates/blog.html:63
 msgid "No comments"
 msgstr "Keine Kommentare"
 
-#: pages/templates/blog.html:63
+#: pages/templates/blog.html:68
 msgid "Write a comment"
 msgstr "Schreibe einen Kommentar"
 
-#: pages/templates/blog.html:69
+#: pages/templates/blog.html:74
 msgid "Name:"
 msgstr "Name:"
 
-#: pages/templates/blog.html:72
+#: pages/templates/blog.html:77
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: pages/templates/blog.html:74
+#: pages/templates/blog.html:79
 msgid "bold"
 msgstr "fett"
 
-#: pages/templates/blog.html:74
+#: pages/templates/blog.html:79
 msgid "italic"
 msgstr "kursiv"
 
-#: pages/templates/blog.html:74
+#: pages/templates/blog.html:79
 msgid "Link to"
 msgstr "Link zu"
 
-#: pages/templates/blog.html:75
+#: pages/templates/blog.html:80
 msgid "Quote"
 msgstr "Zitat"
 
-#: pages/templates/blog.html:78
+#: pages/templates/blog.html:83
 msgid "Publish"
 msgstr "Veröffentlichen"
 
 msgid "previous page"
 msgstr "vorherige Seite"
 
-#: pages/templates/pagination.html:5
-#: pages/templates/pagination.html.py:7
+#: pages/templates/pagination.html:5 pages/templates/pagination.html.py:7
 msgid "previous"
 msgstr "zurück"
 
 msgid "next page"
 msgstr "nächste Seite"
 
-#: pages/templates/pagination.html:23
-#: pages/templates/pagination.html.py:25
+#: pages/templates/pagination.html:23 pages/templates/pagination.html.py:25
 msgid "next"
 msgstr "weiter"
 
 #: pages/templates/search.html:11
 #, python-format
 msgid " No posts matching %(keywords|join:\", \")s found."
-msgstr "Kein Beitrag gefunden, der die Kriterien %(keywords|join:\", \")s erfüllt."
+msgstr ""
+"Kein Beitrag gefunden, der die Kriterien %(keywords|join:\", \")s erfüllt."
 
 #: pages/templatetags/filters.py:78
 msgid "zero"
-msgstr "null"
+msgstr "keine"
 
 #: pages/templatetags/filters.py:78
 msgid "one"
 msgid "search"
 msgstr "suchen"
 
+#: templates/widgets/tag_widget.html:7
+msgid "posts"
+msgstr "Beiträge"

pages/models/__init__.py

         return self.title
 
     class Meta:
-        ordering = ['-edit_time']
+        ordering = ['-creation_time']
         verbose_name = _('Page')
         verbose_name_plural = _('Pages')
 
         return urlresolve('single_post' if self.isblog else 'single_page',
                           kwargs={'single' : self.url})
 
-    @property
-    def time(self):
-        return self.edit_time or self.creation_time
-
 class Comment(models.Model):
     page = models.ForeignKey('Page')
     # parent page that owns this child
     slug = models.SlugField(_('Slug'), unique=True)
 
     class Meta:
-        ordering = ['-name']
+        ordering = ['name']
         verbose_name = _('Tag')
         verbose_name_plural = _('Tags')
 

pages/templates/archive_overview.html

     {% for year in years %}
         <ul class="archive">
             <li>
-                <a href="{% url archive_yearly year %}" title="{% trans 'Archive' for %} {{ year }}">{{ year }}</a>
+                <a href="{% url archive_yearly year %}" title="{% trans 'Archive for' %} {{ year }}">{{ year }}</a>
                 <ul>
                     {% for month, postcount in year.months %}
                         <li>

pages/templates/blog.html

                 {% if MULTI_USER %}
                     by {{ item.user.name }}
                 {% endif %}
-                {{ item.time|humanize }})
+                {{ item.creation_time|humanize }})
 
                 {% if item.tags.count %}
                     | {% trans "tagged with" %}
             <div class="content">
                 {{ item.parsed }}
             </div>
+            {% if item.edit_time %}
+                <div class="post_meta">
+                    {% trans "last edited:" %} {{ item.creation_time|humanize }}
+                </div>
+            {% endif %}
         {% endfor %}
 
         {% if issingle %}
 #               'include' list or because of automatical inclusion) but not
 #               listed here will be added unsorted.
 WIDGET_CONFIGURATION = {
-    'exclude' : None,
+    'exclude' : 'archive_widget.html', ## does not work yet.
     'include' : None,
     'order' : ('navigation_widget.html', 'rss_widget.html',
                'tag_widget.html', 'search_widget.html')

templates/widgets/navigation_widget.html

 <ul id="navigation_list">
     {% block context_navigation %}
         <li><a href="{% url blog %}" title="{% trans 'New/all posts' %}">{% trans "New/all posts" %}</a></li>
-        <li><a href="{% url archive %}" title="Archive">Archive</a></li>
+        <li><a href="{% url archive %}" title="{% trans 'Archive' %}">Archive</a></li>
     {% endblock %}
     {% block navigation_widget %}{% endblock %}
 </ul>

templates/widgets/tag_widget.html

 <h3>{% trans "Tags" %}</h3>
 <ul>
 {% for tag in tags %}
-    <li><a href="{% url by_tag tag.slug %}" title="{{ tag.name}}">
-        {{ tag.name }} ({{ tag.page_count }} posts)
-    </a></li>
+    {% if tag.page_count %}
+        <li><a href="{% url by_tag tag.slug %}" title="{{ tag.name}}">
+            {{ tag.name }} ({{ tag.page_count }} {% trans "posts" %})
+        </a></li>
+    {% endif %}
 {% endfor %}
 </ul>