Skip to content

Commit fe44e5a

Browse files
authored
Merge pull request #99 from noisecapella/master
Use gettext_lazy for Python 3 code
2 parents 156fb13 + 05017fa commit fe44e5a

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

src/robots/admin.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
import sys
2+
13
from django.contrib import admin
2-
from django.utils.translation import ugettext_lazy as _
34
from robots.forms import RuleAdminForm
45
from robots.models import Rule, Url
56

7+
if sys.version_info[0] == 2:
8+
from django.utils.translation import ugettext_lazy as _
9+
else:
10+
from django.utils.translation import gettext_lazy as _
11+
612

713
class RuleAdmin(admin.ModelAdmin):
814
form = RuleAdminForm

src/robots/forms.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1+
import sys
2+
13
from django import forms
2-
from django.utils.translation import ugettext_lazy as _
34
from robots.models import Rule
45

6+
if sys.version_info[0] == 2:
7+
from django.utils.translation import ugettext_lazy as _
8+
else:
9+
from django.utils.translation import gettext_lazy as _
10+
511

612
class RuleAdminForm(forms.ModelForm):
713
class Meta:

src/robots/models.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
import sys
2+
13
from django.contrib.sites.models import Site
24
from django.db import models
35
from django.utils.text import get_text_list
4-
from django.utils.translation import ugettext_lazy as _
56
from six import python_2_unicode_compatible, u
67

8+
if sys.version_info[0] == 2:
9+
from django.utils.translation import ugettext_lazy as _
10+
else:
11+
from django.utils.translation import gettext_lazy as _
12+
713

814
@python_2_unicode_compatible
915
class Url(models.Model):

0 commit comments

Comments
 (0)