Adapt for translation overload

32 files changed, 33 insertions, 34 deletions

diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py
index 61d514ad1..434e9c089 100644
--- a/archaeological_context_records/admin.py
+++ b/archaeological_context_records/admin.py
@@ -23,7 +23,7 @@ from ajax_select.fields import AutoCompleteSelectField
 from django import forms
 from django.contrib import admin
 from django.contrib.gis.forms import PointField, MultiPolygonField, 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_context_records/forms.py b/archaeological_context_records/forms.py
index 5d98b9718..2061ecc1f 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -26,7 +26,7 @@ from django import forms
 from django.conf import settings
 from django.core import validators
 from django.forms.formsets import formset_factory
-from django.utils.translation import ugettext_lazy as _
+from ishtar_common.utils import ugettext_lazy as _
 
 from ishtar_common.models import valid_id, IshtarSiteProfile, Town, \
     SpatialReferenceSystem, valid_ids
diff --git a/archaeological_context_records/ishtar_menu.py b/archaeological_context_records/ishtar_menu.py
index 3ac14c236..fc02c5eef 100644
--- a/archaeological_context_records/ishtar_menu.py
+++ b/archaeological_context_records/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_context_records/models.py b/archaeological_context_records/models.py
index dd76c355a..96103600f 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -26,8 +26,8 @@ from django.core.urlresolvers import reverse
 from django.db import connection
 from django.db.models import Q
 from django.db.models.signals import post_delete, post_save, m2m_changed
-from django.utils.translation import ugettext_lazy as _, pgettext, \
-    activate, pgettext_lazy, deactivate
+from ishtar_common.utils import ugettext_lazy as _,\
+    pgettext_lazy, pgettext
 from django.utils.text import slugify
 
 from ishtar_common.utils import cached_label_changed, \
diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py
index 2493c9ba7..74def46a4 100644
--- a/archaeological_context_records/views.py
+++ b/archaeological_context_records/views.py
@@ -23,7 +23,7 @@ from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse, HttpResponseRedirect, 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 RedirectView
 
 from ishtar_common.models import QuickAction
diff --git a/archaeological_context_records/wizards.py b/archaeological_context_records/wizards.py
index 8338f8b23..53f13c481 100644
--- a/archaeological_context_records/wizards.py
+++ b/archaeological_context_records/wizards.py
@@ -18,7 +18,7 @@
 # See the file COPYING for details.
 
 from django.core.exceptions import ObjectDoesNotExist
-from django.utils.translation import ugettext_lazy as _
+from ishtar_common.utils import ugettext_lazy as _
 
 from . import models
 from ishtar_common.forms import reverse_lazy
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 4d8ab749a..9a2f63a1d 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -26,7 +26,7 @@ from django import forms
 from django.conf import settings
 from django.core import validators
 from django.forms.formsets import formset_factory
-from django.utils.translation import ugettext_lazy as _
+from ishtar_common.utils import ugettext_lazy as _
 from django.utils.safestring import mark_safe
 
 from ishtar_common.models import Person, Organization, \
diff --git a/archaeological_files/ishtar_menu.py b/archaeological_files/ishtar_menu.py
index 8aef5f7b4..889d27287 100644
--- a/archaeological_files/ishtar_menu.py
+++ b/archaeological_files/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_files/models.py b/archaeological_files/models.py
index 6d7fbe048..dbb02f509 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -25,7 +25,7 @@ from django.contrib.gis.db import models
 from django.core.cache import cache
 from django.db.models import Q, Count, Sum
 from django.db.models.signals import post_save, m2m_changed, post_delete
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy
 
 from ishtar_common.utils import cached_label_changed, get_cache, \
     get_current_year, m2m_historization_changed
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index f55dbe73c..7917af6b8 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -24,7 +24,7 @@ from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.shortcuts import redirect, render
-from django.utils.translation import ugettext_lazy as _
+from ishtar_common.utils import ugettext_lazy as _
 
 from ishtar_common.views import wizard_is_available
 from ishtar_common.views_item import get_item, show_item, revert_item
diff --git a/archaeological_files/wizards.py b/archaeological_files/wizards.py
index c1aaf9037..c208dc097 100644
--- a/archaeological_files/wizards.py
+++ b/archaeological_files/wizards.py
@@ -20,7 +20,7 @@
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Max
-from django.utils.translation import ugettext_lazy as _
+from ishtar_common.utils import ugettext_lazy as _
 
 from ishtar_common.forms import reverse_lazy
 from ishtar_common.wizards import ClosingWizard, SearchWizard, \
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index eaa760c80..7ade0b3f0 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -22,7 +22,7 @@ import datetime
 from django import forms
 from django.core import validators
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from ishtar_common.utils import ugettext_lazy as _
 
 from ishtar_common.models import Person, Town, Department, valid_id, \
     person_type_pk_lazy, person_type_pks_lazy, organization_type_pks_lazy, \
diff --git a/archaeological_files_pdl/views.py b/archaeological_files_pdl/views.py
index cf412efb6..0f5d0171d 100644
--- a/archaeological_files_pdl/views.py
+++ b/archaeological_files_pdl/views.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 archaeological_files_pdl.wizards import FileWizard, FileModificationWizard
 from archaeological_operations.wizards import is_preventive, is_not_preventive
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, \
diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py
index 0aec94249..7d32f6039 100644
--- a/archaeological_operations/admin.py
+++ b/archaeological_operations/admin.py
@@ -25,7 +25,7 @@ from django import forms
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.gis.forms import PointField, MultiPolygonField, 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_operations/forms.py b/archaeological_operations/forms.py
index 4ea0847bf..32ec6f826 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -31,7 +31,7 @@ from django.db.models import Max
 from django.forms.formsets import formset_factory, DELETION_FIELD_NAME, \
     TOTAL_FORM_COUNT
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy
 
 from . import models
 from archaeological_files.models import File
diff --git a/archaeological_operations/ishtar_menu.py b/archaeological_operations/ishtar_menu.py
index 1c69c2147..615e1f491 100644
--- a/archaeological_operations/ishtar_menu.py
+++ b/archaeological_operations/ishtar_menu.py
@@ -17,7 +17,7 @@
 
 # See the file COPYING for details.
 
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy
 
 from ishtar_common.menu_base import SectionItem, MenuItem
 
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 900779643..024886c72 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -31,7 +31,7 @@ from django.db import IntegrityError, transaction
 from django.db.models import Q, Count, Sum, Max, Avg
 from django.db.models.signals import post_save, m2m_changed, post_delete
 from django.forms import ValidationError
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy
 
 from ishtar_common.models import BaseHistorizedItem, Dashboard, \
     DashboardFormItem, Department, Document, DocumentTemplate, \
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 8bc805b7a..38280ccbf 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -25,7 +25,7 @@ from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import render, redirect
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy
 
 from archaeological_operations import models
 from archaeological_operations.forms import ArchaeologicalSiteForm, \
diff --git a/archaeological_operations/widgets.py b/archaeological_operations/widgets.py
index 04e0fcdfd..4ea86188f 100644
--- a/archaeological_operations/widgets.py
+++ b/archaeological_operations/widgets.py
@@ -22,7 +22,7 @@ from django.forms import widgets
 from django.forms.utils import flatatt
 from django.template import loader
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from ishtar_common.utils import ugettext_lazy as _
 
 
 class ParcelWidget(widgets.MultiWidget):
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index d5230fa16..a37e923fb 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -24,7 +24,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.shortcuts import render
-from django.utils.translation import ugettext_lazy as _
+from ishtar_common.utils import ugettext_lazy as _
 
 from archaeological_files.models import File
 from archaeological_operations import models
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py
index 88a355bad..b950a5d3c 100644
--- a/archaeological_warehouse/forms.py
+++ b/archaeological_warehouse/forms.py
@@ -24,7 +24,7 @@ from django import forms
 from django.db.models import Max
 from django.conf import settings
 from django.forms.formsets import formset_factory
-from django.utils.translation import ugettext_lazy as _
+from ishtar_common.utils import ugettext_lazy as _
 
 from ishtar_common.models import Person, valid_id, Town, \
     SpatialReferenceSystem, Organization, valid_ids
diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py
index 2b01e04c6..b7c820d13 100644
--- a/archaeological_warehouse/ishtar_menu.py
+++ b/archaeological_warehouse/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_warehouse/models.py b/archaeological_warehouse/models.py
index ba53dc49f..beddbf55e 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -26,7 +26,7 @@ from django.core.urlresolvers import reverse
 from django.db.models import Q, Max
 from django.db.models.signals import post_save, post_delete, m2m_changed
 from django.template.defaultfilters import slugify
-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
 from ishtar_common.model_managers import ExternalIdManager, UUIDModelManager
diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py
index 55d764ec7..29f33dc04 100644
--- a/archaeological_warehouse/views.py
+++ b/archaeological_warehouse/views.py
@@ -23,7 +23,7 @@ from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.shortcuts import redirect
-from django.utils.translation import ugettext_lazy as _
+from ishtar_common.utils import ugettext_lazy as _
 
 from archaeological_warehouse import models