Small cleanup of migrations, added roles for best answers

misago/acl/migrations/0003_default_roles.py

@@ -2,7 +2,9 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-from django.utils.translation import ugettext as _
+
+
+_ = lambda s: s
 
 
 def create_default_roles(apps, schema_editor):

misago/categories/migrations/0002_default_categories.py

@@ -2,11 +2,13 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-from django.utils.translation import ugettext as _
 
 from misago.core.utils import slugify
 
 
+_ = lambda s: s
+
+
 def create_default_categories_tree(apps, schema_editor):
     Category = apps.get_model('misago_categories', 'Category')
 

misago/categories/migrations/0003_categories_roles.py

@@ -4,14 +4,14 @@ from __future__ import unicode_literals
 from django.db import migrations
 
 
-_ = lambda x: x
+_ = lambda s: s
 
 
 def create_default_categories_roles(apps, schema_editor):
     CategoryRole = apps.get_model('misago_categories', 'CategoryRole')
 
     CategoryRole.objects.create(
-        name=_('See only'),
+        name=_("See only"),
         permissions={
             # categories perms
             'misago.categories.permissions': {
@@ -22,7 +22,7 @@ def create_default_categories_roles(apps, schema_editor):
     )
 
     read_only = CategoryRole.objects.create(
-        name=_('Read only'),
+        name=_("Read only"),
         permissions={
             # categories perms
             'misago.categories.permissions': {
@@ -41,7 +41,7 @@ def create_default_categories_roles(apps, schema_editor):
     )
 
     CategoryRole.objects.create(
-        name=_('Reply to threads'),
+        name=_("Reply to threads"),
         permissions={
             # categories perms
             'misago.categories.permissions': {
@@ -63,7 +63,7 @@ def create_default_categories_roles(apps, schema_editor):
     )
 
     standard = CategoryRole.objects.create(
-        name=_('Start and reply threads'),
+        name=_("Start and reply threads"),
         permissions={
             # categories perms
             'misago.categories.permissions': {
@@ -87,7 +87,7 @@ def create_default_categories_roles(apps, schema_editor):
     )
 
     CategoryRole.objects.create(
-        name=_('Start and reply threads, make polls'),
+        name=_("Start and reply threads, make polls"),
         permissions={
             # categories perms
             'misago.categories.permissions': {
@@ -111,7 +111,7 @@ def create_default_categories_roles(apps, schema_editor):
     )
 
     moderator = CategoryRole.objects.create(
-        name=_('Moderator'),
+        name=_("Moderator"),
         permissions={
             # categories perms
             'misago.categories.permissions': {
@@ -161,7 +161,7 @@ def create_default_categories_roles(apps, schema_editor):
     category = Category.objects.get(tree_id=1, level=1)
 
     RoleCategoryACL.objects.create(
-        role=Role.objects.get(name=_('Moderator')), category=category, category_role=moderator
+        role=Role.objects.get(name=_("Moderator")), category=category, category_role=moderator
     )
 
     RoleCategoryACL.objects.create(

misago/categories/migrations/0006_moderation_queue_roles.py

@@ -2,14 +2,16 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-from django.utils.translation import ugettext as _
+
+
+_ = lambda s: s
 
 
 def create_default_categories_roles(apps, schema_editor):
     CategoryRole = apps.get_model('misago_categories', 'CategoryRole')
 
     CategoryRole.objects.create(
-        name=_('In moderation queue'),
+        name=_("In moderation queue"),
         permissions={
             # threads perms
             'misago.threads.permissions.threads': {

misago/categories/migrations/0007_best_answers_roles.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.9 on 2018-03-18 20:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+_ = lambda s: s
+
+
+def create_default_categories_roles(apps, schema_editor):
+    CategoryRole = apps.get_model('misago_categories', 'CategoryRole')
+
+    CategoryRole.objects.create(
+        name=_("Marking best answers"),
+        permissions={
+            # best answers perms
+            'misago.threads.permissions.bestanswers': {
+                'can_mark_best_answers': 1,
+                'can_change_marked_answers': 1,
+                'best_answer_change_time': 60 * 24,
+            },
+        }
+    )
+
+    CategoryRole.objects.create(
+        name=_("Best answers moderator"),
+        permissions={
+            # best answers perms
+            'misago.threads.permissions.bestanswers': {
+                'can_mark_best_answers': 2,
+                'can_change_marked_answers': 2,
+                'best_answer_change_time': 0,
+            },
+        }
+    )
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('misago_categories', '0006_moderation_queue_roles'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_default_categories_roles),
+    ]

misago/core/migrations/0002_basic_settings.py

@@ -6,7 +6,7 @@ from django.db import migrations
 from misago.conf.migrationutils import migrate_settings_group
 
 
-_ = lambda x: x
+_ = lambda s: s
 
 
 def create_basic_settings_group(apps, schema_editor):

misago/legal/migrations/0001_initial.py

@@ -6,7 +6,7 @@ from django.db import migrations
 from misago.conf.migrationutils import migrate_settings_group
 
 
-_ = lambda x: x
+_ = lambda s: s
 
 
 def create_legal_settings_group(apps, schema_editor):

misago/project_template/project_name/settings.py

@@ -20,7 +20,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # Define placeholder gettext function
 # This function will mark strings in settings visible to makemessages
 # without need for Django's i18n features be initialized first.
-_ = lambda x: x
+_ = lambda s: s
 
 
 # Quick-start development settings - unsuitable for production

misago/threads/migrations/0002_threads_settings.py

@@ -6,7 +6,7 @@ from django.db import migrations
 from misago.conf.migrationutils import migrate_settings_group
 
 
-_ = lambda x: x
+_ = lambda s: s
 
 
 def create_threads_settings_group(apps, schema_editor):

misago/threads/migrations/0004_update_settings.py

@@ -6,7 +6,7 @@ from django.db import migrations
 from misago.conf.migrationutils import delete_settings_cache, migrate_settings_group
 
 
-_ = lambda x: x
+_ = lambda s: s
 
 
 def update_threads_settings(apps, schema_editor):

misago/users/apps.py

@@ -19,25 +19,25 @@ class MisagoUsersConfig(AppConfig):
     def register_default_usercp_pages(self):
         usercp.add_section(
             link='misago:usercp-change-forum-options',
-            name=_('Forum options'),
+            name=_("Forum options"),
             component='forum-options',
             icon='settings',
         )
         usercp.add_section(
             link='misago:usercp-edit-details',
-            name=_('Edit details'),
+            name=_("Edit details"),
             component='edit-details',
             icon='person_outline',
         )
         usercp.add_section(
             link='misago:usercp-change-username',
-            name=_('Change username'),
+            name=_("Change username"),
             component='change-username',
             icon='card_membership',
         )
         usercp.add_section(
             link='misago:usercp-change-email-password',
-            name=_('Change email or password'),
+            name=_("Change email or password"),
             component='sign-in-credentials',
             icon='vpn_key',
         )
@@ -46,7 +46,7 @@ class MisagoUsersConfig(AppConfig):
         users_list.add_section(
             link='misago:users-active-posters',
             component='active-posters',
-            name=_('Active posters')
+            name=_("Active poster")
         )
 
     def register_default_user_profile_pages(self):

misago/users/migrations/0002_users_settings.py

@@ -6,7 +6,7 @@ from django.db import migrations
 from misago.conf.migrationutils import migrate_settings_group
 
 
-_ = lambda x: x
+_ = lambda s: s
 
 
 def create_users_settings_group(apps, schema_editor):

misago/users/migrations/0004_default_ranks.py

@@ -7,7 +7,7 @@ from django.utils.translation import ugettext
 from misago.core.utils import slugify
 
 
-_ = lambda x: x
+_ = lambda s: s
 
 
 def create_default_ranks(apps, schema_editor):

misago/users/migrations/0006_update_settings.py

@@ -7,7 +7,7 @@ from django.db import migrations
 from misago.conf.migrationutils import delete_settings_cache, migrate_settings_group
 
 
-_ = lambda x: x
+_ = lambda s: s
 
 
 def update_users_settings(apps, schema_editor):