From 490c4a713af4281cf2024be305c61475d739b6a3 Mon Sep 17 00:00:00 2001 From: Coen van der Kamp Date: Mon, 19 Mar 2018 13:41:49 +0100 Subject: [PATCH] Localize verbose names (#4397, fixing #2591) * 2591 Localize app labels and Image model Fix white * 2591 Add migration --- wagtail/admin/apps.py | 3 ++- wagtail/api/v2/apps.py | 3 ++- wagtail/contrib/forms/apps.py | 3 ++- wagtail/contrib/frontend_cache/apps.py | 3 ++- wagtail/contrib/modeladmin/apps.py | 3 ++- wagtail/contrib/redirects/apps.py | 3 ++- wagtail/contrib/routable_page/apps.py | 3 ++- wagtail/contrib/search_promotions/apps.py | 3 ++- wagtail/contrib/sitemaps/apps.py | 3 ++- wagtail/contrib/styleguide/apps.py | 3 ++- wagtail/contrib/table_block/apps.py | 3 ++- wagtail/core/apps.py | 3 ++- wagtail/documents/apps.py | 3 ++- wagtail/embeds/apps.py | 3 ++- wagtail/images/apps.py | 3 ++- .../images/migrations/0020_add-verbose-name.py | 17 +++++++++++++++++ wagtail/images/models.py | 4 ++++ wagtail/search/apps.py | 3 ++- wagtail/sites/apps.py | 3 ++- wagtail/snippets/apps.py | 3 ++- wagtail/tests/modeladmintest/apps.py | 3 ++- wagtail/tests/routablepage/apps.py | 3 ++- wagtail/tests/search/apps.py | 3 ++- wagtail/tests/snippets/apps.py | 3 ++- wagtail/tests/testapp/apps.py | 3 ++- wagtail/users/apps.py | 3 ++- 26 files changed, 69 insertions(+), 24 deletions(-) create mode 100644 wagtail/images/migrations/0020_add-verbose-name.py diff --git a/wagtail/admin/apps.py b/wagtail/admin/apps.py index 7f1f928ce..a5536a9b5 100644 --- a/wagtail/admin/apps.py +++ b/wagtail/admin/apps.py @@ -1,4 +1,5 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ from . import checks # NOQA @@ -6,4 +7,4 @@ from . import checks # NOQA class WagtailAdminAppConfig(AppConfig): name = 'wagtail.admin' label = 'wagtailadmin' - verbose_name = "Wagtail admin" + verbose_name = _("Wagtail admin") diff --git a/wagtail/api/v2/apps.py b/wagtail/api/v2/apps.py index a065df263..f999923c8 100644 --- a/wagtail/api/v2/apps.py +++ b/wagtail/api/v2/apps.py @@ -1,12 +1,13 @@ from django.apps import AppConfig, apps from django.conf import settings from django.core.exceptions import ImproperlyConfigured +from django.utils.translation import ugettext_lazy as _ class WagtailAPIV2AppConfig(AppConfig): name = 'wagtail.api.v2' label = 'wagtailapi_v2' - verbose_name = "Wagtail API v2" + verbose_name = _("Wagtail API v2") def ready(self): # Install cache purging signal handlers diff --git a/wagtail/contrib/forms/apps.py b/wagtail/contrib/forms/apps.py index 259e7c0b4..2affe9425 100644 --- a/wagtail/contrib/forms/apps.py +++ b/wagtail/contrib/forms/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailFormsAppConfig(AppConfig): name = 'wagtail.contrib.forms' label = 'wagtailforms' - verbose_name = "Wagtail forms" + verbose_name = _("Wagtail forms") diff --git a/wagtail/contrib/frontend_cache/apps.py b/wagtail/contrib/frontend_cache/apps.py index 0484c8b65..875773451 100644 --- a/wagtail/contrib/frontend_cache/apps.py +++ b/wagtail/contrib/frontend_cache/apps.py @@ -1,4 +1,5 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ from wagtail.contrib.frontend_cache.signal_handlers import register_signal_handlers @@ -6,7 +7,7 @@ from wagtail.contrib.frontend_cache.signal_handlers import register_signal_handl class WagtailFrontendCacheAppConfig(AppConfig): name = 'wagtail.contrib.frontend_cache' label = 'wagtailfrontendcache' - verbose_name = "Wagtail frontend cache" + verbose_name = _("Wagtail frontend cache") def ready(self): register_signal_handlers() diff --git a/wagtail/contrib/modeladmin/apps.py b/wagtail/contrib/modeladmin/apps.py index f19487aa9..64e6b4d9d 100644 --- a/wagtail/contrib/modeladmin/apps.py +++ b/wagtail/contrib/modeladmin/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailModelAdminAppConfig(AppConfig): name = 'wagtail.contrib.modeladmin' label = 'wagtailmodeladmin' - verbose_name = "Wagtail ModelAdmin" + verbose_name = _("Wagtail ModelAdmin") diff --git a/wagtail/contrib/redirects/apps.py b/wagtail/contrib/redirects/apps.py index 80cb32e2a..42155d415 100644 --- a/wagtail/contrib/redirects/apps.py +++ b/wagtail/contrib/redirects/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailRedirectsAppConfig(AppConfig): name = 'wagtail.contrib.redirects' label = 'wagtailredirects' - verbose_name = "Wagtail redirects" + verbose_name = _("Wagtail redirects") diff --git a/wagtail/contrib/routable_page/apps.py b/wagtail/contrib/routable_page/apps.py index ae7d1c808..ffc32af90 100644 --- a/wagtail/contrib/routable_page/apps.py +++ b/wagtail/contrib/routable_page/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailRoutablePageAppConfig(AppConfig): name = 'wagtail.contrib.routable_page' label = 'wagtailroutablepage' - verbose_name = "Wagtail routablepage" + verbose_name = _("Wagtail routablepage") diff --git a/wagtail/contrib/search_promotions/apps.py b/wagtail/contrib/search_promotions/apps.py index 370903d22..45c376eb7 100644 --- a/wagtail/contrib/search_promotions/apps.py +++ b/wagtail/contrib/search_promotions/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailSearchPromotionsAppConfig(AppConfig): name = 'wagtail.contrib.search_promotions' label = 'wagtailsearchpromotions' - verbose_name = "Wagtail search promotions" + verbose_name = _("Wagtail search promotions") diff --git a/wagtail/contrib/sitemaps/apps.py b/wagtail/contrib/sitemaps/apps.py index aff68e44c..e202c5547 100644 --- a/wagtail/contrib/sitemaps/apps.py +++ b/wagtail/contrib/sitemaps/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailSitemapsAppConfig(AppConfig): name = 'wagtail.contrib.sitemaps' label = 'wagtailsitemaps' - verbose_name = "Wagtail sitemaps" + verbose_name = _("Wagtail sitemaps") diff --git a/wagtail/contrib/styleguide/apps.py b/wagtail/contrib/styleguide/apps.py index 92cce2f10..77ae4d36a 100644 --- a/wagtail/contrib/styleguide/apps.py +++ b/wagtail/contrib/styleguide/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailStyleGuideAppConfig(AppConfig): name = 'wagtail.contrib.styleguide' label = 'wagtailstyleguide' - verbose_name = "Wagtail style guide" + verbose_name = _("Wagtail style guide") diff --git a/wagtail/contrib/table_block/apps.py b/wagtail/contrib/table_block/apps.py index 43a5e5fe6..3b9e7241a 100644 --- a/wagtail/contrib/table_block/apps.py +++ b/wagtail/contrib/table_block/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailTableBlockAppConfig(AppConfig): name = 'wagtail.contrib.table_block' label = 'wagtailtableblock' - verbose_name = "Wagtail table block" + verbose_name = _("Wagtail table block") diff --git a/wagtail/core/apps.py b/wagtail/core/apps.py index dd6ee6943..5fbefbea3 100644 --- a/wagtail/core/apps.py +++ b/wagtail/core/apps.py @@ -1,10 +1,11 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailCoreAppConfig(AppConfig): name = 'wagtail.core' label = 'wagtailcore' - verbose_name = "Wagtail core" + verbose_name = _("Wagtail core") def ready(self): from wagtail.core.signal_handlers import register_signal_handlers diff --git a/wagtail/documents/apps.py b/wagtail/documents/apps.py index a48788924..0b2532da4 100644 --- a/wagtail/documents/apps.py +++ b/wagtail/documents/apps.py @@ -1,10 +1,11 @@ from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ class WagtailDocsAppConfig(AppConfig): name = 'wagtail.documents' label = 'wagtaildocs' - verbose_name = "Wagtail documents" + verbose_name = _("Wagtail documents") def ready(self): from wagtail.documents.signal_handlers import register_signal_handlers diff --git a/wagtail/embeds/apps.py b/wagtail/embeds/apps.py index c320eaaa3..68e5c43d0 100644 --- a/wagtail/embeds/apps.py +++ b/wagtail/embeds/apps.py @@ -1,4 +1,5 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ from .finders import get_finders @@ -6,7 +7,7 @@ from .finders import get_finders class WagtailEmbedsAppConfig(AppConfig): name = 'wagtail.embeds' label = 'wagtailembeds' - verbose_name = "Wagtail embeds" + verbose_name = _("Wagtail embeds") def ready(self): # Check configuration on startup diff --git a/wagtail/images/apps.py b/wagtail/images/apps.py index e71979633..f17cb248f 100644 --- a/wagtail/images/apps.py +++ b/wagtail/images/apps.py @@ -1,4 +1,5 @@ from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ from . import checks # NOQA @@ -6,7 +7,7 @@ from . import checks # NOQA class WagtailImagesAppConfig(AppConfig): name = 'wagtail.images' label = 'wagtailimages' - verbose_name = "Wagtail images" + verbose_name = _("Wagtail images") def ready(self): from wagtail.images.signal_handlers import register_signal_handlers diff --git a/wagtail/images/migrations/0020_add-verbose-name.py b/wagtail/images/migrations/0020_add-verbose-name.py new file mode 100644 index 000000000..43f7c42d3 --- /dev/null +++ b/wagtail/images/migrations/0020_add-verbose-name.py @@ -0,0 +1,17 @@ +# Generated by Django 2.0.3 on 2018-03-17 17:29 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailimages', '0019_delete_filter'), + ] + + operations = [ + migrations.AlterModelOptions( + name='image', + options={'verbose_name': 'image', 'verbose_name_plural': 'images'}, + ), + ] diff --git a/wagtail/images/models.py b/wagtail/images/models.py index 195da74b6..dabfeeaff 100644 --- a/wagtail/images/models.py +++ b/wagtail/images/models.py @@ -327,6 +327,10 @@ class Image(AbstractImage): 'focal_point_height', ) + class Meta: + verbose_name = _('image') + verbose_name_plural = _('images') + class Filter: """ diff --git a/wagtail/search/apps.py b/wagtail/search/apps.py index 3ea706be0..36d1d500b 100644 --- a/wagtail/search/apps.py +++ b/wagtail/search/apps.py @@ -1,4 +1,5 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ from wagtail.search.signal_handlers import register_signal_handlers @@ -6,7 +7,7 @@ from wagtail.search.signal_handlers import register_signal_handlers class WagtailSearchAppConfig(AppConfig): name = 'wagtail.search' label = 'wagtailsearch' - verbose_name = "Wagtail search" + verbose_name = _("Wagtail search") def ready(self): register_signal_handlers() diff --git a/wagtail/sites/apps.py b/wagtail/sites/apps.py index fd74f22b1..3674d6198 100644 --- a/wagtail/sites/apps.py +++ b/wagtail/sites/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailSitesAppConfig(AppConfig): name = 'wagtail.sites' label = 'wagtailsites' - verbose_name = "Wagtail sites" + verbose_name = _("Wagtail sites") diff --git a/wagtail/snippets/apps.py b/wagtail/snippets/apps.py index 4390eba25..7b987f4ff 100644 --- a/wagtail/snippets/apps.py +++ b/wagtail/snippets/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ class WagtailSnippetsAppConfig(AppConfig): name = 'wagtail.snippets' label = 'wagtailsnippets' - verbose_name = "Wagtail snippets" + verbose_name = _("Wagtail snippets") diff --git a/wagtail/tests/modeladmintest/apps.py b/wagtail/tests/modeladmintest/apps.py index 7267f79cc..6f02c5e08 100644 --- a/wagtail/tests/modeladmintest/apps.py +++ b/wagtail/tests/modeladmintest/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailTestsAppConfig(AppConfig): name = 'wagtail.tests.modeladmintest' label = 'test_modeladmintest' - verbose_name = "Test Wagtail Model Admin" + verbose_name = _("Test Wagtail Model Admin") diff --git a/wagtail/tests/routablepage/apps.py b/wagtail/tests/routablepage/apps.py index 8a9f69be8..a2e4734f8 100644 --- a/wagtail/tests/routablepage/apps.py +++ b/wagtail/tests/routablepage/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailRoutablePageTestsAppConfig(AppConfig): name = 'wagtail.tests.routablepage' label = 'routablepagetests' - verbose_name = "Wagtail routable page tests" + verbose_name = _("Wagtail routable page tests") diff --git a/wagtail/tests/search/apps.py b/wagtail/tests/search/apps.py index a8e8c5ee3..df1c33fa4 100644 --- a/wagtail/tests/search/apps.py +++ b/wagtail/tests/search/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailSearchTestsAppConfig(AppConfig): name = 'wagtail.tests.search' label = 'searchtests' - verbose_name = "Wagtail search tests" + verbose_name = _("Wagtail search tests") diff --git a/wagtail/tests/snippets/apps.py b/wagtail/tests/snippets/apps.py index 26004ec2b..6bbe771b3 100644 --- a/wagtail/tests/snippets/apps.py +++ b/wagtail/tests/snippets/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailSnippetsTestsAppConfig(AppConfig): name = 'wagtail.tests.snippets' label = 'snippetstests' - verbose_name = "Wagtail snippets tests" + verbose_name = _("Wagtail snippets tests") diff --git a/wagtail/tests/testapp/apps.py b/wagtail/tests/testapp/apps.py index 8dedd7f25..223fef622 100644 --- a/wagtail/tests/testapp/apps.py +++ b/wagtail/tests/testapp/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailTestsAppConfig(AppConfig): name = 'wagtail.tests.testapp' label = 'tests' - verbose_name = "Wagtail tests" + verbose_name = _("Wagtail tests") diff --git a/wagtail/users/apps.py b/wagtail/users/apps.py index 65eddd568..a874be125 100644 --- a/wagtail/users/apps.py +++ b/wagtail/users/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ class WagtailUsersAppConfig(AppConfig): name = 'wagtail.users' label = 'wagtailusers' - verbose_name = "Wagtail users" + verbose_name = _("Wagtail users")