8000 Use Django's language override · django-cms/django-cms@190c024 · GitHub
[go: up one dir, main page]
Skip to content

Commit 190c024

Browse files
czpythonczpython
committed
Use Django's language override
1 parent 1980431 commit 190c024

File tree

14 files changed

+25
-21
lines changed
Expand file tree

14 files changed

+25
-21
lines changed

‎cms/cms_menus.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
from django.core.urlresolvers import reverse
33
from django.db.models.query import Prefetch, prefetch_related_objects
44
from django.utils.functional import SimpleLazyObject
5+
from django.utils.translation import override as force_language
56

67
from cms import constants
78
from cms.apphook_pool import apphook_pool
89
from cms.models import EmptyTitle
9-
from cms.utils import i18n
1010
from cms.utils.compat import DJANGO_1_9
1111
from cms.utils.conf import get_cms_setting
1212
from cms.utils.i18n import (
@@ -190,7 +190,7 @@ def _get_absolute_url(self):
190190

191191
def get_absolute_url(self):
192192
if self.language:
193-
with i18n.force_language(self.language):
193+
with force_language(self.language):
194194
return self._get_absolute_url()
195195
return self._get_absolute_url()
196196

‎cms/cms_toolbars.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from django.contrib.auth.models import AnonymousUser
66
from django.core.urlresolvers import reverse, NoReverseMatch, resolve, Resolver404
77
from django.db.models import Q
8-
from django.utils.translation import ugettext_lazy as _
8+
from django.utils.translation import override as force_language, ugettext_lazy as _
99

1010
from cms.api import get_page_draft, can_change_page
1111
from cms.constants import TEMPLATE_INHERITANCE_MAGIC, PUBLISHER_STATE_PENDING
@@ -15,7 +15,7 @@
1515
from cms.toolbar_pool import toolbar_pool
1616
from cms.utils import get_language_from_request, page_permissions
1717
from cms.utils.conf import get_cms_setting
18-
from cms.utils.i18n import get_language_tuple, force_language, get_language_dict
18+
from cms.utils.i18n import get_language_tuple, get_language_dict
1919
from cms.utils.permissions import get_user_sites_queryset
2020
from cms.utils.page_permissions import (
2121
user_can_change_page,

‎cms/models/pagemodel.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
from django.utils.encoding import force_text, python_2_unicode_compatible
1313
from django.utils.functional import cached_property
1414
from django.utils.timezone import now
15-
from django.utils.translation import get_language, ugettext_lazy as _
15+
from django.utils.translation import (
16+
get_language,
17+
override as force_language,
18+
ugettext_lazy as _,
19+
)
1620

1721
from cms import constants
1822
from cms.constants import PUBLISHER_STATE_DEFAULT, PUBLISHER_STATE_PENDING, PUBLISHER_STATE_DIRTY, TEMPLATE_INHERITANCE_MAGIC
@@ -23,6 +27,7 @@
2327
from cms.utils.conf import get_cms_setting
2428
from cms.utils.page import get_clean_username
2529
from cms.utils.helpers import reversion_register
30+
from cms.utils.i18n import get_current_language
2631

2732
from menus.menu_pool import menu_pool
2833

@@ -347,8 +352,9 @@ def is_potential_home(self):
347352

348353
def get_absolute_url(self, language=None, fallback=True):
349354
if not language:
350-
language = get_language()
351-
with i18n.force_language(language):
355+
language = get_current_language()
356+
357+
with force_language(language):
352358
if self.is_home:
353359
return reverse('pages-root')
354360
path = self.get_path(language, fallback) or self.get_slug(language, fallback)

‎cms/templatetags/cms_tags.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from django.utils.html import escape
1717
from django.utils.http import urlencode
1818
from django.utils.six import string_types
19-
from django.utils.translation import ugettext_lazy as _, get_language
19+
from django.utils.translation import get_language, override as force_language, ugettext_lazy as _
2020

2121
from classytags.arguments import (Argument, MultiValueArgument,
2222
MultiKeywordArgument)
@@ -33,7 +33,6 @@
3333
from cms.toolbar.utils import get_toolbar_from_request
3434
from cms.utils import get_current_site, get_language_from_request, get_site_id
3535
from cms.utils.compat.dj import get_middleware
36-
from cms.utils.i18n import force_language
3736
from cms.utils.moderator import use_draft
3837
from cms.utils.page import get_page_queryset
3938
from cms.utils.placeholder import validate_placeholder_name

‎cms/tests/test_apphooks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from django.test.utils import override_settings
1212
from django.utils import six
1313
from django.utils.timezone import now
14+
from django.utils.translation import override as force_language
1415

1516
from cms.admin.forms import AdvancedSettingsForm
1617
from cms.api import create_page, create_title
@@ -24,7 +25,6 @@
2425
from cms.tests.test_menu_utils import DumbPageLanguageUrl
2526
from cms.toolbar.toolbar import CMSToolbar
2627
from cms.utils.conf import get_cms_setting
27-
from cms.utils.i18n import force_language
2828
from cms.utils.urlutils import admin_reverse
2929
from menus.menu_pool import menu_pool
3030
from menus.utils import DefaultLanguageChanger

‎cms/tests/test_forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from django.contrib.auth import get_user_model
33
from django.contrib.sites.models import Site
44
from django.core.cache import cache
5+
from django.utils.translation import override as force_language
56

67
from cms.admin import forms
78
from cms.admin.forms import (PagePermissionInlineAdminForm,
@@ -18,7 +19,6 @@
1819
CMSTestCase, URL_CMS_PAGE_PERMISSION_CHANGE, URL_CMS_PAGE_PERMISSIONS
1920
)
2021
from cms.utils import get_current_site
21-
from cms.utils.i18n import force_language
2222

2323

2424
class Mock_PageSelectFormField(PageSelectFormField):

‎cms/tests/test_menu.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from django.template import Template, TemplateSyntaxError
99
from django.template.context import Context
1010
from django.test.utils import override_settings
11-
from django.utils.translation import activate
11+
from django.utils.translation import activate, override as force_language
1212
from cms.apphook_pool import apphook_pool
1313
from menus.base import NavigationNode
1414
from menus.menu_pool import menu_pool, _build_nodes_inner_for_one_menu
@@ -27,7 +27,6 @@
2727
from cms.test_utils.util.mock import AttributeObject
2828
from cms.utils import get_current_site
2929
from cms.utils.conf import get_cms_setting
30-
from cms.utils.i18n import force_language
3130

3231

3332
class BaseMenuTest(CMSTestCase):

‎cms/tests/test_page.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from django.core.urlresolvers import reverse
1212
from django.http import HttpResponse, HttpResponseNotFound
1313
from django.utils.timezone import now as tz_now
14+
from django.utils.translation import override as force_language
1415

1516
from cms import constants
1617
from cms.api import create_page, add_plugin, create_title, publish_page
@@ -22,7 +23,6 @@
2223
from cms.sitemaps import CMSSitemap
2324
from cms.test_utils.testcases import CMSTestCase, TransactionCMSTestCase
2425
from cms.utils.conf import get_cms_setting
25-
from cms.utils.i18n import force_language
2626
from cms.utils.page import (
2727
get_available_slug,
2828
get_current_site,

‎cms/tests/test_page_admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from django.utils import six
1212
from django.utils.encoding import force_text
1313
from django.utils.timezone import now as tz_now
14+
from django.utils.translation import override as force_language
1415

1516
from cms import constants
1617
from cms.admin.pageadmin import PageAdmin
@@ -28,7 +29,6 @@
2829
from cms.test_utils.util.context_managers import LanguageOverride, UserLoginContext
2930
from cms.utils.conf import get_cms_setting
3031
from cms.utils.compat.dj import installed_apps
31-
from cms.utils.i18n import force_language
3232
from cms.utils.page import get_page_from_request
3333
from cms.utils.urlutils import admin_reverse
3434

‎cms/tests/test_permmod.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from django.db.models import Q
1111
from django.test.client import RequestFactory
1212
from django.test.utils import override_settings
13+
from django.utils.translation import override as force_language
1314

1415
from cms.api import (add_plugin, assign_user_to_page, create_page,
1516
create_page_user, publish_page)
@@ -26,7 +27,6 @@
2627
from cms.test_utils.util.context_managers import disable_logger
2728
from cms.test_utils.util.fuzzy_int import FuzzyInt
2829
from cms.utils import get_current_site
29-
from cms.utils.i18n import force_language
3030
from cms.utils.page import get_page_from_path
3131
from cms.utils.page_permissions import user_can_publish_page, user_can_view_page
3232

0 commit comments

Comments
 (0)
0