From 09d35afa88373157698d9ed4658594c25fa413c9 Mon Sep 17 00:00:00 2001 From: Luca Fabbri Date: Tue, 4 Jun 2013 18:24:43 +0200 Subject: [PATCH 1/8] italian translation --- collective/portlet/embed/configure.zcml | 2 +- .../collective.portlet.embed-manual.pot | 21 ++++++++ .../locales/collective.portlet.embed.pot | 5 +- .../LC_MESSAGES/collective.portlet.embed.po | 5 +- .../LC_MESSAGES/collective.portlet.embed.po | 6 ++- .../LC_MESSAGES/collective.portlet.embed.po | 50 +++++++++++++++++++ .../LC_MESSAGES/collective.portlet.embed.po | 5 +- collective/portlet/embed/rebuild_i18n.sh | 1 + docs/HISTORY.txt | 3 +- 9 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 collective/portlet/embed/locales/collective.portlet.embed-manual.pot create mode 100644 collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po mode change 100644 => 100755 collective/portlet/embed/rebuild_i18n.sh diff --git a/collective/portlet/embed/configure.zcml b/collective/portlet/embed/configure.zcml index a99d48f..1f9ec83 100644 --- a/collective/portlet/embed/configure.zcml +++ b/collective/portlet/embed/configure.zcml @@ -10,7 +10,7 @@ name="default" title="collective.portlet.embed" directory="profiles/default" - description='Extension profile for collective.portlet.embed.' + description="A new portlet that can contain embed HTML code" provides="Products.GenericSetup.interfaces.EXTENSION" /> , YEAR. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2012-09-04 09:07+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"Language-Code: en\n" +"Language-Name: English\n" +"Preferred-Encodings: utf-8 latin1\n" +"Domain: collective.portlet.embed\n" + +msgid "A new portlet that can contain embed HTML code" +msgstr "" diff --git a/collective/portlet/embed/locales/collective.portlet.embed.pot b/collective/portlet/embed/locales/collective.portlet.embed.pot index d8bb2f4..110d316 100644 --- a/collective/portlet/embed/locales/collective.portlet.embed.pot +++ b/collective/portlet/embed/locales/collective.portlet.embed.pot @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-09-04 09:07+0000\n" +"POT-Creation-Date: 2013-06-04 16:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,9 @@ msgstr "" "Preferred-Encodings: utf-8 latin1\n" "Domain: collective.portlet.embed\n" +msgid "A new portlet that can contain embed HTML code" +msgstr "" + #: ./portlet.py:24 msgid "HTML Code to embed" msgstr "" diff --git a/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po index c95cac1..87f4558 100644 --- a/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1.dev0\n" -"POT-Creation-Date: 2012-09-04 09:07+0000\n" +"POT-Creation-Date: 2013-06-04 16:18+0000\n" "PO-Revision-Date: 2012-09-04 09:45+0100\n" "Last-Translator: Ralph Jacobs \n" "Language-Team: Four Digits \n" @@ -14,6 +14,9 @@ msgstr "" "Preferred-Encodings: utf-8 latin1\n" "Domain: collective.portlet.embed\n" +msgid "A new portlet that can contain embed HTML code" +msgstr "" + #: ./portlet.py:24 msgid "HTML Code to embed" msgstr "HTML Code to embed" diff --git a/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po index 032ecc0..0f192b5 100644 --- a/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: collective.linguasitemap\n" -"POT-Creation-Date: 2012-09-04 09:07+0000\n" +"POT-Creation-Date: 2013-06-04 16:18+0000\n" "PO-Revision-Date: 2010-11-13 11:07+0100\n" "Last-Translator: YOURNAME \n" "Language-Team: French \n" @@ -17,6 +17,9 @@ msgstr "" "Domain: collective.portlet.embed\n" "X-Is-Fallback-For: fr-be fr-ca fr-lu fr-mc fr-ch fr-fr\n" +msgid "A new portlet that can contain embed HTML code" +msgstr "" + #: ./portlet.py:24 msgid "HTML Code to embed" msgstr "Code HTML à afficher" @@ -44,3 +47,4 @@ msgstr "Modifier un portlet embed" #: ./portlet.py:31 msgid "title_portlet" msgstr "Embed" + diff --git a/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po new file mode 100644 index 0000000..117873d --- /dev/null +++ b/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po @@ -0,0 +1,50 @@ +# --- PLEASE EDIT THE LINES BELOW CORRECTLY --- +# SOME DESCRIPTIVE TITLE. +# FIRST AUTHOR , YEAR. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2013-06-04 16:18+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" +"Last-Translator: Luca Fabbri \n" +"Language-Team: plone-italian-translation-discussion \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"Language-Code: it\n" +"Language-Name: Italian\n" +"Preferred-Encodings: utf-8 latin1\n" +"Domain: collective.portlet.embed\n" + +msgid "A new portlet that can contain embed HTML code" +msgstr "Una nuova portlet che può contenere codice HTML da integrare" + +#: ./portlet.py:24 +msgid "HTML Code to embed" +msgstr "Codice HTML da integrare" + +#: ./portlet.py:25 +msgid "The html snippet you want to use. It can be iframe, javascript, html" +msgstr "Il pezzo di HTML che vuoi usare. Può essere un iframe, codice JavaScript, HTML, ..." + +#. Default: "A portlet which can display embed HTML code." +#: ./portlet.py:61 +msgid "description_portlet" +msgstr "Una portlet che può visualizzare codice HTML integrato" + +#. Default: "Add embed portlet" +#: ./portlet.py:59 +msgid "title_add_portlet" +msgstr "Una embed portlet" + +#. Default: "Edit embed portlet" +#: ./portlet.py:71 +msgid "title_edit_portlet" +msgstr "Modifica embed portlet" + +#. Default: "Embed portlet" +#: ./portlet.py:31 +msgid "title_portlet" +msgstr "" + diff --git a/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po index 1c4a8fc..1d22a97 100644 --- a/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1.dev0\n" -"POT-Creation-Date: 2012-09-04 09:07+0000\n" +"POT-Creation-Date: 2013-06-04 16:18+0000\n" "PO-Revision-Date: 2012-09-04 09:48+0100\n" "Last-Translator: Ralph Jacobs \n" "Language-Team: Four Digits \n" @@ -14,6 +14,9 @@ msgstr "" "Preferred-Encodings: utf-8 latin1\n" "Domain: collective.portlet.embed\n" +msgid "A new portlet that can contain embed HTML code" +msgstr "" + #: ./portlet.py:24 msgid "HTML Code to embed" msgstr "HTML Code welke embed moet worden" diff --git a/collective/portlet/embed/rebuild_i18n.sh b/collective/portlet/embed/rebuild_i18n.sh old mode 100644 new mode 100755 index 1a362f0..f50430c --- a/collective/portlet/embed/rebuild_i18n.sh +++ b/collective/portlet/embed/rebuild_i18n.sh @@ -4,6 +4,7 @@ I18NDOMAIN=$PRODUCTNAME # Synchronise the .pot with the templates. i18ndude rebuild-pot --pot locales/${PRODUCTNAME}.pot --create ${I18NDOMAIN} . +i18ndude merge --pot locales/${I18NDOMAIN}.pot --merge locales/${I18NDOMAIN}-manual.pot # Synchronise the resulting .pot with the .po files i18ndude sync --pot locales/${PRODUCTNAME}.pot locales/*/LC_MESSAGES/${PRODUCTNAME}.po \ No newline at end of file diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index b2d3894..878388e 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -4,8 +4,7 @@ Changelog 1.2 (unreleased) ---------------- -- Nothing changed yet. - +- Added italian translation [keul] 1.1 (2012-09-04) ---------------- From 9a0903e9d9548dc2d9a88f491716564197c89e74 Mon Sep 17 00:00:00 2001 From: Luca Fabbri Date: Tue, 4 Jun 2013 18:24:43 +0200 Subject: [PATCH 2/8] italian translation --- collective/portlet/embed/configure.zcml | 2 +- .../collective.portlet.embed-manual.pot | 21 ++++++++ .../locales/collective.portlet.embed.pot | 5 +- .../LC_MESSAGES/collective.portlet.embed.po | 5 +- .../LC_MESSAGES/collective.portlet.embed.po | 6 ++- .../LC_MESSAGES/collective.portlet.embed.po | 50 +++++++++++++++++++ .../LC_MESSAGES/collective.portlet.embed.po | 5 +- collective/portlet/embed/rebuild_i18n.sh | 1 + docs/HISTORY.txt | 4 +- 9 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 collective/portlet/embed/locales/collective.portlet.embed-manual.pot create mode 100644 collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po mode change 100644 => 100755 collective/portlet/embed/rebuild_i18n.sh diff --git a/collective/portlet/embed/configure.zcml b/collective/portlet/embed/configure.zcml index b650b86..91857f7 100644 --- a/collective/portlet/embed/configure.zcml +++ b/collective/portlet/embed/configure.zcml @@ -11,7 +11,7 @@ name="default" title="collective.portlet.embed" directory="profiles/default" - description='Extension profile for collective.portlet.embed.' + description="A new portlet that can contain embed HTML code" provides="Products.GenericSetup.interfaces.EXTENSION" /> , YEAR. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2012-09-04 09:07+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"Language-Code: en\n" +"Language-Name: English\n" +"Preferred-Encodings: utf-8 latin1\n" +"Domain: collective.portlet.embed\n" + +msgid "A new portlet that can contain embed HTML code" +msgstr "" diff --git a/collective/portlet/embed/locales/collective.portlet.embed.pot b/collective/portlet/embed/locales/collective.portlet.embed.pot index d8bb2f4..110d316 100644 --- a/collective/portlet/embed/locales/collective.portlet.embed.pot +++ b/collective/portlet/embed/locales/collective.portlet.embed.pot @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-09-04 09:07+0000\n" +"POT-Creation-Date: 2013-06-04 16:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,9 @@ msgstr "" "Preferred-Encodings: utf-8 latin1\n" "Domain: collective.portlet.embed\n" +msgid "A new portlet that can contain embed HTML code" +msgstr "" + #: ./portlet.py:24 msgid "HTML Code to embed" msgstr "" diff --git a/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po index c95cac1..87f4558 100644 --- a/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1.dev0\n" -"POT-Creation-Date: 2012-09-04 09:07+0000\n" +"POT-Creation-Date: 2013-06-04 16:18+0000\n" "PO-Revision-Date: 2012-09-04 09:45+0100\n" "Last-Translator: Ralph Jacobs \n" "Language-Team: Four Digits \n" @@ -14,6 +14,9 @@ msgstr "" "Preferred-Encodings: utf-8 latin1\n" "Domain: collective.portlet.embed\n" +msgid "A new portlet that can contain embed HTML code" +msgstr "" + #: ./portlet.py:24 msgid "HTML Code to embed" msgstr "HTML Code to embed" diff --git a/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po index 032ecc0..0f192b5 100644 --- a/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: collective.linguasitemap\n" -"POT-Creation-Date: 2012-09-04 09:07+0000\n" +"POT-Creation-Date: 2013-06-04 16:18+0000\n" "PO-Revision-Date: 2010-11-13 11:07+0100\n" "Last-Translator: YOURNAME \n" "Language-Team: French \n" @@ -17,6 +17,9 @@ msgstr "" "Domain: collective.portlet.embed\n" "X-Is-Fallback-For: fr-be fr-ca fr-lu fr-mc fr-ch fr-fr\n" +msgid "A new portlet that can contain embed HTML code" +msgstr "" + #: ./portlet.py:24 msgid "HTML Code to embed" msgstr "Code HTML à afficher" @@ -44,3 +47,4 @@ msgstr "Modifier un portlet embed" #: ./portlet.py:31 msgid "title_portlet" msgstr "Embed" + diff --git a/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po new file mode 100644 index 0000000..117873d --- /dev/null +++ b/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po @@ -0,0 +1,50 @@ +# --- PLEASE EDIT THE LINES BELOW CORRECTLY --- +# SOME DESCRIPTIVE TITLE. +# FIRST AUTHOR , YEAR. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2013-06-04 16:18+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" +"Last-Translator: Luca Fabbri \n" +"Language-Team: plone-italian-translation-discussion \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"Language-Code: it\n" +"Language-Name: Italian\n" +"Preferred-Encodings: utf-8 latin1\n" +"Domain: collective.portlet.embed\n" + +msgid "A new portlet that can contain embed HTML code" +msgstr "Una nuova portlet che può contenere codice HTML da integrare" + +#: ./portlet.py:24 +msgid "HTML Code to embed" +msgstr "Codice HTML da integrare" + +#: ./portlet.py:25 +msgid "The html snippet you want to use. It can be iframe, javascript, html" +msgstr "Il pezzo di HTML che vuoi usare. Può essere un iframe, codice JavaScript, HTML, ..." + +#. Default: "A portlet which can display embed HTML code." +#: ./portlet.py:61 +msgid "description_portlet" +msgstr "Una portlet che può visualizzare codice HTML integrato" + +#. Default: "Add embed portlet" +#: ./portlet.py:59 +msgid "title_add_portlet" +msgstr "Una embed portlet" + +#. Default: "Edit embed portlet" +#: ./portlet.py:71 +msgid "title_edit_portlet" +msgstr "Modifica embed portlet" + +#. Default: "Embed portlet" +#: ./portlet.py:31 +msgid "title_portlet" +msgstr "" + diff --git a/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po index 1c4a8fc..1d22a97 100644 --- a/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1.dev0\n" -"POT-Creation-Date: 2012-09-04 09:07+0000\n" +"POT-Creation-Date: 2013-06-04 16:18+0000\n" "PO-Revision-Date: 2012-09-04 09:48+0100\n" "Last-Translator: Ralph Jacobs \n" "Language-Team: Four Digits \n" @@ -14,6 +14,9 @@ msgstr "" "Preferred-Encodings: utf-8 latin1\n" "Domain: collective.portlet.embed\n" +msgid "A new portlet that can contain embed HTML code" +msgstr "" + #: ./portlet.py:24 msgid "HTML Code to embed" msgstr "HTML Code welke embed moet worden" diff --git a/collective/portlet/embed/rebuild_i18n.sh b/collective/portlet/embed/rebuild_i18n.sh old mode 100644 new mode 100755 index 1a362f0..f50430c --- a/collective/portlet/embed/rebuild_i18n.sh +++ b/collective/portlet/embed/rebuild_i18n.sh @@ -4,6 +4,7 @@ I18NDOMAIN=$PRODUCTNAME # Synchronise the .pot with the templates. i18ndude rebuild-pot --pot locales/${PRODUCTNAME}.pot --create ${I18NDOMAIN} . +i18ndude merge --pot locales/${I18NDOMAIN}.pot --merge locales/${I18NDOMAIN}-manual.pot # Synchronise the resulting .pot with the .po files i18ndude sync --pot locales/${PRODUCTNAME}.pot locales/*/LC_MESSAGES/${PRODUCTNAME}.po \ No newline at end of file diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 1973268..3b99947 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -4,8 +4,8 @@ Changelog 1.2 (unreleased) ---------------- -- Use z3cform for portlet addform/editform - +- Added italian translation [keul] +- Use z3cform for portlet addform/editform [toutpt] 1.1 (2012-09-04) ---------------- From 2fd9d8a5b326ee486abbfe12c86995200ab47800 Mon Sep 17 00:00:00 2001 From: Luca Fabbri Date: Thu, 10 Sep 2015 12:43:08 +0200 Subject: [PATCH 3/8] Marked Plone 4.3 compatibility and z3c.form dependency --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 18ec490..3070b85 100644 --- a/setup.py +++ b/setup.py @@ -18,11 +18,14 @@ "Framework :: Plone :: 4.0", "Framework :: Plone :: 4.1", "Framework :: Plone :: 4.2", + "Framework :: Plone :: 4.3", "Programming Language :: Python", ], - keywords='', + keywords='plone portlet embed iframe', author='JeanMichel FRANCOIS aka toutpt', author_email='toutpt@gmail.com', + maintainer='keul', + maintainer_email='luca@keul.it', url='https://github.com/collective/collective.portlet.embed', license='GPL', packages=find_packages(exclude=['ez_setup']), @@ -31,7 +34,7 @@ zip_safe=False, install_requires=[ 'setuptools', - # -*- Extra requirements: -*- + 'z3c.form', ], extras_require=dict( test=['plone.app.testing', 'plone.app.robotframework', 'selenium'], From 62cc7e19690b7b78c0e777b1034bb578e3cea322 Mon Sep 17 00:00:00 2001 From: Luca Fabbri Date: Thu, 10 Sep 2015 12:43:28 +0200 Subject: [PATCH 4/8] i18n update --- .../embed/locales/collective.portlet.embed.pot | 14 +++++++------- .../en/LC_MESSAGES/collective.portlet.embed.po | 14 +++++++------- .../fr/LC_MESSAGES/collective.portlet.embed.po | 14 +++++++------- .../it/LC_MESSAGES/collective.portlet.embed.po | 14 +++++++------- .../nl/LC_MESSAGES/collective.portlet.embed.po | 14 +++++++------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/collective/portlet/embed/locales/collective.portlet.embed.pot b/collective/portlet/embed/locales/collective.portlet.embed.pot index 110d316..1bca345 100644 --- a/collective/portlet/embed/locales/collective.portlet.embed.pot +++ b/collective/portlet/embed/locales/collective.portlet.embed.pot @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2013-06-04 16:18+0000\n" +"POT-Creation-Date: 2015-09-10 10:32+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,31 +20,31 @@ msgstr "" msgid "A new portlet that can contain embed HTML code" msgstr "" -#: ./portlet.py:24 +#: ./portlet.py:26 msgid "HTML Code to embed" msgstr "" -#: ./portlet.py:25 +#: ./portlet.py:27 msgid "The html snippet you want to use. It can be iframe, javascript, html" msgstr "" #. Default: "A portlet which can display embed HTML code." -#: ./portlet.py:61 +#: ./portlet.py:66 msgid "description_portlet" msgstr "" #. Default: "Add embed portlet" -#: ./portlet.py:59 +#: ./portlet.py:64 msgid "title_add_portlet" msgstr "" #. Default: "Edit embed portlet" -#: ./portlet.py:71 +#: ./portlet.py:77 msgid "title_edit_portlet" msgstr "" #. Default: "Embed portlet" -#: ./portlet.py:31 +#: ./portlet.py:34 msgid "title_portlet" msgstr "" diff --git a/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po index 87f4558..8bc0fd5 100644 --- a/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1.dev0\n" -"POT-Creation-Date: 2013-06-04 16:18+0000\n" +"POT-Creation-Date: 2015-09-10 10:32+0000\n" "PO-Revision-Date: 2012-09-04 09:45+0100\n" "Last-Translator: Ralph Jacobs \n" "Language-Team: Four Digits \n" @@ -17,31 +17,31 @@ msgstr "" msgid "A new portlet that can contain embed HTML code" msgstr "" -#: ./portlet.py:24 +#: ./portlet.py:26 msgid "HTML Code to embed" msgstr "HTML Code to embed" -#: ./portlet.py:25 +#: ./portlet.py:27 msgid "The html snippet you want to use. It can be iframe, javascript, html" msgstr "The html snippet you want to use. It can be iframe, javascript, html" #. Default: "A portlet which can display embed HTML code." -#: ./portlet.py:61 +#: ./portlet.py:66 msgid "description_portlet" msgstr "A portlet which can display embed HTML code." #. Default: "Add embed portlet" -#: ./portlet.py:59 +#: ./portlet.py:64 msgid "title_add_portlet" msgstr "Add embed portlet" #. Default: "Edit embed portlet" -#: ./portlet.py:71 +#: ./portlet.py:77 msgid "title_edit_portlet" msgstr "Edit embed portlet" #. Default: "Embed portlet" -#: ./portlet.py:31 +#: ./portlet.py:34 msgid "title_portlet" msgstr "Embed portlet" diff --git a/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po index 0f192b5..e92f273 100644 --- a/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: collective.linguasitemap\n" -"POT-Creation-Date: 2013-06-04 16:18+0000\n" +"POT-Creation-Date: 2015-09-10 10:32+0000\n" "PO-Revision-Date: 2010-11-13 11:07+0100\n" "Last-Translator: YOURNAME \n" "Language-Team: French \n" @@ -20,31 +20,31 @@ msgstr "" msgid "A new portlet that can contain embed HTML code" msgstr "" -#: ./portlet.py:24 +#: ./portlet.py:26 msgid "HTML Code to embed" msgstr "Code HTML à afficher" -#: ./portlet.py:25 +#: ./portlet.py:27 msgid "The html snippet you want to use. It can be iframe, javascript, html" msgstr "L'extrait HTML que vous souhaitez afficher. Il peut être une iframe, du javascript, sans restriction" #. Default: "A portlet which can display embed HTML code." -#: ./portlet.py:61 +#: ./portlet.py:66 msgid "description_portlet" msgstr "Un portlet qui peut afficher un extrait de code HTML." #. Default: "Add embed portlet" -#: ./portlet.py:59 +#: ./portlet.py:64 msgid "title_add_portlet" msgstr "Ajouter un portlet embed" #. Default: "Edit embed portlet" -#: ./portlet.py:71 +#: ./portlet.py:77 msgid "title_edit_portlet" msgstr "Modifier un portlet embed" #. Default: "Embed portlet" -#: ./portlet.py:31 +#: ./portlet.py:34 msgid "title_portlet" msgstr "Embed" diff --git a/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po index 117873d..3e8cfbb 100644 --- a/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2013-06-04 16:18+0000\n" +"POT-Creation-Date: 2015-09-10 10:32+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" "Last-Translator: Luca Fabbri \n" "Language-Team: plone-italian-translation-discussion \n" @@ -20,31 +20,31 @@ msgstr "" msgid "A new portlet that can contain embed HTML code" msgstr "Una nuova portlet che può contenere codice HTML da integrare" -#: ./portlet.py:24 +#: ./portlet.py:26 msgid "HTML Code to embed" msgstr "Codice HTML da integrare" -#: ./portlet.py:25 +#: ./portlet.py:27 msgid "The html snippet you want to use. It can be iframe, javascript, html" msgstr "Il pezzo di HTML che vuoi usare. Può essere un iframe, codice JavaScript, HTML, ..." #. Default: "A portlet which can display embed HTML code." -#: ./portlet.py:61 +#: ./portlet.py:66 msgid "description_portlet" msgstr "Una portlet che può visualizzare codice HTML integrato" #. Default: "Add embed portlet" -#: ./portlet.py:59 +#: ./portlet.py:64 msgid "title_add_portlet" msgstr "Una embed portlet" #. Default: "Edit embed portlet" -#: ./portlet.py:71 +#: ./portlet.py:77 msgid "title_edit_portlet" msgstr "Modifica embed portlet" #. Default: "Embed portlet" -#: ./portlet.py:31 +#: ./portlet.py:34 msgid "title_portlet" msgstr "" diff --git a/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po index 1d22a97..a93530a 100644 --- a/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1.dev0\n" -"POT-Creation-Date: 2013-06-04 16:18+0000\n" +"POT-Creation-Date: 2015-09-10 10:32+0000\n" "PO-Revision-Date: 2012-09-04 09:48+0100\n" "Last-Translator: Ralph Jacobs \n" "Language-Team: Four Digits \n" @@ -17,31 +17,31 @@ msgstr "" msgid "A new portlet that can contain embed HTML code" msgstr "" -#: ./portlet.py:24 +#: ./portlet.py:26 msgid "HTML Code to embed" msgstr "HTML Code welke embed moet worden" -#: ./portlet.py:25 +#: ./portlet.py:27 msgid "The html snippet you want to use. It can be iframe, javascript, html" msgstr "De html snippet welke je wilt gebruiken. Dit kan een iframe, javascript of html zijn" #. Default: "A portlet which can display embed HTML code." -#: ./portlet.py:61 +#: ./portlet.py:66 msgid "description_portlet" msgstr "Een portlet welke embedded HTML code laat zien." #. Default: "Add embed portlet" -#: ./portlet.py:59 +#: ./portlet.py:64 msgid "title_add_portlet" msgstr "Voeg embed portlet toe" #. Default: "Edit embed portlet" -#: ./portlet.py:71 +#: ./portlet.py:77 msgid "title_edit_portlet" msgstr "Wijzig embed portlet" #. Default: "Embed portlet" -#: ./portlet.py:31 +#: ./portlet.py:34 msgid "title_portlet" msgstr "Embed portlet" From e26cc8ba6c12cb756acb8ab092180643c7a214a7 Mon Sep 17 00:00:00 2001 From: Luca Fabbri Date: Thu, 10 Sep 2015 12:52:13 +0200 Subject: [PATCH 5/8] Updated i18n changelines --- .../portlet/embed/locales/collective.portlet.embed.pot | 2 +- .../embed/locales/en/LC_MESSAGES/collective.portlet.embed.po | 2 +- .../embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po | 2 +- .../embed/locales/it/LC_MESSAGES/collective.portlet.embed.po | 5 +++-- .../embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/collective/portlet/embed/locales/collective.portlet.embed.pot b/collective/portlet/embed/locales/collective.portlet.embed.pot index 1bca345..aee9bab 100644 --- a/collective/portlet/embed/locales/collective.portlet.embed.pot +++ b/collective/portlet/embed/locales/collective.portlet.embed.pot @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-09-10 10:32+0000\n" +"POT-Creation-Date: 2015-09-10 10:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po index 8bc0fd5..52809c2 100644 --- a/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/en/LC_MESSAGES/collective.portlet.embed.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1.dev0\n" -"POT-Creation-Date: 2015-09-10 10:32+0000\n" +"POT-Creation-Date: 2015-09-10 10:51+0000\n" "PO-Revision-Date: 2012-09-04 09:45+0100\n" "Last-Translator: Ralph Jacobs \n" "Language-Team: Four Digits \n" diff --git a/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po index e92f273..054a5bb 100644 --- a/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/fr/LC_MESSAGES/collective.portlet.embed.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: collective.linguasitemap\n" -"POT-Creation-Date: 2015-09-10 10:32+0000\n" +"POT-Creation-Date: 2015-09-10 10:51+0000\n" "PO-Revision-Date: 2010-11-13 11:07+0100\n" "Last-Translator: YOURNAME \n" "Language-Team: French \n" diff --git a/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po index 5c3f636..e5104c5 100644 --- a/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/it/LC_MESSAGES/collective.portlet.embed.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-09-10 10:32+0000\n" +"POT-Creation-Date: 2015-09-10 10:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" "Last-Translator: Luca Fabbri \n" "Language-Team: plone-italian-translation-discussion \n" @@ -24,6 +24,7 @@ msgstr "Una nuova portlet che può contenere codice HTML da integrare" msgid "HTML Code to embed" msgstr "Codice HTML da integrare" +#: ./portlet.py:27 msgid "The html snippet you want to use. It can be iframe, javascript, html" msgstr "Il pezzo di HTML che vuoi usare. Può essere un iframe, codice JavaScript, HTML, ..." @@ -43,7 +44,7 @@ msgid "title_edit_portlet" msgstr "Modifica embed portlet" #. Default: "Embed portlet" -#: ./portlet.py:31 +#: ./portlet.py:34 msgid "title_portlet" msgstr "" diff --git a/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po b/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po index a93530a..b7ace04 100644 --- a/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po +++ b/collective/portlet/embed/locales/nl/LC_MESSAGES/collective.portlet.embed.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1.dev0\n" -"POT-Creation-Date: 2015-09-10 10:32+0000\n" +"POT-Creation-Date: 2015-09-10 10:51+0000\n" "PO-Revision-Date: 2012-09-04 09:48+0100\n" "Last-Translator: Ralph Jacobs \n" "Language-Team: Four Digits \n" From 31eb13102f48593873f6b4039ba0e18988ec2d10 Mon Sep 17 00:00:00 2001 From: Luca Fabbri Date: Thu, 10 Sep 2015 13:00:12 +0200 Subject: [PATCH 6/8] flake8 --- collective/portlet/embed/portlet.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/collective/portlet/embed/portlet.py b/collective/portlet/embed/portlet.py index 6372ba5..b935141 100644 --- a/collective/portlet/embed/portlet.py +++ b/collective/portlet/embed/portlet.py @@ -1,17 +1,12 @@ -from zope import component -from zope import schema -from zope import interface -from zope.formlib import form -from z3c.form import field - -from plone.i18n.normalizer.interfaces import IIDNormalizer -from plone.portlet.static import static -from plone.app.portlets.portlets import base -from plone.app.portlets.browser import z3cformhelper - from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile - from collective.portlet.embed import messageFactory as _ +from plone.app.portlets.browser import z3cformhelper +from plone.i18n.normalizer.interfaces import IIDNormalizer +from plone.portlet.static import static +from z3c.form import field +from zope import component +from zope import interface +from zope import schema class IEmbedPortlet(static.IStaticPortlet): From 3358a7c20ab0c9dffd470f3b40a6074a40bbc954 Mon Sep 17 00:00:00 2001 From: Luca Fabbri Date: Thu, 10 Sep 2015 14:14:22 +0200 Subject: [PATCH 7/8] whitespaces for flake8 compatibility --- collective/portlet/embed/tests/base.py | 2 +- collective/portlet/embed/tests/test_portlet.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/collective/portlet/embed/tests/base.py b/collective/portlet/embed/tests/base.py index 273060b..65301aa 100644 --- a/collective/portlet/embed/tests/base.py +++ b/collective/portlet/embed/tests/base.py @@ -33,5 +33,5 @@ class FunctionalTestCase(IntegrationTestCase): layer = testing.FUNCTIONAL def setUp(self): - #we must commit the transaction + # we must commit the transaction transaction.commit() diff --git a/collective/portlet/embed/tests/test_portlet.py b/collective/portlet/embed/tests/test_portlet.py index e98a91d..fbdf11e 100644 --- a/collective/portlet/embed/tests/test_portlet.py +++ b/collective/portlet/embed/tests/test_portlet.py @@ -94,7 +94,7 @@ def test_render(self): assignment=portlet.Assignment()) r = r.__of__(self.folder) r.update() - #output = r.render() + # output = r.render() # TODO: Test output From 40adb97eeab246fe0d08f5488d64e11ae0b7257e Mon Sep 17 00:00:00 2001 From: Luca Fabbri Date: Thu, 10 Sep 2015 16:28:59 +0200 Subject: [PATCH 8/8] Plone 5 compatibility --- collective/portlet/embed/portlet.py | 12 +++++++++--- setup.py | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/collective/portlet/embed/portlet.py b/collective/portlet/embed/portlet.py index b935141..100e4f5 100644 --- a/collective/portlet/embed/portlet.py +++ b/collective/portlet/embed/portlet.py @@ -1,12 +1,16 @@ from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile from collective.portlet.embed import messageFactory as _ -from plone.app.portlets.browser import z3cformhelper from plone.i18n.normalizer.interfaces import IIDNormalizer from plone.portlet.static import static from z3c.form import field from zope import component from zope import interface from zope import schema +try: + from plone.app.portlets.browser import z3cformhelper as base +except ImportError: + # Plone 5? + from plone.app.portlets.portlets import base class IEmbedPortlet(static.IStaticPortlet): @@ -53,8 +57,9 @@ def css_class(self): return "portlet-embed-%s" % normalizer.normalize(header) -class AddForm(z3cformhelper.AddForm): +class AddForm(base.AddForm): """add form""" + schema = IEmbedPortlet fields = field.Fields(IEmbedPortlet) label = _(u"title_add_portlet", default=u"Add embed portlet") @@ -65,9 +70,10 @@ def create(self, data): return Assignment(**data) -class EditForm(z3cformhelper.EditForm): +class EditForm(base.EditForm): """Portlet edit form. """ + schema = IEmbedPortlet fields = field.Fields(IEmbedPortlet) label = _(u"title_edit_portlet", default=u"Edit embed portlet") diff --git a/setup.py b/setup.py index 3070b85..a83c97b 100644 --- a/setup.py +++ b/setup.py @@ -19,6 +19,7 @@ "Framework :: Plone :: 4.1", "Framework :: Plone :: 4.2", "Framework :: Plone :: 4.3", + "Framework :: Plone :: 5.0", "Programming Language :: Python", ], keywords='plone portlet embed iframe',