-
-
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.contenttypes
Branch: refs/heads/master Date: 2017-06-16T11:23:06+02:00 Author: Franz Gerhard Reinisch (fgrcon) <[email protected]> Commit: plone/plone.app.contenttypes@5f8a24f further fixes for plip 1734-attribute-renames Files changed: M plone/app/contenttypes/behaviors/thumb_icon.py Repository: plone.app.contenttypes Branch: refs/heads/master Date: 2017-06-17T22:58:10+02:00 Author: Johannes Raggam (thet) <[email protected]> Commit: plone/plone.app.contenttypes@5166c93 Merge pull request #411 from plone/fgrcon-cleanup_2-1734 further fixes for plip 1734-attribute-renames Files changed: M plone/app/contenttypes/behaviors/thumb_icon.py
- Loading branch information
Showing
1 changed file
with
55 additions
and
47 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,84 +1,92 @@ | ||
| Repository: plone.app.portlets | ||
| Repository: plone.app.contenttypes | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2017-06-16T11:29:58+02:00 | ||
| Date: 2017-06-16T11:23:06+02:00 | ||
| Author: Franz Gerhard Reinisch (fgrcon) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.portlets/commit/af4e9219b806e79ac136c438e8d5fe5b0b93d536 | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/5f8a24f95144f4cac12ef450e0b24f9fd5595a8d | ||
|
|
||
| further fixes for plip 1734-attribute-renames | ||
|
|
||
| Files changed: | ||
| M plone/app/portlets/portlets/recent.py | ||
| M plone/app/portlets/portlets/review.py | ||
| M plone/app/contenttypes/behaviors/thumb_icon.py | ||
|
|
||
| diff --git a/plone/app/portlets/portlets/recent.py b/plone/app/portlets/portlets/recent.py | ||
| index 93b2341..637d01a 100644 | ||
| --- a/plone/app/portlets/portlets/recent.py | ||
| +++ b/plone/app/portlets/portlets/recent.py | ||
| @@ -37,7 +37,7 @@ class IRecentPortlet(IPortletDataProvider): | ||
| default=False) | ||
| diff --git a/plone/app/contenttypes/behaviors/thumb_icon.py b/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| index 89a4da1e..b63e4e8e 100644 | ||
| --- a/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| +++ b/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| @@ -25,7 +25,7 @@ class IThumbIconHandling(model.Schema): | ||
| ) | ||
|
|
||
| thumb_scale = schema.TextLine( | ||
| - title=_(u"Override thumb size"), | ||
| + title=_(u"Override thumb scale"), | ||
| thumb_scale_list = schema.TextLine( | ||
| - title=_(u'Override thumb size for list view'), | ||
| + title=_(u'Override thumb scale for list view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
| diff --git a/plone/app/portlets/portlets/review.py b/plone/app/portlets/portlets/review.py | ||
| index 442c302..e8f4dfa 100644 | ||
| --- a/plone/app/portlets/portlets/review.py | ||
| +++ b/plone/app/portlets/portlets/review.py | ||
| @@ -28,7 +28,7 @@ class IReviewPortlet(IPortletDataProvider): | ||
| default=False) | ||
| @@ -36,7 +36,7 @@ class IThumbIconHandling(model.Schema): | ||
| default=u'') | ||
|
|
||
| thumb_scale = schema.TextLine( | ||
| - title=_(u"Override thumb size"), | ||
| + title=_(u"Override thumb scale"), | ||
| thumb_scale_table = schema.TextLine( | ||
| - title=_(u'Override thumb size for table view'), | ||
| + title=_(u'Override thumb scale for table view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
| @@ -47,7 +47,7 @@ class IThumbIconHandling(model.Schema): | ||
| default=u'') | ||
|
|
||
| thumb_scale_summary = schema.TextLine( | ||
| - title=_(u'Override thumb size for summary view'), | ||
| + title=_(u'Override thumb scale for summary view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
|
|
||
|
|
||
| Repository: plone.app.portlets | ||
| Repository: plone.app.contenttypes | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2017-06-17T22:57:53+02:00 | ||
| Date: 2017-06-17T22:58:10+02:00 | ||
| Author: Johannes Raggam (thet) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.portlets/commit/624fb27e183adb845f14a7f65b30de9365176fe1 | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/5166c9306e8a69ce702d64f0021c7122ec1599ee | ||
|
|
||
| Merge pull request #100 from plone/fgrcon-cleanup_2-1734 | ||
| Merge pull request #411 from plone/fgrcon-cleanup_2-1734 | ||
|
|
||
| further fixes for plip 1734-attribute-renames | ||
|
|
||
| Files changed: | ||
| M plone/app/portlets/portlets/recent.py | ||
| M plone/app/portlets/portlets/review.py | ||
| M plone/app/contenttypes/behaviors/thumb_icon.py | ||
|
|
||
| diff --git a/plone/app/portlets/portlets/recent.py b/plone/app/portlets/portlets/recent.py | ||
| index 93b2341..637d01a 100644 | ||
| --- a/plone/app/portlets/portlets/recent.py | ||
| +++ b/plone/app/portlets/portlets/recent.py | ||
| @@ -37,7 +37,7 @@ class IRecentPortlet(IPortletDataProvider): | ||
| default=False) | ||
| diff --git a/plone/app/contenttypes/behaviors/thumb_icon.py b/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| index 89a4da1e..b63e4e8e 100644 | ||
| --- a/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| +++ b/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| @@ -25,7 +25,7 @@ class IThumbIconHandling(model.Schema): | ||
| ) | ||
|
|
||
| thumb_scale_list = schema.TextLine( | ||
| - title=_(u'Override thumb size for list view'), | ||
| + title=_(u'Override thumb scale for list view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
| @@ -36,7 +36,7 @@ class IThumbIconHandling(model.Schema): | ||
| default=u'') | ||
|
|
||
| thumb_scale = schema.TextLine( | ||
| - title=_(u"Override thumb size"), | ||
| + title=_(u"Override thumb scale"), | ||
| thumb_scale_table = schema.TextLine( | ||
| - title=_(u'Override thumb size for table view'), | ||
| + title=_(u'Override thumb scale for table view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
| diff --git a/plone/app/portlets/portlets/review.py b/plone/app/portlets/portlets/review.py | ||
| index 442c302..e8f4dfa 100644 | ||
| --- a/plone/app/portlets/portlets/review.py | ||
| +++ b/plone/app/portlets/portlets/review.py | ||
| @@ -28,7 +28,7 @@ class IReviewPortlet(IPortletDataProvider): | ||
| default=False) | ||
| @@ -47,7 +47,7 @@ class IThumbIconHandling(model.Schema): | ||
| default=u'') | ||
|
|
||
| thumb_scale = schema.TextLine( | ||
| - title=_(u"Override thumb size"), | ||
| + title=_(u"Override thumb scale"), | ||
| thumb_scale_summary = schema.TextLine( | ||
| - title=_(u'Override thumb size for summary view'), | ||
| + title=_(u'Override thumb scale for summary view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
|
|
||