Merge lp:~dholbach/developer-ubuntu-com/translations-dashboard into lp:~davidc3/developer-ubuntu-com/translations-dashboard

[Daniel Holbach]

=== modified file 'locale/de.po'
--- locale/de.po	2015-05-20 05:32:03 +0000
+++ locale/de.po	2015-06-26 09:52:30 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-05-20 05:32+0000\n"
-"X-Generator: Launchpad (build 17508)\n"
+"X-Launchpad-Export-Date: 2015-06-26 05:05+0000\n"
+"X-Generator: Launchpad (build 17578)\n"
 
 #: developer_portal/cms_plugins.py:10
 msgid "Raw HTML"

=== modified file 'locale/developer_portal.pot'
--- locale/developer_portal.pot	2015-05-11 20:00:59 +0000
+++ locale/developer_portal.pot	2015-06-26 09:52:30 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-24 09:17+0000\n"
+"POT-Creation-Date: 2015-06-26 07:59+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -186,6 +186,10 @@
 msgid "API Docs:"
 msgstr ""
 
+#: templates/translations_dashboard.html:6
+msgid "Translations dashboard"
+msgstr ""
+
 #: templates/webapp.html:6
 msgid "Create your Webapp package"
 msgstr ""

=== modified file 'locale/en_GB.po'
--- locale/en_GB.po	2015-05-20 05:32:03 +0000
+++ locale/en_GB.po	2015-06-26 09:52:30 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-05-20 05:32+0000\n"
-"X-Generator: Launchpad (build 17508)\n"
+"X-Launchpad-Export-Date: 2015-06-26 05:05+0000\n"
+"X-Generator: Launchpad (build 17578)\n"
 
 #: developer_portal/cms_plugins.py:10
 msgid "Raw HTML"

=== modified file 'locale/es.po'
--- locale/es.po	2015-05-20 05:32:03 +0000
+++ locale/es.po	2015-06-26 09:52:30 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-05-20 05:32+0000\n"
-"X-Generator: Launchpad (build 17508)\n"
+"X-Launchpad-Export-Date: 2015-06-26 05:05+0000\n"
+"X-Generator: Launchpad (build 17578)\n"
 
 #: developer_portal/cms_plugins.py:10
 msgid "Raw HTML"

=== modified file 'locale/zh_CN.po'
--- locale/zh_CN.po	2015-05-20 05:32:03 +0000
+++ locale/zh_CN.po	2015-06-26 09:52:30 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-05-20 05:32+0000\n"
-"X-Generator: Launchpad (build 17508)\n"
+"X-Launchpad-Export-Date: 2015-06-26 05:05+0000\n"
+"X-Generator: Launchpad (build 17578)\n"
 
 #: developer_portal/cms_plugins.py:10
 msgid "Raw HTML"

=== modified file 'translations_dashboard/views.py'
--- translations_dashboard/views.py	2015-06-25 21:53:23 +0000
+++ translations_dashboard/views.py	2015-06-26 09:52:30 +0000
@@ -2,28 +2,13 @@
 from django.template import RequestContext
 from cms.models.pagemodel import Page
 import json
-from django.db import connection
-
-
-def get_plugin_changes():
-    cursor = connection.cursor()
-    cursor.execute("SELECT * FROM `cms_cmsplugin` ORDER BY `changed_date` DESC")
-    row = cursor.fetchall()
-    return row
+
+from cms.models import CMSPlugin
+from reversion.models import Version
 
 
 def get_revision(plugin_id):
-    cursor = connection.cursor()
-    cursor.execute("SELECT * FROM `reversion_version` WHERE `object_id_int` = %s ORDER BY `id` DESC limit 1", [plugin_id])
-    row = cursor.fetchone()
-    return row
-
-
-def get_page_for_placeholder(ph):
-    cursor = connection.cursor()
-    cursor.execute("SELECT `page_id` FROM `cms_page_placeholders` WHERE `placeholder_id` = %s", [ph])
-    row = cursor.fetchone()
-    return row
+    return Version.objects.filter(object_id_int=plugin_id).order_by('-id')
 
 
 def parse_time(time):
@@ -32,17 +17,15 @@
 
 
 class AllPages():
-    all_pages = Page.objects.filter()
     dashboard_data = []
     known_paths = []
-    for data in get_plugin_changes():
-        rev = get_revision(data[0])
+    for plugin_change in CMSPlugin.objects.order_by('-changed_date'):
+        rev = get_revision(plugin_change.id)
         if rev:
-            content = json.loads(rev[7])
-            date = data[7]
-            lang = data[4].replace('-', '_')
-            page_id = get_page_for_placeholder(data[1])[0]
-            page = Page.objects.filter(id=page_id)[0]
+            content = json.loads(rev[0].serialized_data)
+            date = plugin_change.changed_date
+            lang = plugin_change.language.replace('-', '_')
+            page = plugin_change.placeholder.page
             path = page.get_path()
             if path not in known_paths:
                 known_paths.append(path)