Hopiu/wagtail-modeltranslation
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail-modeltranslation.git synced 2026-05-19 04:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed hardcoded language codes, replaced by settings.LANGUAGES

Browse source
This commit is contained in:
Erwhann-Rouge Guilhem MAS-PAITRAULT 2017-10-11 17:42:12 +02:00 committed by Miguel Silva
parent 55fff643d3
commit 88e5895c5b
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
wagtail_modeltranslation/patch_wagtailadmin_forms.py
View file

@ -1,6 +1,7 @@
# coding: utf-8
from django import forms
from django.conf import settings
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy, ungettext
from wagtail.wagtailcore.models import Page
@ -17,15 +18,15 @@ class PatchedCopyForm(CopyForm):
super(CopyForm, self).__init__(*args, **kwargs)
#self.fields['new_title'] = forms.CharField(initial=self.page.title, label=_("New title"))
for language in ('fr', 'en'):
locale_title = "new_title_{}".format(language)
locale_label = "{} [{}]".format(_("New title"), language)
for code, name in settings.LANGUAGES:
locale_title = "new_title_{}".format(code)
locale_label = "{} [{}]".format(_("New title"), code)
self.fields[locale_title] = forms.CharField(initial=self.page.title, label=locale_label)
#self.fields['new_slug'] = forms.SlugField(initial=self.page.slug, label=_("New slug"))
for language in ('fr', 'en'):
locale_title = "new_slug_{}".format(language)
locale_label = "{} [{}]".format(_("New slug"), language)
for code, name in settings.LANGUAGES:
locale_title = "new_slug_{}".format(code)
locale_label = "{} [{}]".format(_("New slug"), code)
self.fields[locale_title] = forms.CharField(initial=self.page.title, label=locale_label)
self.fields['new_parent_page'] = forms.ModelChoiceField(
@ -79,8 +80,8 @@ class PatchedCopyForm(CopyForm):
])
# Count the pages with the same slug within the context of our copy's parent page
for language in ('fr', 'en'):
locale_slug = "slug_{}".format(language)
for code, name in settings.LANGUAGES:
locale_slug = "slug_{}".format(code)
slug = cleaned_data.get(locale_slug)
if slug and parent_page.get_children().filter(slug=slug).count():

6
wagtail_modeltranslation/wagtail_hooks.py
View file

@ -198,9 +198,9 @@ def before_copy_page(request, page):
can_publish = parent_page.permissions_for_user(request.user).can_publish_subpage()
update_attrs = {}
for language in ('fr', 'en'):
slug = "slug_{}".format(language)
title = "title_{}".format(language)
for code, name in settings.LANGUAGES:
slug = "slug_{}".format(code)
title = "title_{}".format(code)
update_attrs[slug] = form.cleaned_data["new_{}".format(slug)]
update_attrs[title] = form.cleaned_data["new_{}".format(title)]