From 0ffe13524462b0a02abd9e08abc33aff06c38841 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Fri, 29 Apr 2011 12:40:29 +0200
Subject: [PATCH] fix translated flatpages paths and links

---
 telemeta/pages/default/parts/help-fr.rst        | 15 ---------------
 .../{default/parts/help-en.rst => en/help.rst}  |  0
 .../{default/parts/home-en.rst => en/home.rst}  |  0
 .../legal_notices.rst}                          |  0
 telemeta/pages/fr/help.rst                      | 17 +++++++++++++++++
 .../{default/parts/home-fr.rst => fr/home.rst}  |  0
 .../legal_notices.rst}                          |  0
 telemeta/templates/telemeta_default/base.html   |  6 +++---
 telemeta/urls.py                                |  2 +-
 telemeta/web/base.py                            |  2 +-
 10 files changed, 22 insertions(+), 20 deletions(-)
 delete mode 100644 telemeta/pages/default/parts/help-fr.rst
 rename telemeta/pages/{default/parts/help-en.rst => en/help.rst} (100%)
 rename telemeta/pages/{default/parts/home-en.rst => en/home.rst} (100%)
 rename telemeta/pages/{default/parts/legal_notices-en.rst => en/legal_notices.rst} (100%)
 create mode 100644 telemeta/pages/fr/help.rst
 rename telemeta/pages/{default/parts/home-fr.rst => fr/home.rst} (100%)
 rename telemeta/pages/{default/parts/legal_notices-fr.rst => fr/legal_notices.rst} (100%)

diff --git a/telemeta/pages/default/parts/help-fr.rst b/telemeta/pages/default/parts/help-fr.rst
deleted file mode 100644
index e6707145..00000000
--- a/telemeta/pages/default/parts/help-fr.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-========================
-Page d'aide Telemeta
-========================
-
-Plan :
-
-#. Introduction
-#. Prise en main
-#. Modèles
-#. Interface
-#. Fonctions avancées
-
-Pour plus d'informations, voir `telemeta.org <http://telemeta.org>`_
-
-
diff --git a/telemeta/pages/default/parts/help-en.rst b/telemeta/pages/en/help.rst
similarity index 100%
rename from telemeta/pages/default/parts/help-en.rst
rename to telemeta/pages/en/help.rst
diff --git a/telemeta/pages/default/parts/home-en.rst b/telemeta/pages/en/home.rst
similarity index 100%
rename from telemeta/pages/default/parts/home-en.rst
rename to telemeta/pages/en/home.rst
diff --git a/telemeta/pages/default/parts/legal_notices-en.rst b/telemeta/pages/en/legal_notices.rst
similarity index 100%
rename from telemeta/pages/default/parts/legal_notices-en.rst
rename to telemeta/pages/en/legal_notices.rst
diff --git a/telemeta/pages/fr/help.rst b/telemeta/pages/fr/help.rst
new file mode 100644
index 00000000..f6c431dc
--- /dev/null
+++ b/telemeta/pages/fr/help.rst
@@ -0,0 +1,17 @@
+========================
+Page d'aide Telemeta
+========================
+
+-------------------
+Table des matières
+-------------------
+    
+1. Introduction
+2. Prise en main
+3. Modèles
+4. Interface
+5. Fonctions avancées
+
+Pour plus d'informations, voir `telemeta.org <http://telemeta.org>`_
+
+
diff --git a/telemeta/pages/default/parts/home-fr.rst b/telemeta/pages/fr/home.rst
similarity index 100%
rename from telemeta/pages/default/parts/home-fr.rst
rename to telemeta/pages/fr/home.rst
diff --git a/telemeta/pages/default/parts/legal_notices-fr.rst b/telemeta/pages/fr/legal_notices.rst
similarity index 100%
rename from telemeta/pages/default/parts/legal_notices-fr.rst
rename to telemeta/pages/fr/legal_notices.rst
diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index 360c4835..c3b918bc 100644
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -50,11 +50,11 @@
 {{ user.username }}.
 {% endif %}
 <a href="{% url telemeta-profile-detail user.username %}">{% trans "Account" %}</a> |
-<a href="/page/parts/help-{{ LANGUAGE_CODE }}">{% trans "Help" %}</a> | 
+<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> | 
 <a href="{% url telemeta-logout %}">{% trans "Sign out" %}
 <img src="images/logout.png" style="vertical-align:middle" /></a>
 {% else %}
-<a href="/page/parts/help-{{ LANGUAGE_CODE }}">{% trans "Help" %}</a> |
+<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> |
 <a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a>
 {% endif %}
 </div>
@@ -105,7 +105,7 @@
 
  <p class="right">
   Copyright &copy; 2011 Parisson<br />
-  <a href="/page/parts/legal_notices-{{ LANGUAGE_CODE }}">{% trans "Legal notices" %}</a>
+  <a href="{% url telemeta-flatpage "legal_notices" %}">{% trans "Legal notices" %}</a>
  </p>
 {% endblock %}
 </div>
diff --git a/telemeta/urls.py b/telemeta/urls.py
index 00ab6e79..801aee3a 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -213,7 +213,7 @@ urlpatterns = patterns('',
         name="telemeta-timeside"),
 
     # Flat pages
-    url(r'^page/(?P<path>.*)$', web_view.render_flatpage, name="telemeta-flatpage"),
+    url(r'^pages/(?P<path>.*)$', web_view.render_flatpage, name="telemeta-flatpage"),
 
     # OAI-PMH Data Provider
     url(r'^oai/.*$', web_view.handle_oai_request, name="telemeta-oai"),
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 22fc65fd..77e1efe6 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -113,7 +113,7 @@ class WebView(object):
             ids = [id for id in MediaItem.objects.all().values_list('id', flat=True).order_by('?')[0:3]]
             items = MediaItem.objects.enriched().filter(pk__in=ids)
             context = RequestContext(request, {
-                        'page_content': pages.get_page_content(request, 'parts/home-'+request.LANGUAGE_CODE, ignore_slash_issue=True),
+                        'page_content': pages.get_page_content(request, 'home', ignore_slash_issue=True),
                         'items': items})
             return HttpResponse(template.render(context))
         else:
-- 
2.39.5