diff --git a/emencia/django/newsletter/forms.py b/emencia/django/newsletter/forms.py index 85dada87..87e7866e 100644 --- a/emencia/django/newsletter/forms.py +++ b/emencia/django/newsletter/forms.py @@ -11,6 +11,7 @@ from django.forms.models import ModelChoiceIterator from django.http import Http404 from django.utils import translation from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import get_language from django.utils.encoding import smart_text, force_text from haystack.query import SearchQuerySet @@ -158,6 +159,9 @@ class MailingSettingsForm(forms.ModelForm): if self.instance and self.instance.pk: # area self.initial['area'] = set(self.instance.f_countries.values_list('area_id', flat=True)) + area_q = Area.objects.language().all().order_by('name') + area_q = area_q.extra(where=[" `{db_table}_translation`.`language_code` = 'ru' ".format(db_table=Area._meta.db_table)]) + self.fields['area'].queryset = area_q # foreign countries self.fields['f_countries'].c_queryset = self.instance.f_countries.distinct() diff --git a/templates/client/popups/mailing_settings_countries.html b/templates/client/popups/mailing_settings_countries.html index 07f0ed6b..3d3b6626 100644 --- a/templates/client/popups/mailing_settings_countries.html +++ b/templates/client/popups/mailing_settings_countries.html @@ -14,10 +14,10 @@