-
-
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.vocabularies
Branch: refs/heads/master Date: 2015-07-29T11:32:46+02:00 Author: Gagaro (Gagaro) <gagaro42@gmail.com> Commit: plone/plone.app.vocabularies@ab75b38 fix: use unicode for plone.app.vocabularies.SyndicatableFeedItems Files changed: M CHANGES.rst M plone/app/vocabularies/syndication.py Repository: plone.app.vocabularies Branch: refs/heads/master Date: 2015-07-29T12:53:31+02:00 Author: Eric BREHAULT (ebrehault) <ebrehault@gmail.com> Commit: plone/plone.app.vocabularies@a48de49 Merge pull request #17 from Gagaro/master fix: use unicode for plone.app.vocabularies.SyndicatableFeedItems Files changed: M CHANGES.rst M plone/app/vocabularies/syndication.py
- Loading branch information
Showing
1 changed file
with
86 additions
and
50 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,58 +1,94 @@ | ||
Repository: plone.app.robotframework | ||
Repository: plone.app.vocabularies | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2015-07-29T11:25:33+03:00 | ||
Author: Asko Soukka (datakurre) <asko.soukka@iki.fi> | ||
Commit: https://github.com/plone/plone.app.robotframework/commit/9cd781303e197347236b27f3582ff7fa54c500ef | ||
Date: 2015-07-29T11:32:46+02:00 | ||
Author: Gagaro (Gagaro) <gagaro42@gmail.com> | ||
Commit: https://github.com/plone/plone.app.vocabularies/commit/ab75b3842fe754a5b51829683b132c89a2b52a50 | ||
|
||
Fix pins in versions.cfg | ||
fix: use unicode for plone.app.vocabularies.SyndicatableFeedItems | ||
|
||
Files changed: | ||
M README.rst | ||
M versions-staging.cfg | ||
M versions.cfg | ||
|
||
diff --git a/README.rst b/README.rst | ||
index 4e44f5c..64da9c3 100644 | ||
--- a/README.rst | ||
+++ b/README.rst | ||
@@ -33,7 +33,7 @@ packages related to it. | ||
plone.app.robotframework = 0.9.8 | ||
robotframework = 2.8.4 | ||
robotframework-selenium2library = 1.5.0 | ||
- robotframework-selenium2screenshots = 0.4.0 | ||
+ robotframework-selenium2screenshots = 0.6.0 | ||
robotsuite = 1.6.1 | ||
selenium = 2.45.0 | ||
sphinxcontrib-robotframework = 0.5.1 | ||
diff --git a/versions-staging.cfg b/versions-staging.cfg | ||
index b0a3ff4..367dd66 100644 | ||
--- a/versions-staging.cfg | ||
+++ b/versions-staging.cfg | ||
@@ -4,7 +4,7 @@ Pygments = 2.0.2 | ||
plone.app.robotframework = 0.9.8 | ||
robotframework = 2.9rc1 | ||
robotframework-selenium2library = 1.7.2 | ||
-robotframework-selenium2screenshots = 0.5.1 | ||
+robotframework-selenium2screenshots = 0.6.0 | ||
robotsuite = 1.7.0 | ||
selenium = 2.46.1 | ||
-sphinxcontrib-robotframework = 0.5.0 | ||
+sphinxcontrib-robotframework = 0.5.1 | ||
diff --git a/versions.cfg b/versions.cfg | ||
index 9697a61..936dade 100644 | ||
--- a/versions.cfg | ||
+++ b/versions.cfg | ||
@@ -4,7 +4,7 @@ Pygments = 2.0.2 | ||
plone.app.robotframework = 0.9.8 | ||
robotframework = 2.8.4 | ||
robotframework-selenium2library = 1.5.0 | ||
-robotframework-selenium2screenshots = 0.5.1 | ||
+robotframework-selenium2screenshots = 0.6.0 | ||
robotsuite = 1.6.1 | ||
selenium = 2.45.0 | ||
-sphinxcontrib-robotframework = 0.5.0 | ||
+sphinxcontrib-robotframework = 0.5.1 | ||
M CHANGES.rst | ||
M plone/app/vocabularies/syndication.py | ||
|
||
diff --git a/CHANGES.rst b/CHANGES.rst | ||
index 0a0d597..003b12c 100644 | ||
--- a/CHANGES.rst | ||
+++ b/CHANGES.rst | ||
@@ -4,8 +4,8 @@ Changelog | ||
2.1.19 (unreleased) | ||
------------------- | ||
|
||
-- Nothing changed yet. | ||
- | ||
+- Fixed SyndicatableFeedItems to allow unicode characters in objects titles. | ||
+ [Gagaro] | ||
|
||
2.1.18 (2015-06-05) | ||
------------------- | ||
diff --git a/plone/app/vocabularies/syndication.py b/plone/app/vocabularies/syndication.py | ||
index 1fe6f36..999b46a 100644 | ||
--- a/plone/app/vocabularies/syndication.py | ||
+++ b/plone/app/vocabularies/syndication.py | ||
@@ -56,8 +56,8 @@ def __call__(self, context): | ||
items = [] | ||
for brain in catalog(**query): | ||
uid = brain.UID | ||
- title = '%s(%s)' % (brain.Title, | ||
- brain.getPath()[len(site_path) + 1:]) | ||
+ title = u'%s(%s)' % (brain.Title.decode('utf8'), | ||
+ brain.getPath()[len(site_path) + 1:]) | ||
items.append(SimpleTerm(uid, uid, title)) | ||
return SimpleVocabulary(items) | ||
|
||
|
||
|
||
Repository: plone.app.vocabularies | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2015-07-29T12:53:31+02:00 | ||
Author: Eric BREHAULT (ebrehault) <ebrehault@gmail.com> | ||
Commit: https://github.com/plone/plone.app.vocabularies/commit/a48de492e503929fe512daf504ca8319f0e109b9 | ||
|
||
Merge pull request #17 from Gagaro/master | ||
|
||
fix: use unicode for plone.app.vocabularies.SyndicatableFeedItems | ||
|
||
Files changed: | ||
M CHANGES.rst | ||
M plone/app/vocabularies/syndication.py | ||
|
||
diff --git a/CHANGES.rst b/CHANGES.rst | ||
index 0a0d597..003b12c 100644 | ||
--- a/CHANGES.rst | ||
+++ b/CHANGES.rst | ||
@@ -4,8 +4,8 @@ Changelog | ||
2.1.19 (unreleased) | ||
------------------- | ||
|
||
-- Nothing changed yet. | ||
- | ||
+- Fixed SyndicatableFeedItems to allow unicode characters in objects titles. | ||
+ [Gagaro] | ||
|
||
2.1.18 (2015-06-05) | ||
------------------- | ||
diff --git a/plone/app/vocabularies/syndication.py b/plone/app/vocabularies/syndication.py | ||
index 1fe6f36..999b46a 100644 | ||
--- a/plone/app/vocabularies/syndication.py | ||
+++ b/plone/app/vocabularies/syndication.py | ||
@@ -56,8 +56,8 @@ def __call__(self, context): | ||
items = [] | ||
for brain in catalog(**query): | ||
uid = brain.UID | ||
- title = '%s(%s)' % (brain.Title, | ||
- brain.getPath()[len(site_path) + 1:]) | ||
+ title = u'%s(%s)' % (brain.Title.decode('utf8'), | ||
+ brain.getPath()[len(site_path) + 1:]) | ||
items.append(SimpleTerm(uid, uid, title)) | ||
return SimpleVocabulary(items) | ||
|
||
|
||
|