Merge f80a9cf into 9267f16

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"
       />
   <permission

collective/portlet/embed/locales/collective.portlet.embed-manual.pot

@@ -0,0 +1,21 @@
+# --- PLEASE EDIT THE LINES BELOW CORRECTLY ---
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\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 ""

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: 2015-09-10 10:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,31 +17,34 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: collective.portlet.embed\n"
 
-#: ./portlet.py:24
+msgid "A new portlet that can contain embed HTML code"
+msgstr ""
+
+#: ./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 ""
 

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: 2015-09-10 10:51+0000\n"
 "PO-Revision-Date: 2012-09-04 09:45+0100\n"
 "Last-Translator: Ralph Jacobs <ralph@fourdigits.nl>\n"
 "Language-Team: Four Digits <support@fourdigits.nl>\n"
@@ -14,31 +14,34 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: collective.portlet.embed\n"
 
-#: ./portlet.py:24
+msgid "A new portlet that can contain embed HTML code"
+msgstr ""
+
+#: ./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"
 

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: 2015-09-10 10:51+0000\n"
 "PO-Revision-Date: 2010-11-13 11:07+0100\n"
 "Last-Translator: YOURNAME <name@email.com>\n"
 "Language-Team: French <plone-fr@lists.plone.org>\n"
@@ -17,30 +17,34 @@ msgstr ""
 "Domain: collective.portlet.embed\n"
 "X-Is-Fallback-For: fr-be fr-ca fr-lu fr-mc fr-ch fr-fr\n"
 
-#: ./portlet.py:24
+msgid "A new portlet that can contain embed HTML code"
+msgstr ""
+
+#: ./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"
+

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 <EMAIL@ADDRESS>, YEAR.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\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 <keul@redturtle.it>\n"
+"Language-Team: plone-italian-translation-discussion <plone-italian-translation-discussion@lists.coactivate.org>\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:26
+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, ..."
+
+#. Default: "A portlet which can display embed HTML code."
+#: ./portlet.py:66
+msgid "description_portlet"
+msgstr "Una portlet che può visualizzare codice HTML integrato"
+
+#. Default: "Add embed portlet"
+#: ./portlet.py:64
+msgid "title_add_portlet"
+msgstr "Una embed portlet"
+
+#. Default: "Edit embed portlet"
+#: ./portlet.py:77
+msgid "title_edit_portlet"
+msgstr "Modifica embed portlet"
+
+#. Default: "Embed portlet"
+#: ./portlet.py:34
+msgid "title_portlet"
+msgstr ""
+

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: 2015-09-10 10:51+0000\n"
 "PO-Revision-Date: 2012-09-04 09:48+0100\n"
 "Last-Translator: Ralph Jacobs <ralph@fourdigits.nl>\n"
 "Language-Team: Four Digits <support@fourdigits.nl>\n"
@@ -14,31 +14,34 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: collective.portlet.embed\n"
 
-#: ./portlet.py:24
+msgid "A new portlet that can contain embed HTML code"
+msgstr ""
+
+#: ./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"
 

collective/portlet/embed/portlet.py

@@ -1,17 +1,16 @@
-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.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):
@@ -58,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")
@@ -70,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")

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

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()

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
 
 

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)
 ----------------

setup.py

@@ -18,11 +18,15 @@
         "Framework :: Plone :: 4.0",
         "Framework :: Plone :: 4.1",
         "Framework :: Plone :: 4.2",
+        "Framework :: Plone :: 4.3",
+        "Framework :: Plone :: 5.0",
         "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 +35,7 @@
       zip_safe=False,
       install_requires=[
           'setuptools',
-          # -*- Extra requirements: -*-
+          'z3c.form',
       ],
       extras_require=dict(
           test=['plone.app.testing', 'plone.app.robotframework', 'selenium'],