--- a/src/pyams_content/shared/site/zmi/manager.py Fri Sep 21 12:16:39 2018 +0200
+++ b/src/pyams_content/shared/site/zmi/manager.py Fri Sep 21 14:51:25 2018 +0200
@@ -16,13 +16,14 @@
from pyramid.path import DottedNameResolver
from z3c.form import field
from z3c.form.interfaces import IDataExtractedEvent
-from zope.interface import Invalid, Interface
+from zope.interface import Interface, Invalid
+from pyams_content import _
from pyams_content.interfaces import MANAGE_SITE_ROOT_PERMISSION, MANAGE_TOOL_PERMISSION
from pyams_content.root.interfaces import ISiteRoot
from pyams_content.shared.common import IBaseSharedTool
from pyams_content.shared.common.zmi.manager import SharedToolPropertiesEditForm
-from pyams_content.shared.site import WfTopic
+from pyams_content.shared.site import WfSiteTopic
from pyams_content.shared.site.interfaces import ISiteManager, ISiteManagerFactory
from pyams_content.shared.site.manager import SiteManager
from pyams_content.skin.zmi.interfaces import ISiteTreeTable, IUserAddingsMenuLabel
@@ -30,12 +31,12 @@
from pyams_i18n.interfaces import II18n, INegotiator
from pyams_pagelet.pagelet import pagelet_config
from pyams_skin.interfaces.container import ITableElementEditor, ITableElementName
-from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, IBreadcrumbItem, IMenuHeader
+from pyams_skin.interfaces.viewlet import IBreadcrumbItem, IMenuHeader, IToolbarAddingMenu
from pyams_skin.layer import IPyAMSLayer
from pyams_skin.table import DefaultElementEditorAdapter
from pyams_skin.viewlet.breadcrumb import BreadcrumbAdminLayerItem
from pyams_skin.viewlet.toolbar import ToolbarMenuItem
-from pyams_utils.adapter import adapter_config, ContextRequestAdapter
+from pyams_utils.adapter import ContextRequestAdapter, adapter_config
from pyams_utils.registry import query_utility
from pyams_utils.unicode import translate_string
from pyams_utils.url import absolute_url
@@ -44,8 +45,6 @@
from pyams_zmi.interfaces.menu import ISiteManagementMenu
from pyams_zmi.layer import IAdminLayer
-from pyams_content import _
-
@adapter_config(context=(ISiteManager, ISiteManagementMenu), provides=IMenuHeader)
class SiteManagerSiteManagementMenuHeader(ContextRequestAdapter):
@@ -97,7 +96,7 @@
@property
def label(self):
return '{content} ({site})'.format(
- content=self.request.localizer.translate(WfTopic.content_name),
+ content=self.request.localizer.translate(WfSiteTopic.content_name),
site=II18n(self.context).query_attribute('title', request=self.request))