From 79576f25b62c8a520e603d8677c31927220f53b3 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 5 Jan 2011 16:22:52 +0100
Subject: [PATCH] Fix translation feature. Add translation support to the
 notmyidea theme.

---
 pelican/contents.py                           |  2 +-
 .../themes/notmyidea/templates/article.html   | 13 +--------
 .../notmyidea/templates/article_infos.html    | 14 ++++++++++
 pelican/themes/notmyidea/templates/index.html | 27 ++-----------------
 .../notmyidea/templates/translations.html     |  6 +++++
 pelican/utils.py                              |  1 +
 samples/content/another_super_article-fr.rst  |  6 +++++
 samples/content/another_super_article.rst     |  2 +-
 samples/content/super_article.rst             |  2 +-
 9 files changed, 33 insertions(+), 40 deletions(-)
 create mode 100644 pelican/themes/notmyidea/templates/article_infos.html
 create mode 100644 pelican/themes/notmyidea/templates/translations.html
 create mode 100644 samples/content/another_super_article-fr.rst

diff --git a/pelican/contents.py b/pelican/contents.py
index dd39fe28..b6e71b75 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -16,7 +16,7 @@ class Page(object):
 
         self.status = "published"  # default value
         for key, value in metadatas.items():
-            setattr(self, key, value)
+            setattr(self, key.lower(), value)
 
         if not hasattr(self, 'author'):
             if 'AUTHOR' in settings:
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 8b5e5bae..14fffe4d 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -7,18 +7,7 @@
         rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title
         }}</a></h1> {% include 'twitter.html' %} </header>
         <div class="entry-content">
-        <footer class="post-info">
-                <abbr class="published" title="{{ article.date.isoformat() }}">
-                    {{ article.date.strftime('%a %d %B %Y') }}
-                </abbr>
-                {% if article.author %}
-                <address class="vcard author">
-                        By <a class="url fn" href="#">{{ article.author }}</a>
-                </address>
-                {% endif %}
-                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. 
-        {% include 'taglist.html' %}
-        </footer><!-- /.post-info -->
+        {% include 'article_infos.html' %}
         {{ article.content }}
         </div><!-- /.entry-content -->
         {% if DISQUS_SITENAME %}
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
new file mode 100644
index 00000000..818b5277
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -0,0 +1,14 @@
+<footer class="post-info">
+        <abbr class="published" title="{{ article.date.isoformat() }}">
+                {{ article.date.strftime('%a %d %B %Y') }}
+        </abbr>
+
+        {% if article.author %}
+        <address class="vcard author">
+                By <a class="url fn" href="#">{{ article.author }}</a>
+        </address>
+        {% endif %}
+<p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
+{% include 'taglist.html' %}
+{% include 'translations.html' %}
+</footer><!-- /.post-info -->
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index e6e7d816..5969e6c8 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -7,19 +7,7 @@
         <aside id="featured" class="body"><article>
                 <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url
                 }}">{{ article.title }}</a></h1> 
-                <footer class="post-info">
-                        <abbr class="published" title="{{ article.date.isoformat() }}">
-                                {{ article.date.strftime('%a %d %B %Y') }}
-                        </abbr>
-
-                        {% if article.author %}
-                        <address class="vcard author">
-                                By <a class="url fn" href="#">{{ article.author }}</a>
-                        </address>
-                        {% endif %}
-                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
-                {% include 'taglist.html' %}
-                </footer><!-- /.post-info -->
+                {% include 'article_infos.html' %}
                 {{ article.content }}
                 {% include 'comments.html' %}
                 </article>
@@ -37,18 +25,7 @@
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
-                        <abbr class="published" title="{{ article.date.isoformat() }}">
-                                {{ article.date.strftime('%a %d %B %Y') }}
-                        </abbr>
-
-                        <address class="vcard author">
-                                By <a class="url fn" href="#">{{ article.author }}</a>
-                        </address>
-                        <p> In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
-                        {% include 'taglist.html' %}
-                    <p>{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">pdf</a>{% endif %}</p>
-                </footer><!-- /.post-info -->
+                {% include 'article_infos.html' %}
                 {{ article.summary }}
                 <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
                 {% include 'comments.html' %}
diff --git a/pelican/themes/notmyidea/templates/translations.html b/pelican/themes/notmyidea/templates/translations.html
new file mode 100644
index 00000000..0079883e
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/translations.html
@@ -0,0 +1,6 @@
+{% if article.translations %}
+Translations: 
+    {% for translation in article.translations %}
+        <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
+    {% endfor %}
+{% endif %}
diff --git a/pelican/utils.py b/pelican/utils.py
index fe7ab009..b15d8642 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -159,6 +159,7 @@ def process_translations(content_list):
         Also, for each content_list item, it
         sets attribute 'translations'
     """
+    content_list.sort(key=attrgetter('slug'))
     grouped_by_slugs = groupby(content_list, attrgetter('slug'))
     index = []
     translations = []
diff --git a/samples/content/another_super_article-fr.rst b/samples/content/another_super_article-fr.rst
new file mode 100644
index 00000000..f0e63196
--- /dev/null
+++ b/samples/content/another_super_article-fr.rst
@@ -0,0 +1,6 @@
+Oh yeah !
+#########
+
+:lang: fr
+
+Et voila du contenu en français
diff --git a/samples/content/another_super_article.rst b/samples/content/another_super_article.rst
index 1c1c6d9c..84cdc401 100644
--- a/samples/content/another_super_article.rst
+++ b/samples/content/another_super_article.rst
@@ -1,5 +1,5 @@
 Oh yeah !
-#########################
+#########
 
 :tags: oh, bar, yeah
 :date: 2010-10-20 10:14
diff --git a/samples/content/super_article.rst b/samples/content/super_article.rst
index 8096de95..3b9f9adc 100644
--- a/samples/content/super_article.rst
+++ b/samples/content/super_article.rst
@@ -25,7 +25,7 @@ And here comes the cool stuff_.
 
 .. code-block:: python
 
-   >>> from ipdb import set trace
+   >>> from ipdb import set_trace
    >>> set_trace()
 
 → And now try with some utf8 hell: ééé