diff options
Diffstat (limited to 'archaeological_finds')
-rw-r--r-- | archaeological_finds/admin.py | 2 | ||||
-rw-r--r-- | archaeological_finds/forms.py | 2 | ||||
-rw-r--r-- | archaeological_finds/forms_treatments.py | 2 | ||||
-rw-r--r-- | archaeological_finds/ishtar_menu.py | 2 | ||||
-rw-r--r-- | archaeological_finds/models_finds.py | 2 | ||||
-rw-r--r-- | archaeological_finds/models_treatments.py | 3 | ||||
-rw-r--r-- | archaeological_finds/views.py | 2 | ||||
-rw-r--r-- | archaeological_finds/wizards.py | 2 |
8 files changed, 8 insertions, 9 deletions
diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py index c1659a495..f129881e8 100644 --- a/archaeological_finds/admin.py +++ b/archaeological_finds/admin.py @@ -24,7 +24,7 @@ from django import forms from django.contrib import admin from django.contrib.gis.forms import PointField, MultiPolygonField, \ LineStringField, OSMWidget -from django.utils.translation import ugettext_lazy as _ +from ishtar_common.utils import ugettext_lazy as _ from ishtar_common.apps import admin_site from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin, \ diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index ee817b053..5162065c8 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -28,7 +28,7 @@ from django.core import validators from django.core.exceptions import PermissionDenied from django.db.models import Q from django.forms.formsets import formset_factory -from django.utils.translation import ugettext_lazy as _ +from ishtar_common.utils import ugettext_lazy as _ from . import models from archaeological_operations.models import CulturalAttributionType diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index e20da10ce..f03dec18a 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -23,7 +23,7 @@ from collections import OrderedDict from django import forms from django.core import validators -from django.utils.translation import ugettext_lazy as _ +from ishtar_common.utils import ugettext_lazy as _ from archaeological_finds import models from archaeological_operations.forms import AdministrativeActForm, \ diff --git a/archaeological_finds/ishtar_menu.py b/archaeological_finds/ishtar_menu.py index 1a7b3a107..feb715368 100644 --- a/archaeological_finds/ishtar_menu.py +++ b/archaeological_finds/ishtar_menu.py @@ -17,7 +17,7 @@ # See the file COPYING for details. -from django.utils.translation import ugettext_lazy as _ +from ishtar_common.utils import ugettext_lazy as _ from ishtar_common.menu_base import SectionItem, MenuItem diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 71fafbbe8..36a1c08c7 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -29,7 +29,7 @@ from django.db.models import Max, Q, F from django.db.models.signals import m2m_changed, post_save, post_delete, \ pre_delete from django.core.exceptions import ObjectDoesNotExist -from django.utils.translation import ugettext_lazy as _, pgettext_lazy\ +from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy from ishtar_common.data_importer import post_importer_action, ImporterError from ishtar_common.utils import cached_label_changed, post_save_geo, \ diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 85d1cb0d0..f09343c46 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -26,8 +26,7 @@ from django.db.models import Max, Q from django.db.models.signals import post_save, post_delete, pre_delete, \ m2m_changed from django.template.defaultfilters import slugify -from django.utils.translation import ugettext_lazy as _, pgettext_lazy, \ - activate, deactivate +from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy from archaeological_finds.models_finds import Find, FindBasket, TreatmentType from archaeological_operations.models import ClosedItem, Operation diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 8c787836f..6a1ec70fd 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -30,7 +30,7 @@ from django.core.urlresolvers import reverse from django.db.models import Q from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.shortcuts import redirect -from django.utils.translation import ugettext_lazy as _ +from ishtar_common.utils import ugettext_lazy as _ from django.views.generic import TemplateView from django.views.generic.edit import CreateView, FormView diff --git a/archaeological_finds/wizards.py b/archaeological_finds/wizards.py index 71bc6deed..d58ac411b 100644 --- a/archaeological_finds/wizards.py +++ b/archaeological_finds/wizards.py @@ -19,7 +19,7 @@ from django.contrib import messages from django.core.exceptions import ObjectDoesNotExist, PermissionDenied -from django.utils.translation import ugettext_lazy as _, pgettext +from ishtar_common.utils import ugettext_lazy as _, pgettext from ishtar_common.forms import reverse_lazy from ishtar_common.wizards import Wizard, DeletionWizard, SearchWizard, \ |