Reinstate originalish directory structure

Author: inglesp

pythonineducation/data/page/en-home.md content/en/home.mdpythonineducation/data/page/en-home.md renamed to content/en/home.md

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-16 22:55
+# Generated by Django 1.9.7 on 2016-07-28 18:06
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -21,6 +21,8 @@ class Migration(migrations.Migration):
                 ('content', models.TextField()),
                 ('content_format', models.CharField(max_length=255)),
                 ('title', models.CharField(max_length=255)),
+                ('slug', models.CharField(max_length=255)),
+                ('language', models.CharField(max_length=255)),
             ],
             options={
                 'abstract': False,

…thonineducation/data/page/en-microbit.md content/en/microbit.mdpythonineducation/data/page/en-microbit.md renamed to content/en/microbit.md pythonineducation/data/page/en-microbit.md renamed to content/en/microbit.md

@@ -4,9 +4,12 @@
 
 class Page(ModelWithContent):
     title = models.CharField(max_length=255)
+    slug = models.CharField(max_length=255)
+    language = models.CharField(max_length=255)
 
-    def language(self):
-        return self.key.split('-', 1)[0]
+    dump_path_template =  'content/[language]/[slug].[content_format]'
 
-    def slug(self):
-        return self.key.split('-', 1)[1]
+    key_field_names = ['language', 'slug']
+
+    def __str__(self):
+        return '{}/{}'.format(self.language, self.slug)

…ineducation/data/page/en-raspberry-pi.md content/en/raspberry-pi.mdpythonineducation/data/page/en-raspberry-pi.md renamed to content/en/raspberry-pi.md pythonineducation/data/page/en-raspberry-pi.md renamed to content/en/raspberry-pi.md

@@ -4,10 +4,9 @@
 
 
 def page_view(request, language='en', slug='home'):
-    key = '{}-{}'.format(language, slug)
-    page = get_object_or_404(Page, key=key)
+    page = get_object_or_404(Page, language=language, slug=slug)
 
-    assert page.content_format == '.md', 'Markdown is only supported format'
+    assert page.content_format == 'md', 'Markdown is only supported format'
 
     template = 'pythonineducation/page_{}.html'.format(language)