Merge lp:~dholbach/developer-ubuntu-com/1525202 into lp:~developer-ubuntu-com-dev/developer-ubuntu-com/django-1.8-cms-2.3

[Daniel Holbach]

[lp:~dholbach/developer-ubuntu-com/1525202]

166. By Daniel Holbach on 2015-12-11

use parentheses around print statements, use {} for formatting

[David Callé (davidc3)]

Works great!

review: Approve

=== modified file 'developer_portal/management/commands/initdb.py'
--- developer_portal/management/commands/initdb.py	2015-11-06 16:32:19 +0000
+++ developer_portal/management/commands/initdb.py	2015-12-11 15:44:43 +0000
@@ -1,17 +1,12 @@
 #!/usr/bin/python
 
 from django.core.management.base import BaseCommand
-from optparse import make_option
-
 from django.conf import settings
 
-import subprocess
-import os
-import sys
-
-from django.contrib.auth.models import User, Group, Permission
-from django.contrib.contenttypes.models import ContentType
+from django.contrib.auth.models import User, Permission
 from cms.models.permissionmodels import PageUserGroup, GlobalPagePermission
+from zinnia.models import Category
+
 
 class Command(BaseCommand):
     help = "Make sure the Developer Portal database is set up properly."
@@ -20,24 +15,25 @@
 
         all_perms = Permission.objects.filter()
 
-        print "Creating admin user."
+        print("Creating admin user.")
         admin, created = User.objects.get_or_create(username='system')
         admin.is_staff = True
         admin.is_superuser = True
         admin.save()
 
         if hasattr(settings, 'ADMIN_GROUP') and settings.ADMIN_GROUP != "":
-            print "Configuring "+settings.ADMIN_GROUP+" group."
-            admins, created = PageUserGroup.objects.get_or_create(name=settings.ADMIN_GROUP, defaults={'created_by': admin})
+            print("Configuring {} group.".format(settings.ADMIN_GROUP))
+            admins, created = PageUserGroup.objects.get_or_create(
+                name=settings.ADMIN_GROUP, defaults={'created_by': admin})
             admins.permissions.add(*list(all_perms))
 
-            print "Configuring global permissions for group."
+            print("Configuring global permissions for group.")
             adminperms, created = GlobalPagePermission.objects.get_or_create(
                 # who:
-                group = admins,
+                group=admins,
 
                 # what:
-                defaults = {
+                defaults={
                     'can_change': True,
                     'can_add': True,
                     'can_delete': True,
@@ -51,18 +47,20 @@
             adminperms.sites.add(settings.SITE_ID)
 
         if hasattr(settings, 'EDITOR_GROUP') and settings.EDITOR_GROUP != "":
-            print "Configuring "+settings.EDITOR_GROUP+" group."
-            editors, created = PageUserGroup.objects.get_or_create(name=settings.EDITOR_GROUP, defaults={'created_by': admin})
-            page_perms = Permission.objects.filter(content_type__app_label='cms', content_type__model='page')
+            print("Configuring {} group.".format(settings.EDITOR_GROUP))
+            editors, created = PageUserGroup.objects.get_or_create(
+                name=settings.EDITOR_GROUP, defaults={'created_by': admin})
+            page_perms = Permission.objects.filter(
+                content_type__app_label='cms', content_type__model='page')
             editors.permissions.add(*list(page_perms))
 
-            print "Configuring global permissions for group."
+            print("Configuring global permissions for group.")
             editorsperms, created = GlobalPagePermission.objects.get_or_create(
                 # who:
-                group = editors,
+                group=editors,
 
                 # what:
-                defaults = {
+                defaults={
                     'can_change': True,
                     'can_add': True,
                     'can_delete': True,
@@ -74,3 +72,11 @@
                 }
             )
             editorsperms.sites.add(settings.SITE_ID)
+
+        print('Adding zinnia categories for the following: {}.'.format(
+            ', '.join([a[0] for a in settings.LANGUAGES])))
+        for lang in settings.LANGUAGES:
+            if lang[1] == 'Simplified Chinese':
+                Category.objects.get_or_create(title='Chinese', slug=lang[0])
+            else:
+                Category.objects.get_or_create(title=lang[1], slug=lang[0])