-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: plone.app.multilingual
Branch: refs/heads/master Date: 2016-11-21T14:05:01+01:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/plone.app.multilingual@6fcc23c Allow to work in an Archtypes free Plone 5.1. Files changed: M CHANGES.rst M src/plone/app/multilingual/browser/helper_views.py Repository: plone.app.multilingual Branch: refs/heads/master Date: 2016-11-21T17:25:32+01:00 Author: agitator (agitator) <hpeter@agitator.com> Commit: plone/plone.app.multilingual@033e9f1 Merge pull request #253 from plone/jensens-fix-wo-at Allow to work in an Archtypes free Plone 5.1. Files changed: M CHANGES.rst M src/plone/app/multilingual/browser/helper_views.py
- Loading branch information
Showing
1 changed file
with
89 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,114 @@ | ||
| Repository: plone.api | ||
| Repository: plone.app.multilingual | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2016-11-13T21:19:53+01:00 | ||
| Author: Gil Forcada (gforcada) <gil.gnome@gmail.com> | ||
| Commit: https://github.com/plone/plone.api/commit/163c918e753f9e049395bf754da3e041bbfb3b5b | ||
| Date: 2016-11-21T14:05:01+01:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/plone.app.multilingual/commit/6fcc23c4a90da4d6e3a6dbfd4c5f064f112c3b9f | ||
|
|
||
| Remove getIcon usage | ||
|
|
||
| It was already deprecated and finally it has been removed. | ||
| Allow to work in an Archtypes free Plone 5.1. | ||
|
|
||
| Files changed: | ||
| M docs/CHANGES.rst | ||
| M src/plone/api/tests/test_content.py | ||
|
|
||
| diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst | ||
| index 3bd3a1c..11a5d1a 100644 | ||
| --- a/docs/CHANGES.rst | ||
| +++ b/docs/CHANGES.rst | ||
| @@ -32,6 +32,9 @@ Fixes: | ||
| - In api.content.move if source **and** target are specified and target is already | ||
| source parent, skip the operation. | ||
| M CHANGES.rst | ||
| M src/plone/app/multilingual/browser/helper_views.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index e45c27f..a502afe 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -14,7 +14,8 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| -- *add item here* | ||
| +- Allow to work in an Archtypes free Plone 5.1. | ||
| + [jensens] | ||
|
|
||
|
|
||
| 5.0 (2016-11-17) | ||
| diff --git a/src/plone/app/multilingual/browser/helper_views.py b/src/plone/app/multilingual/browser/helper_views.py | ||
| index 9ecf3ba..a379c45 100644 | ||
| --- a/src/plone/app/multilingual/browser/helper_views.py | ||
| +++ b/src/plone/app/multilingual/browser/helper_views.py | ||
| @@ -21,13 +21,20 @@ | ||
| from zope.component import getUtility | ||
| from zope.component.hooks import getSite | ||
| from zope.interface import implementer | ||
| +from zope.interface import Interface | ||
| from zope.publisher.interfaces import IPublishTraverse | ||
| from zope.publisher.interfaces import NotFound | ||
|
|
||
| +- Fix test | ||
| + [gforcada] | ||
| try: | ||
| from Products.ATContentTypes.interfaces.factory import IFactoryTool | ||
| except ImportError: | ||
| - from Products.CMFPlone.interfaces.factory import IFactoryTool | ||
| + try: | ||
| + from Products.CMFPlone.interfaces.factory import IFactoryTool | ||
| + except ImportError: | ||
| + # gone in Plone 5.1 w/o ATCT | ||
| + | ||
| 1.5 (2016-02-20) | ||
| ---------------- | ||
| + class IFactoryTool(Interface): | ||
| + pass | ||
|
|
||
| diff --git a/src/plone/api/tests/test_content.py b/src/plone/api/tests/test_content.py | ||
| index 8e0f269..b9e3629 100644 | ||
| --- a/src/plone/api/tests/test_content.py | ||
| +++ b/src/plone/api/tests/test_content.py | ||
| @@ -964,7 +964,7 @@ def test_get_view(self): | ||
| ) | ||
| self.assertEqual(aq_base(view.context), aq_base(self.blog)) | ||
| self.assertEqual(view.__name__, 'plone') | ||
| - self.assertTrue(hasattr(view, 'getIcon')) | ||
| + self.assertTrue(hasattr(view, 'toLocalizedTime')) | ||
|
|
||
| # Try another standard view. | ||
| view = api.content.get_view( | ||
| @implementer(IPublishTraverse) | ||
|
|
||
|
|
||
| Repository: plone.api | ||
| Repository: plone.app.multilingual | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2016-11-13T23:31:33+01:00 | ||
| Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> | ||
| Commit: https://github.com/plone/plone.api/commit/e0bc9cd80f1a88840c9bcd8f207926f687570485 | ||
| Date: 2016-11-21T17:25:32+01:00 | ||
| Author: agitator (agitator) <hpeter@agitator.com> | ||
| Commit: https://github.com/plone/plone.app.multilingual/commit/033e9f10b4565487dc6dafa1aa3ef3a7b3c6b65a | ||
|
|
||
| Merge pull request #335 from plone/gforcada-patch-1 | ||
| Merge pull request #253 from plone/jensens-fix-wo-at | ||
|
|
||
| Remove getIcon usage | ||
| Allow to work in an Archtypes free Plone 5.1. | ||
|
|
||
| Files changed: | ||
| M docs/CHANGES.rst | ||
| M src/plone/api/tests/test_content.py | ||
|
|
||
| diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst | ||
| index 3bd3a1c..11a5d1a 100644 | ||
| --- a/docs/CHANGES.rst | ||
| +++ b/docs/CHANGES.rst | ||
| @@ -32,6 +32,9 @@ Fixes: | ||
| - In api.content.move if source **and** target are specified and target is already | ||
| source parent, skip the operation. | ||
| M CHANGES.rst | ||
| M src/plone/app/multilingual/browser/helper_views.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index e45c27f..a502afe 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -14,7 +14,8 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| -- *add item here* | ||
| +- Allow to work in an Archtypes free Plone 5.1. | ||
| + [jensens] | ||
|
|
||
|
|
||
| 5.0 (2016-11-17) | ||
| diff --git a/src/plone/app/multilingual/browser/helper_views.py b/src/plone/app/multilingual/browser/helper_views.py | ||
| index 9ecf3ba..a379c45 100644 | ||
| --- a/src/plone/app/multilingual/browser/helper_views.py | ||
| +++ b/src/plone/app/multilingual/browser/helper_views.py | ||
| @@ -21,13 +21,20 @@ | ||
| from zope.component import getUtility | ||
| from zope.component.hooks import getSite | ||
| from zope.interface import implementer | ||
| +from zope.interface import Interface | ||
| from zope.publisher.interfaces import IPublishTraverse | ||
| from zope.publisher.interfaces import NotFound | ||
|
|
||
| +- Fix test | ||
| + [gforcada] | ||
| try: | ||
| from Products.ATContentTypes.interfaces.factory import IFactoryTool | ||
| except ImportError: | ||
| - from Products.CMFPlone.interfaces.factory import IFactoryTool | ||
| + try: | ||
| + from Products.CMFPlone.interfaces.factory import IFactoryTool | ||
| + except ImportError: | ||
| + # gone in Plone 5.1 w/o ATCT | ||
| + | ||
| 1.5 (2016-02-20) | ||
| ---------------- | ||
| + class IFactoryTool(Interface): | ||
| + pass | ||
|
|
||
| diff --git a/src/plone/api/tests/test_content.py b/src/plone/api/tests/test_content.py | ||
| index 8e0f269..b9e3629 100644 | ||
| --- a/src/plone/api/tests/test_content.py | ||
| +++ b/src/plone/api/tests/test_content.py | ||
| @@ -964,7 +964,7 @@ def test_get_view(self): | ||
| ) | ||
| self.assertEqual(aq_base(view.context), aq_base(self.blog)) | ||
| self.assertEqual(view.__name__, 'plone') | ||
| - self.assertTrue(hasattr(view, 'getIcon')) | ||
| + self.assertTrue(hasattr(view, 'toLocalizedTime')) | ||
|
|
||
| # Try another standard view. | ||
| view = api.content.get_view( | ||
| @implementer(IPublishTraverse) | ||
|
|
||
|
|