0001-replaced-ugettext-calls-with-corresponding-gettext-c.patch
combo/apps/assets/__init__.py | ||
---|---|---|
16 | 16 | |
17 | 17 |
import django.apps |
18 | 18 |
from django.urls import reverse |
19 |
from django.utils.translation import ugettext_lazy as _
|
|
19 |
from django.utils.translation import gettext_lazy as _ |
|
20 | 20 | |
21 | 21 | |
22 | 22 |
class AppConfig(django.apps.AppConfig): |
combo/apps/assets/forms.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
from django import forms |
18 |
from django.utils.translation import ugettext_lazy as _
|
|
18 |
from django.utils.translation import gettext_lazy as _ |
|
19 | 19 | |
20 | 20 | |
21 | 21 |
class AssetUploadForm(forms.Form): |
combo/apps/assets/views.py | ||
---|---|---|
26 | 26 |
from django.http import Http404, HttpResponse |
27 | 27 |
from django.shortcuts import get_object_or_404, redirect |
28 | 28 |
from django.urls import reverse, reverse_lazy |
29 |
from django.utils.translation import ugettext_lazy as _
|
|
29 |
from django.utils.translation import gettext_lazy as _ |
|
30 | 30 |
from django.views.generic import FormView, ListView, TemplateView |
31 | 31 |
from sorl.thumbnail.shortcuts import get_thumbnail |
32 | 32 |
combo/apps/calendar/__init__.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import django.apps |
18 |
from django.utils.translation import ugettext_lazy as _
|
|
18 |
from django.utils.translation import gettext_lazy as _ |
|
19 | 19 | |
20 | 20 | |
21 | 21 |
class AppConfig(django.apps.AppConfig): |
combo/apps/calendar/forms.py | ||
---|---|---|
16 | 16 | |
17 | 17 |
from django import forms |
18 | 18 |
from django.utils.dateparse import parse_datetime, parse_time |
19 |
from django.utils.translation import ugettext_lazy as _
|
|
19 |
from django.utils.translation import gettext_lazy as _ |
|
20 | 20 | |
21 | 21 |
from combo.apps.wcs.utils import get_wcs_options |
22 | 22 |
combo/apps/calendar/models.py | ||
---|---|---|
18 | 18 | |
19 | 19 |
from django.conf import settings |
20 | 20 |
from django.db import models |
21 |
from django.utils.translation import ugettext_lazy as _
|
|
21 |
from django.utils.translation import gettext_lazy as _ |
|
22 | 22 | |
23 | 23 |
from combo.data.library import register_cell_class |
24 | 24 |
from combo.data.models import CellBase |
combo/apps/calendar/utils.py | ||
---|---|---|
22 | 22 |
from django.utils.dateparse import parse_datetime |
23 | 23 |
from django.utils.http import urlencode |
24 | 24 |
from django.utils.timezone import localtime, make_aware |
25 |
from django.utils.translation import ugettext_lazy as _
|
|
25 |
from django.utils.translation import gettext_lazy as _ |
|
26 | 26 | |
27 | 27 |
from combo.utils import requests |
28 | 28 |
combo/apps/dashboard/__init__.py | ||
---|---|---|
13 | 13 | |
14 | 14 |
import django.apps |
15 | 15 |
from django.utils.timezone import now, timedelta |
16 |
from django.utils.translation import ugettext_lazy as _
|
|
16 |
from django.utils.translation import gettext_lazy as _ |
|
17 | 17 | |
18 | 18 | |
19 | 19 |
class AppConfig(django.apps.AppConfig): |
combo/apps/dashboard/models.py | ||
---|---|---|
21 | 21 |
from django.contrib.contenttypes.models import ContentType |
22 | 22 |
from django.db import models |
23 | 23 |
from django.utils.timezone import now |
24 |
from django.utils.translation import ugettext_lazy as _
|
|
24 |
from django.utils.translation import gettext_lazy as _ |
|
25 | 25 | |
26 | 26 |
from combo.data.library import register_cell_class |
27 | 27 |
from combo.data.models import CellBase, ValidityInfo |
combo/apps/dataviz/__init__.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import django.apps |
18 |
from django.utils.translation import ugettext_lazy as _
|
|
18 |
from django.utils.translation import gettext_lazy as _ |
|
19 | 19 | |
20 | 20 | |
21 | 21 |
class AppConfig(django.apps.AppConfig): |
combo/apps/dataviz/forms.py | ||
---|---|---|
24 | 24 |
from django.db.models import Q |
25 | 25 |
from django.db.models.fields import BLANK_CHOICE_DASH |
26 | 26 |
from django.template import Context, Template, TemplateSyntaxError, VariableDoesNotExist |
27 |
from django.utils.translation import ugettext_lazy as _
|
|
27 |
from django.utils.translation import gettext_lazy as _ |
|
28 | 28 | |
29 | 29 |
from combo.utils import cache_during_request, requests, spooler |
30 | 30 |
combo/apps/dataviz/models.py | ||
---|---|---|
34 | 34 |
from django.utils.encoding import force_text |
35 | 35 |
from django.utils.functional import cached_property |
36 | 36 |
from django.utils.translation import gettext |
37 |
from django.utils.translation import ugettext_lazy as _
|
|
37 |
from django.utils.translation import gettext_lazy as _ |
|
38 | 38 |
from django.utils.translation import ungettext |
39 | 39 |
from requests.exceptions import RequestException |
40 | 40 |
combo/apps/dataviz/views.py | ||
---|---|---|
20 | 20 |
from django.http import Http404, HttpResponse, HttpResponseBadRequest |
21 | 21 |
from django.shortcuts import render |
22 | 22 |
from django.template import TemplateSyntaxError, VariableDoesNotExist |
23 |
from django.utils.translation import ugettext_lazy as _
|
|
23 |
from django.utils.translation import gettext_lazy as _ |
|
24 | 24 |
from django.views.decorators.clickjacking import xframe_options_sameorigin |
25 | 25 |
from django.views.generic import DetailView |
26 | 26 |
from requests.exceptions import HTTPError |
combo/apps/family/__init__.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import django.apps |
18 |
from django.utils.translation import ugettext_lazy as _
|
|
18 |
from django.utils.translation import gettext_lazy as _ |
|
19 | 19 | |
20 | 20 | |
21 | 21 |
class AppConfig(django.apps.AppConfig): |
combo/apps/family/models.py | ||
---|---|---|
16 | 16 | |
17 | 17 |
from django.conf import settings |
18 | 18 |
from django.db import models |
19 |
from django.utils.translation import ugettext_lazy as _
|
|
19 |
from django.utils.translation import gettext_lazy as _ |
|
20 | 20 | |
21 | 21 |
from combo.data.library import register_cell_class |
22 | 22 |
from combo.data.models import JsonCellBase, django_template_validator |
combo/apps/fargo/__init__.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import django.apps |
18 |
from django.utils.translation import ugettext_lazy as _
|
|
18 |
from django.utils.translation import gettext_lazy as _ |
|
19 | 19 | |
20 | 20 | |
21 | 21 |
class AppConfig(django.apps.AppConfig): |
combo/apps/fargo/models.py | ||
---|---|---|
20 | 20 |
from django.db import models |
21 | 21 |
from django.forms import Select |
22 | 22 |
from django.forms import models as model_forms |
23 |
from django.utils.translation import ugettext_lazy as _
|
|
23 |
from django.utils.translation import gettext_lazy as _ |
|
24 | 24 |
from requests import HTTPError, RequestException |
25 | 25 | |
26 | 26 |
from combo.data.library import register_cell_class |
combo/apps/gallery/__init__.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import django.apps |
18 |
from django.utils.translation import ugettext_lazy as _
|
|
18 |
from django.utils.translation import gettext_lazy as _ |
|
19 | 19 | |
20 | 20 | |
21 | 21 |
class AppConfig(django.apps.AppConfig): |
combo/apps/gallery/models.py | ||
---|---|---|
19 | 19 |
from django import forms |
20 | 20 |
from django.core import serializers |
21 | 21 |
from django.db import models |
22 |
from django.utils.translation import ugettext_lazy as _
|
|
22 |
from django.utils.translation import gettext_lazy as _ |
|
23 | 23 | |
24 | 24 |
from combo.data.library import register_cell_class |
25 | 25 |
from combo.data.models import CellBase |
combo/apps/kb/__init__.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import django.apps |
18 |
from django.utils.translation import ugettext_lazy as _
|
|
18 |
from django.utils.translation import gettext_lazy as _ |
|
19 | 19 | |
20 | 20 | |
21 | 21 |
class AppConfig(django.apps.AppConfig): |
combo/apps/kb/models.py | ||
---|---|---|
17 | 17 |
import itertools |
18 | 18 | |
19 | 19 |
from django.db import models |
20 |
from django.utils.translation import ugettext_lazy as _
|
|
20 |
from django.utils.translation import gettext_lazy as _ |
|
21 | 21 | |
22 | 22 |
from combo.data.library import register_cell_class |
23 | 23 |
from combo.data.models import CellBase, Page |
combo/apps/lingo/__init__.py | ||
---|---|---|
23 | 23 |
from django.db.models.signals import post_migrate |
24 | 24 |
from django.urls import reverse |
25 | 25 |
from django.utils import timezone |
26 |
from django.utils.translation import ugettext_lazy as _
|
|
26 |
from django.utils.translation import gettext_lazy as _ |
|
27 | 27 | |
28 | 28 | |
29 | 29 |
class AppConfig(django.apps.AppConfig): |
combo/apps/lingo/forms.py | ||
---|---|---|
18 | 18 | |
19 | 19 |
from django import forms |
20 | 20 |
from django.core.exceptions import ValidationError |
21 |
from django.utils.translation import ugettext_lazy as _
|
|
21 |
from django.utils.translation import gettext_lazy as _ |
|
22 | 22 | |
23 | 23 |
from .models import PaymentBackend, Regie |
24 | 24 |
combo/apps/lingo/manager_views.py | ||
---|---|---|
27 | 27 |
from django.template.response import TemplateResponse |
28 | 28 |
from django.urls import reverse, reverse_lazy |
29 | 29 |
from django.utils.timezone import make_aware, now |
30 |
from django.utils.translation import ugettext_lazy as _
|
|
30 |
from django.utils.translation import gettext_lazy as _ |
|
31 | 31 |
from django.views.generic import CreateView, DeleteView, ListView, UpdateView, View |
32 | 32 | |
33 | 33 |
from .forms import PaymentBackendForm, RegieForm, TransactionExportForm, TransactionSearchForm |
combo/apps/lingo/models.py | ||
---|---|---|
41 | 41 |
from django.utils.encoding import force_bytes |
42 | 42 |
from django.utils.formats import localize |
43 | 43 |
from django.utils.timezone import make_aware, now, utc |
44 |
from django.utils.translation import ugettext_lazy as _
|
|
44 |
from django.utils.translation import gettext_lazy as _ |
|
45 | 45 |
from requests import RequestException |
46 | 46 | |
47 | 47 |
from combo.apps.notifications.models import Notification |
combo/apps/lingo/views.py | ||
---|---|---|
42 | 42 |
from django.utils import dateparse |
43 | 43 |
from django.utils.encoding import force_text, smart_text |
44 | 44 |
from django.utils.http import urlencode |
45 |
from django.utils.translation import ugettext_lazy as _
|
|
45 |
from django.utils.translation import gettext_lazy as _ |
|
46 | 46 |
from django.views.decorators.csrf import csrf_exempt |
47 | 47 |
from django.views.generic import DetailView, ListView, TemplateView, View |
48 | 48 |
combo/apps/maps/__init__.py | ||
---|---|---|
16 | 16 | |
17 | 17 |
import django.apps |
18 | 18 |
from django.urls import reverse |
19 |
from django.utils.translation import ugettext_lazy as _
|
|
19 |
from django.utils.translation import gettext_lazy as _ |
|
20 | 20 | |
21 | 21 | |
22 | 22 |
class AppConfig(django.apps.AppConfig): |
combo/apps/maps/forms.py | ||
---|---|---|
17 | 17 |
from django import forms |
18 | 18 |
from django.utils.encoding import force_text |
19 | 19 |
from django.utils.text import slugify |
20 |
from django.utils.translation import ugettext_lazy as _
|
|
20 |
from django.utils.translation import gettext_lazy as _ |
|
21 | 21 | |
22 | 22 |
from combo.data.fields import TemplatableURLField |
23 | 23 |
combo/apps/maps/manager_views.py | ||
---|---|---|
17 | 17 |
from django.http import Http404 |
18 | 18 |
from django.shortcuts import get_object_or_404 |
19 | 19 |
from django.urls import reverse, reverse_lazy |
20 |
from django.utils.translation import ugettext_lazy as _
|
|
20 |
from django.utils.translation import gettext_lazy as _ |
|
21 | 21 |
from django.views.generic import CreateView, DeleteView, ListView, UpdateView |
22 | 22 | |
23 | 23 |
from combo.data.models import CellBase, PageSnapshot |
combo/apps/maps/models.py | ||
---|---|---|
26 | 26 |
from django.urls import reverse |
27 | 27 |
from django.utils.html import escape |
28 | 28 |
from django.utils.text import slugify |
29 |
from django.utils.translation import ugettext_lazy as _
|
|
29 |
from django.utils.translation import gettext_lazy as _ |
|
30 | 30 |
from requests.exceptions import RequestException |
31 | 31 |
from requests.models import PreparedRequest |
32 | 32 |
combo/apps/notifications/__init__.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import django.apps |
18 |
from django.utils.translation import ugettext_lazy as _
|
|
18 |
from django.utils.translation import gettext_lazy as _ |
|
19 | 19 | |
20 | 20 | |
21 | 21 |
class AppConfig(django.apps.AppConfig): |
combo/apps/notifications/models.py | ||
---|---|---|
22 | 22 |
from django.db.models.query import QuerySet |
23 | 23 |
from django.utils.encoding import force_text |
24 | 24 |
from django.utils.timezone import now, timedelta |
25 |
from django.utils.translation import ugettext_lazy as _
|
|
25 |
from django.utils.translation import gettext_lazy as _ |
|
26 | 26 | |
27 | 27 |
from combo.apps.pwa.models import PwaSettings |
28 | 28 |
from combo.data.library import register_cell_class |
combo/apps/pwa/__init__.py | ||
---|---|---|
16 | 16 | |
17 | 17 |
import django.apps |
18 | 18 |
from django.urls import reverse |
19 |
from django.utils.translation import ugettext_lazy as _
|
|
19 |
from django.utils.translation import gettext_lazy as _ |
|
20 | 20 | |
21 | 21 | |
22 | 22 |
class AppConfig(django.apps.AppConfig): |
combo/apps/pwa/forms.py | ||
---|---|---|
16 | 16 | |
17 | 17 |
from django import forms |
18 | 18 |
from django.core.exceptions import ValidationError |
19 |
from django.utils.translation import ugettext_lazy as _
|
|
19 |
from django.utils.translation import gettext_lazy as _ |
|
20 | 20 | |
21 | 21 |
from .models import PwaSettings |
22 | 22 |
combo/apps/pwa/manager_views.py | ||
---|---|---|
18 | 18 |
from django.db.models import Max |
19 | 19 |
from django.http import JsonResponse |
20 | 20 |
from django.urls import reverse_lazy |
21 |
from django.utils.translation import ugettext_lazy as _
|
|
21 |
from django.utils.translation import gettext_lazy as _ |
|
22 | 22 |
from django.views.generic import CreateView, DeleteView, UpdateView |
23 | 23 | |
24 | 24 |
from combo.data.forms import get_page_choices |
combo/apps/pwa/models.py | ||
---|---|---|
26 | 26 |
from django.core.files.storage import default_storage |
27 | 27 |
from django.db import models |
28 | 28 |
from django.utils.encoding import force_bytes, force_text |
29 |
from django.utils.translation import ugettext_lazy as _
|
|
29 |
from django.utils.translation import gettext_lazy as _ |
|
30 | 30 |
from py_vapid import Vapid |
31 | 31 | |
32 | 32 |
from combo import utils |
combo/apps/search/__init__.py | ||
---|---|---|
16 | 16 | |
17 | 17 |
import django.apps |
18 | 18 |
from django.urls import reverse |
19 |
from django.utils.translation import ugettext_lazy as _
|
|
19 |
from django.utils.translation import gettext_lazy as _ |
|
20 | 20 | |
21 | 21 |
from .engines import engines |
22 | 22 |
combo/apps/search/forms.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
from django import forms |
18 |
from django.utils.translation import ugettext_lazy as _
|
|
18 |
from django.utils.translation import gettext_lazy as _ |
|
19 | 19 | |
20 | 20 |
from combo.data.models import Page |
21 | 21 |
from combo.profile import default_description_template |
combo/apps/search/manager_views.py | ||
---|---|---|
17 | 17 |
from django.http import HttpResponse, HttpResponseRedirect |
18 | 18 |
from django.shortcuts import get_object_or_404, render |
19 | 19 |
from django.urls import reverse |
20 |
from django.utils.translation import ugettext_lazy as _
|
|
20 |
from django.utils.translation import gettext_lazy as _ |
|
21 | 21 |
from django.views.generic import View |
22 | 22 | |
23 | 23 |
from combo.apps.search.forms import ( |
combo/apps/search/models.py | ||
---|---|---|
26 | 26 |
from django.template import RequestContext, Template |
27 | 27 |
from django.utils.functional import cached_property |
28 | 28 |
from django.utils.http import quote |
29 |
from django.utils.translation import ugettext_lazy as _
|
|
29 |
from django.utils.translation import gettext_lazy as _ |
|
30 | 30 | |
31 | 31 |
from combo.data.library import register_cell_class |
32 | 32 |
from combo.data.models import CellBase, Page |
combo/apps/wcs/__init__.py | ||
---|---|---|
20 | 20 |
from django.conf import settings |
21 | 21 |
from django.urls import reverse |
22 | 22 |
from django.utils.encoding import force_bytes |
23 |
from django.utils.translation import gettext_lazy as _ |
|
23 | 24 |
from django.utils.translation import pgettext_lazy |
24 |
from django.utils.translation import ugettext_lazy as _ |
|
25 | 25 | |
26 | 26 | |
27 | 27 |
class AppConfig(django.apps.AppConfig): |
combo/apps/wcs/forms.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
from django import forms |
18 |
from django.utils.translation import ugettext_lazy as _
|
|
18 |
from django.utils.translation import gettext_lazy as _ |
|
19 | 19 | |
20 | 20 |
from combo.utils.forms import MultiSortWidget |
21 | 21 |
combo/apps/wcs/models.py | ||
---|---|---|
29 | 29 |
from django.utils.html import escape |
30 | 30 |
from django.utils.safestring import mark_safe |
31 | 31 |
from django.utils.text import slugify |
32 |
from django.utils.translation import ugettext_lazy as _
|
|
32 |
from django.utils.translation import gettext_lazy as _ |
|
33 | 33 |
from requests.exceptions import RequestException |
34 | 34 | |
35 | 35 |
from combo.data.library import register_cell_class |
combo/apps/wcs/views.py | ||
---|---|---|
23 | 23 |
from django.core.exceptions import DisallowedRedirect, PermissionDenied |
24 | 24 |
from django.http import HttpResponseBadRequest, HttpResponseForbidden, HttpResponseRedirect, JsonResponse |
25 | 25 |
from django.utils.http import urlquote |
26 |
from django.utils.translation import ugettext_lazy as _
|
|
26 |
from django.utils.translation import gettext_lazy as _ |
|
27 | 27 |
from django.views.decorators.csrf import csrf_exempt |
28 | 28 |
from django.views.generic import View |
29 | 29 |
combo/data/forms.py | ||
---|---|---|
19 | 19 |
from django import forms |
20 | 20 |
from django.conf import settings |
21 | 21 |
from django.template import Template, TemplateSyntaxError |
22 |
from django.utils.translation import ugettext_lazy as _
|
|
22 |
from django.utils.translation import gettext_lazy as _ |
|
23 | 23 | |
24 | 24 |
from combo.utils import cache_during_request |
25 | 25 |
combo/data/management/commands/export_site.py | ||
---|---|---|
18 | 18 |
import sys |
19 | 19 | |
20 | 20 |
from django.core.management.base import BaseCommand, CommandError |
21 |
from django.utils.translation import ugettext_lazy as _
|
|
21 |
from django.utils.translation import gettext_lazy as _ |
|
22 | 22 | |
23 | 23 |
from combo.data.utils import export_site, export_site_tar |
24 | 24 |
combo/data/models.py | ||
---|---|---|
61 | 61 |
from django.utils.safestring import mark_safe |
62 | 62 |
from django.utils.text import slugify |
63 | 63 |
from django.utils.timezone import now |
64 |
from django.utils.translation import ugettext_lazy as _
|
|
64 |
from django.utils.translation import gettext_lazy as _ |
|
65 | 65 | |
66 | 66 |
from combo import utils |
67 | 67 |
from combo.utils import NothingInCacheException |
combo/data/utils.py | ||
---|---|---|
21 | 21 |
from django.contrib.auth.models import Group |
22 | 22 |
from django.core.serializers.base import DeserializationError |
23 | 23 |
from django.db import transaction |
24 |
from django.utils.translation import ugettext_lazy as _
|
|
24 |
from django.utils.translation import gettext_lazy as _ |
|
25 | 25 | |
26 | 26 |
from combo.apps.assets.models import Asset |
27 | 27 |
from combo.apps.assets.utils import add_tar_content, clean_assets_files, tar_assets_files, untar_assets_files |
combo/manager/forms.py | ||
---|---|---|
23 | 23 |
from django.forms import formset_factory |
24 | 24 |
from django.template import Template, TemplateSyntaxError |
25 | 25 |
from django.template.loader import TemplateDoesNotExist, get_template |
26 |
from django.utils.translation import ugettext_lazy as _
|
|
26 |
from django.utils.translation import gettext_lazy as _ |
|
27 | 27 | |
28 | 28 |
from combo.data.forms import get_page_choices |
29 | 29 |
from combo.data.models import Page, ParentContentCell, SiteSettings, compile_sub_slug |
combo/manager/views.py | ||
---|---|---|
40 | 40 |
from django.utils.encoding import force_bytes, force_text |
41 | 41 |
from django.utils.formats import date_format |
42 | 42 |
from django.utils.timezone import localtime |
43 |
from django.utils.translation import ugettext_lazy as _
|
|
43 |
from django.utils.translation import gettext_lazy as _ |
|
44 | 44 |
from django.views.decorators.csrf import csrf_exempt, requires_csrf_token |
45 | 45 |
from django.views.generic import ( |
46 | 46 |
CreateView, |
combo/profile/__init__.py | ||
---|---|---|
17 | 17 | |
18 | 18 | |
19 | 19 |
import django.apps |
20 |
from django.utils.translation import ugettext_lazy as _
|
|
20 |
from django.utils.translation import gettext_lazy as _ |
|
21 | 21 | |
22 | 22 | |
23 | 23 |
def user_get_name_id(user): |
combo/profile/models.py | ||
---|---|---|
20 | 20 |
from django.conf import settings |
21 | 21 |
from django.db import models |
22 | 22 |
from django.utils.dateparse import parse_date |
23 |
from django.utils.translation import ugettext_lazy as _
|
|
23 |
from django.utils.translation import gettext_lazy as _ |
|
24 | 24 | |
25 | 25 |
from combo.data.library import register_cell_class |
26 | 26 |
from combo.data.models import JsonCellBase |
combo/public/views.py | ||
---|---|---|
42 | 42 |
from django.utils import lorem_ipsum, timezone |
43 | 43 |
from django.utils.encoding import force_text |
44 | 44 |
from django.utils.http import urlencode |
45 |
from django.utils.translation import ugettext as _
|
|
45 |
from django.utils.translation import gettext as _ |
|
46 | 46 |
from django.views.decorators.csrf import csrf_exempt |
47 | 47 |
from django.views.defaults import page_not_found |
48 | 48 |
combo/settings.py | ||
---|---|---|
27 | 27 |
import os |
28 | 28 | |
29 | 29 |
from django.conf import global_settings |
30 |
from django.utils.translation import ugettext_lazy as _
|
|
30 |
from django.utils.translation import gettext_lazy as _ |
|
31 | 31 | |
32 | 32 |
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) |
33 | 33 |
BASE_DIR = os.path.dirname(os.path.dirname(__file__)) |
34 |
- |