From 26b6f92a9d2702ffd63ed0446f5e6df92e26ec4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Thu, 13 Jul 2017 13:47:11 +0200 Subject: [PATCH] use "Title (language name)" in Editor Form --- src/c3nav/editor/forms.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/c3nav/editor/forms.py b/src/c3nav/editor/forms.py index ab5dbdb7..8593beef 100644 --- a/src/c3nav/editor/forms.py +++ b/src/c3nav/editor/forms.py @@ -7,7 +7,9 @@ from django.conf import settings from django.core.exceptions import FieldDoesNotExist from django.forms import BooleanField, CharField, ChoiceField, ModelForm, MultipleChoiceField, ValidationError from django.forms.widgets import HiddenInput +from django.utils.text import format_lazy from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import get_language_info from shapely.geometry.geo import mapping from c3nav.editor.models import ChangeSet, ChangeSetUpdate @@ -70,12 +72,13 @@ class EditorFormBase(ModelForm): if self.instance is not None and self.instance.pk: titles.update(self.instance.titles) - language_titles = dict(settings.LANGUAGES) for language in reversed(titles.keys()): new_title = self.data.get('title_' + language) if new_title is not None: titles[language] = new_title - self.fields['title_' + language] = CharField(label=language_titles.get(language, language), + language_info = get_language_info(language) + field_title = format_lazy(_('Title ({lang})'), lang=language_info['name_translated']) + self.fields['title_' + language] = CharField(label=field_title, required=False, initial=titles[language].strip(), max_length=50) self.fields.move_to_end('title_' + language, last=False)