Skip to content

Commit

Permalink
fix plone.schemaeditor i18n factory import. This fixes 5.0.1 support
Browse files Browse the repository at this point in the history
  • Loading branch information
vangheem committed Dec 18, 2015
1 parent 2935ddb commit c958d9e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
8 changes: 8 additions & 0 deletions CHANGES.rst
@@ -1,6 +1,14 @@
Changelog
=========

1.0a4 (unreleased)
------------------

Fixes:

- fix plone.schemaeditor i18n factory import. This fixes 5.0.1 support


1.0a3 (2015-06-02)
------------------

Expand Down
6 changes: 5 additions & 1 deletion collective/easyform/browser/fields.py
Expand Up @@ -11,7 +11,6 @@
from collective.easyform.interfaces import IEasyFormFieldsEditorExtender
from json import dumps
from lxml import etree
from plone.schemaeditor import SchemaEditorMessageFactory as __
from plone.schemaeditor.browser.field.edit import EditView
from plone.schemaeditor.browser.field.edit import FieldEditForm
from plone.schemaeditor.browser.field.traversal import FieldContext
Expand All @@ -26,6 +25,11 @@
from zope.component import queryMultiAdapter
from zope.interface import implements

try:
from plone.schemaeditor import SchemaEditorMessageFactory as __
except ImportError:
from plone.schemaeditor import _ as __

try:
import plone.resourceeditor
plone.resourceeditor # avoid PEP 8 warning
Expand Down
6 changes: 5 additions & 1 deletion collective/easyform/interfaces.py
Expand Up @@ -24,7 +24,6 @@
from plone.autoform.directives import read_permission
from plone.autoform.directives import widget
from plone.autoform.directives import write_permission
from plone.schemaeditor import SchemaEditorMessageFactory as __
from plone.schemaeditor.interfaces import ID_RE
from plone.schemaeditor.interfaces import IFieldContext
from plone.schemaeditor.interfaces import IFieldEditorExtender
Expand All @@ -51,6 +50,11 @@
from zope.schema.interfaces import ITextLine
from zope.tales.tales import CompilerError

try:
from plone.schemaeditor import SchemaEditorMessageFactory as __
except ImportError:
from plone.schemaeditor import _ as __

PMF = MessageFactory('plone')
MODIFY_PORTAL_CONTENT = 'cmf.ModifyPortalContent'

Expand Down

0 comments on commit c958d9e

Please sign in to comment.