Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-03-16 22:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename wagtail/admin/locale.py to localization.py

Browse source 
Having a module called locale interferes with Django's makemessages / compilemessages commands :-(
This commit is contained in:
Matt Westcott 2019-10-16 16:03:20 +01:00 committed by Matt Westcott
parent 8335eb5305
commit 142e133209
7 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
docs/releases/2.7.rst
View file

@ -134,42 +134,42 @@ Any add-on library that uses this feature and needs to preserve backward compati
The modules ``wagtail.admin.utils`` and ``wagtail.admin.decorators`` have been deprecated. The helper functions defined here exist primarily for Wagtail's internal use; however, some of them (particularly ``send_mail`` and ``permission_required``) may be found in user code, and import lines will need to be updated. The new locations for these definitions are as follows:
+---------------------------------+--------------------------+--------------------------+
| Definition | Old location | New location |
+=================================+==========================+==========================+
| any_permission_required | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+--------------------------+
| permission_denied | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+--------------------------+
| permission_required | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+--------------------------+
| PermissionPolicyChecker | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+--------------------------+
| user_has_any_page_permission | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+--------------------------+
| user_passes_test | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+--------------------------+
| users_with_page_permission | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+--------------------------+
| reject_request | wagtail.admin.decorators | wagtail.admin.auth |
+---------------------------------+--------------------------+--------------------------+
| require_admin_access | wagtail.admin.decorators | wagtail.admin.auth |
+---------------------------------+--------------------------+--------------------------+
| get_available_admin_languages | wagtail.admin.utils | wagtail.admin.locale |
+---------------------------------+--------------------------+--------------------------+
| get_available_admin_time_zones | wagtail.admin.utils | wagtail.admin.locale |
+---------------------------------+--------------------------+--------------------------+
| get_js_translation_strings | wagtail.admin.utils | wagtail.admin.locale |
+---------------------------------+--------------------------+--------------------------+
| WAGTAILADMIN_PROVIDED_LANGUAGES | wagtail.admin.utils | wagtail.admin.locale |
+---------------------------------+--------------------------+--------------------------+
| send_mail | wagtail.admin.utils | wagtail.admin.mail |
+---------------------------------+--------------------------+--------------------------+
| send_notification | wagtail.admin.utils | wagtail.admin.mail |
+---------------------------------+--------------------------+--------------------------+
| get_object_usage | wagtail.admin.utils | wagtail.admin.models |
+---------------------------------+--------------------------+--------------------------+
| popular_tags_for_model | wagtail.admin.utils | wagtail.admin.models |
+---------------------------------+--------------------------+--------------------------+
| get_site_for_user | wagtail.admin.utils | wagtail.admin.navigation |
+---------------------------------+--------------------------+--------------------------+
+---------------------------------+--------------------------+----------------------------+
| Definition | Old location | New location |
+=================================+==========================+============================+
| any_permission_required | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+----------------------------+
| permission_denied | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+----------------------------+
| permission_required | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+----------------------------+
| PermissionPolicyChecker | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+----------------------------+
| user_has_any_page_permission | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+----------------------------+
| user_passes_test | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+----------------------------+
| users_with_page_permission | wagtail.admin.utils | wagtail.admin.auth |
+---------------------------------+--------------------------+----------------------------+
| reject_request | wagtail.admin.decorators | wagtail.admin.auth |
+---------------------------------+--------------------------+----------------------------+
| require_admin_access | wagtail.admin.decorators | wagtail.admin.auth |
+---------------------------------+--------------------------+----------------------------+
| get_available_admin_languages | wagtail.admin.utils | wagtail.admin.localization |
+---------------------------------+--------------------------+----------------------------+
| get_available_admin_time_zones | wagtail.admin.utils | wagtail.admin.localization |
+---------------------------------+--------------------------+----------------------------+
| get_js_translation_strings | wagtail.admin.utils | wagtail.admin.localization |
+---------------------------------+--------------------------+----------------------------+
| WAGTAILADMIN_PROVIDED_LANGUAGES | wagtail.admin.utils | wagtail.admin.localization |
+---------------------------------+--------------------------+----------------------------+
| send_mail | wagtail.admin.utils | wagtail.admin.mail |
+---------------------------------+--------------------------+----------------------------+
| send_notification | wagtail.admin.utils | wagtail.admin.mail |
+---------------------------------+--------------------------+----------------------------+
| get_object_usage | wagtail.admin.utils | wagtail.admin.models |
+---------------------------------+--------------------------+----------------------------+
| popular_tags_for_model | wagtail.admin.utils | wagtail.admin.models |
+---------------------------------+--------------------------+----------------------------+
| get_site_for_user | wagtail.admin.utils | wagtail.admin.navigation |
+---------------------------------+--------------------------+----------------------------+

0
wagtail/admin/locale.py → wagtail/admin/localization.py
View file

2
wagtail/admin/templatetags/wagtailadmin_tags.py
View file

@ -15,7 +15,7 @@ from django.utils.html import format_html, format_html_join
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from wagtail.admin.locale import get_js_translation_strings
from wagtail.admin.localization import get_js_translation_strings
from wagtail.admin.menu import admin_menu
from wagtail.admin.navigation import get_explorable_root_page
from wagtail.admin.search import admin_search_areas

2
wagtail/admin/tests/test_account_management.py
View file

@ -13,7 +13,7 @@ from django.test import TestCase, override_settings
from django.urls import reverse
from django.utils.translation import get_language
from wagtail.admin.locale import (
from wagtail.admin.localization import (
WAGTAILADMIN_PROVIDED_LANGUAGES, get_available_admin_languages, get_available_admin_time_zones)
from wagtail.tests.utils import WagtailTestUtils
from wagtail.users.models import UserProfile

8
wagtail/admin/utils.py
View file

@ -4,10 +4,10 @@ from wagtail.utils.deprecation import MovedDefinitionHandler, RemovedInWagtail29
MOVED_DEFINITIONS = {
'WAGTAILADMIN_PROVIDED_LANGUAGES': 'wagtail.admin.locale',
'get_js_translation_strings': 'wagtail.admin.locale',
'get_available_admin_languages': 'wagtail.admin.locale',
'get_available_admin_time_zones': 'wagtail.admin.locale',
'WAGTAILADMIN_PROVIDED_LANGUAGES': 'wagtail.admin.localization',
'get_js_translation_strings': 'wagtail.admin.localization',
'get_available_admin_languages': 'wagtail.admin.localization',
'get_available_admin_time_zones': 'wagtail.admin.localization',
'get_object_usage': 'wagtail.admin.models',
'popular_tags_for_model': 'wagtail.admin.models',

2
wagtail/admin/wagtail_hooks.py
View file

@ -6,7 +6,7 @@ from draftjs_exporter.dom import DOM
import wagtail.admin.rich_text.editors.draftail.features as draftail_features
from wagtail.admin.auth import user_has_any_page_permission
from wagtail.admin.locale import get_available_admin_languages, get_available_admin_time_zones
from wagtail.admin.localization import get_available_admin_languages, get_available_admin_time_zones
from wagtail.admin.menu import MenuItem, SubmenuMenuItem, settings_menu
from wagtail.admin.navigation import get_explorable_root_page
from wagtail.admin.rich_text import (

2
wagtail/users/forms.py
View file

@ -14,7 +14,7 @@ from django.template.loader import render_to_string
from django.utils.html import mark_safe
from django.utils.translation import ugettext_lazy as _
from wagtail.admin.locale import get_available_admin_languages, get_available_admin_time_zones
from wagtail.admin.localization import get_available_admin_languages, get_available_admin_time_zones
from wagtail.admin.widgets import AdminPageChooser
from wagtail.core import hooks
from wagtail.core.models import (