Skip to content

Commit ea0bb15

Browse files
authored
Merge pull request #35 from deployed/24715_django_32_autofield
Change default auto field to BigAutoField
2 parents d33c808 + c2f9087 commit ea0bb15

File tree

8 files changed

+50
-8
lines changed

8 files changed

+50
-8
lines changed

emailtemplates/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
default_app_config = 'emailtemplates.apps.EmailtempatesConfig'
22

3-
VERSION = (0, 8, 0)
3+
VERSION = (1, 1, 13)
44

55
# Dynamically calculate the version based on VERSION tuple
66
if len(VERSION) > 2 and VERSION[2] is not None:

emailtemplates/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from django.contrib import admin
33
from django.urls import reverse
44
from django.utils.safestring import mark_safe
5-
from django.utils.translation import ugettext_lazy as _
5+
from django.utils.translation import gettext_lazy as _
66

77
from .forms import EmailTemplateAdminForm, MassEmailMessageForm, MassEmailAttachmentForm
88
from .models import EmailTemplate, MassEmailMessage, MassEmailAttachment, EmailAttachment

emailtemplates/apps.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# -*- coding: utf-8 -*-
22
from django.apps import AppConfig
3-
from django.utils.translation import ugettext_lazy as _
3+
from django.utils.translation import gettext_lazy as _
44

55

66
class EmailtempatesConfig(AppConfig):
77
name = 'emailtemplates'
8-
verbose_name = _('E-MAIL TEMPLATES')
8+
verbose_name = _('E-MAIL TEMPLATES')
9+
default_auto_field = 'django.db.models.BigAutoField'

emailtemplates/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from django.template import TemplateSyntaxError
88
from django.utils.functional import lazy
99
from django.utils.safestring import mark_safe
10-
from django.utils.translation import ugettext_lazy as _
10+
from django.utils.translation import gettext_lazy as _
1111

1212
from emailtemplates.models import EmailTemplate, MassEmailAttachment, MassEmailMessage
1313
from emailtemplates.registry import email_templates
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Generated by Django 3.2.11 on 2022-01-11 09:11
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
("emailtemplates", "0008_auto_20201120_1056"),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name="emailattachment",
15+
name="id",
16+
field=models.BigAutoField(
17+
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
18+
),
19+
),
20+
migrations.AlterField(
21+
model_name="emailtemplate",
22+
name="id",
23+
field=models.BigAutoField(
24+
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
25+
),
26+
),
27+
migrations.AlterField(
28+
model_name="massemailattachment",
29+
name="id",
30+
field=models.BigAutoField(
31+
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
32+
),
33+
),
34+
migrations.AlterField(
35+
model_name="massemailmessage",
36+
name="id",
37+
field=models.BigAutoField(
38+
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
39+
),
40+
),
41+
]

emailtemplates/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from django.conf import settings
66
from django.db import models
7-
from django.utils.translation import ugettext_lazy as _
7+
from django.utils.translation import gettext_lazy as _
88

99
from emailtemplates.helpers import TemplateSourceLoader, mass_mailing_recipients
1010

emailtemplates/registry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import logging
33

44
from django.template.loader import render_to_string
5-
from django.utils.translation import ugettext_lazy as _
5+
from django.utils.translation import gettext_lazy as _
66

77

88
logger = logging.getLogger(__name__)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
setup(
1818
name='django-emailtemplates',
19-
version='1.1.12',
19+
version='1.1.13',
2020
packages=find_packages(),
2121
package_data={'emailtemplates': ['locale/*/LC_MESSAGES/*.po', 'locale/*/LC_MESSAGES/*.mo']},
2222
include_package_data=True,

0 commit comments

Comments
 (0)