Skip to content

Use gettext_lazy for Python 3 code #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/robots/admin.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import sys

from django.contrib import admin
from django.utils.translation import ugettext_lazy as _
from robots.forms import RuleAdminForm
from robots.models import Rule, Url

if sys.version_info[0] == 2:
from django.utils.translation import ugettext_lazy as _
else:
from django.utils.translation import gettext_lazy as _


class RuleAdmin(admin.ModelAdmin):
form = RuleAdminForm
Expand Down
8 changes: 7 additions & 1 deletion src/robots/forms.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import sys

from django import forms
from django.utils.translation import ugettext_lazy as _
from robots.models import Rule

if sys.version_info[0] == 2:
from django.utils.translation import ugettext_lazy as _
else:
from django.utils.translation import gettext_lazy as _


class RuleAdminForm(forms.ModelForm):
class Meta:
Expand Down
8 changes: 7 additions & 1 deletion src/robots/models.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import sys

from django.contrib.sites.models import Site
from django.db import models
from django.utils.text import get_text_list
from django.utils.translation import ugettext_lazy as _
from six import python_2_unicode_compatible, u

if sys.version_info[0] == 2:
from django.utils.translation import ugettext_lazy as _
else:
from django.utils.translation import gettext_lazy as _


@python_2_unicode_compatible
class Url(models.Model):
Expand Down