Skip to content

Commit

Permalink
[fc] Repository: plone.formwidget.namedfile
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2016-01-27T14:08:19+01:00
Author: Stephan Klinger (staeff) <stephan.klinger@freitag.de>
Commit: plone/plone.formwidget.namedfile@869f445

Use plone i18n domain

Files changed:
M plone/formwidget/namedfile/__init__.py
M plone/formwidget/namedfile/configure.zcml
M plone/formwidget/namedfile/file_display.pt
M plone/formwidget/namedfile/file_input.pt
M plone/formwidget/namedfile/image_display.pt
M plone/formwidget/namedfile/image_input.pt
Repository: plone.formwidget.namedfile
Branch: refs/heads/master
Date: 2016-01-27T14:23:58+01:00
Author: Stephan Klinger (staeff) <stephan.klinger@freitag.de>
Commit: plone/plone.formwidget.namedfile@d565022

Update CHANGES.txt

Files changed:
M CHANGES.rst
Repository: plone.formwidget.namedfile
Branch: refs/heads/master
Date: 2016-01-27T14:34:43+01:00
Author: Vincent Fretin (vincentfretin) <vincent.fretin@gmail.com>
Commit: plone/plone.formwidget.namedfile@a27a461

Merge pull request #18 from plone/use-plone-i18n-domain

Use plone i18n domain

Files changed:
M CHANGES.rst
M plone/formwidget/namedfile/__init__.py
M plone/formwidget/namedfile/configure.zcml
M plone/formwidget/namedfile/file_display.pt
M plone/formwidget/namedfile/file_input.pt
M plone/formwidget/namedfile/image_display.pt
M plone/formwidget/namedfile/image_input.pt
  • Loading branch information
@vincentfretin
vincentfretin committed Jan 27, 2016
1 parent b9ccbeb commit 2f7cd05
Showing 1 changed file with 258 additions and 98 deletions.
356 changes: 258 additions & 98 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,110 +1,270 @@
Repository: Products.LinguaPlone
Repository: plone.formwidget.namedfile


Branch: refs/heads/master
Date: 2016-01-25T11:59:02+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: https://github.com/plone/Products.LinguaPlone/commit/404bfcdf6f41ecb7a2ac3c1eefbefac5ed96b7fa
Date: 2016-01-27T14:08:19+01:00
Author: Stephan Klinger (staeff) <stephan.klinger@freitag.de>
Commit: https://github.com/plone/plone.formwidget.namedfile/commit/869f445a2369e150ece8c8242be4a078cc47f5d5

all lowercase "remove" in uninstall profile. doesnt matter, but...
Use plone i18n domain

Files changed:
M Products/LinguaPlone/profiles/uninstall/browserlayer.xml
M Products/LinguaPlone/profiles/uninstall/catalog.xml
M Products/LinguaPlone/profiles/uninstall/componentregistry.xml
M Products/LinguaPlone/profiles/uninstall/kssregistry.xml
M Products/LinguaPlone/profiles/uninstall/reference_catalog.xml
M Products/LinguaPlone/profiles/uninstall/skins.xml
M Products/LinguaPlone/profiles/uninstall/uid_catalog.xml

diff --git a/Products/LinguaPlone/profiles/uninstall/browserlayer.xml b/Products/LinguaPlone/profiles/uninstall/browserlayer.xml
index e9d85d8..0e976eb 100644
--- a/Products/LinguaPlone/profiles/uninstall/browserlayer.xml
+++ b/Products/LinguaPlone/profiles/uninstall/browserlayer.xml
@@ -1,7 +1,3 @@
<layers>
- <layer
- remove="True"
- name="LinguaPlone"
- interface="Products.LinguaPlone.interfaces.ILinguaPloneProductLayer"
- />
+ <layer remove="true" name="LinguaPlone"/>
</layers>
diff --git a/Products/LinguaPlone/profiles/uninstall/catalog.xml b/Products/LinguaPlone/profiles/uninstall/catalog.xml
index a21dd57..1aaea23 100644
--- a/Products/LinguaPlone/profiles/uninstall/catalog.xml
+++ b/Products/LinguaPlone/profiles/uninstall/catalog.xml
M plone/formwidget/namedfile/__init__.py
M plone/formwidget/namedfile/configure.zcml
M plone/formwidget/namedfile/file_display.pt
M plone/formwidget/namedfile/file_input.pt
M plone/formwidget/namedfile/image_display.pt
M plone/formwidget/namedfile/image_input.pt

diff --git a/plone/formwidget/namedfile/__init__.py b/plone/formwidget/namedfile/__init__.py
index a1e34f3..99b3379 100644
--- a/plone/formwidget/namedfile/__init__.py
+++ b/plone/formwidget/namedfile/__init__.py
@@ -2,6 +2,6 @@
from plone.formwidget.namedfile.widget import NamedFileWidget # noqa
from plone.formwidget.namedfile.widget import NamedImageFieldWidget # noqa
from plone.formwidget.namedfile.widget import NamedImageWidget # noqa
-import zope.i18nmessageid
+from zope.i18nmessageid import MessageFactory

-MessageFactory = zope.i18nmessageid.MessageFactory('plone.formwidget.namedfile')
+_ = MessageFactory('plone')
diff --git a/plone/formwidget/namedfile/configure.zcml b/plone/formwidget/namedfile/configure.zcml
index bce3532..cc805f8 100644
--- a/plone/formwidget/namedfile/configure.zcml
+++ b/plone/formwidget/namedfile/configure.zcml
@@ -3,7 +3,7 @@
xmlns:z3c="http://namespaces.zope.org/z3c"
xmlns:browser="http://namespaces.zope.org/browser"
xmlns:i18n="http://namespaces.zope.org/i18n"
- i18n_domain="plone.formwidget.namedfile">
+ i18n_domain="plone">

<include package="z3c.form" file="meta.zcml" />
<include package="z3c.form" />
diff --git a/plone/formwidget/namedfile/file_display.pt b/plone/formwidget/namedfile/file_display.pt
index 2d10b4a..423fe10 100644
--- a/plone/formwidget/namedfile/file_display.pt
+++ b/plone/formwidget/namedfile/file_display.pt
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<object name="portal_catalog">
- <column value="Language" remove="True"/>
+ <column remove="true" value="Language"/>
</object>
diff --git a/Products/LinguaPlone/profiles/uninstall/componentregistry.xml b/Products/LinguaPlone/profiles/uninstall/componentregistry.xml
index 3255718..39b5085 100644
--- a/Products/LinguaPlone/profiles/uninstall/componentregistry.xml
+++ b/Products/LinguaPlone/profiles/uninstall/componentregistry.xml
@@ -3,11 +3,11 @@
<adapters/>
<utilities>
<utility
- remove="True"
+ remove="true"
interface="plone.i18n.locales.interfaces.IContentLanguageAvailability"
factory="Products.LinguaPlone.vocabulary.SyncedLanguages"/>
<utility
- remove="True"
+ remove="true"
interface="plone.i18n.locales.interfaces.IMetadataLanguageAvailability"
factory="Products.LinguaPlone.vocabulary.SyncedLanguages"/>
</utilities>
diff --git a/Products/LinguaPlone/profiles/uninstall/kssregistry.xml b/Products/LinguaPlone/profiles/uninstall/kssregistry.xml
index aa793c0..fb60aaf 100644
--- a/Products/LinguaPlone/profiles/uninstall/kssregistry.xml
+++ b/Products/LinguaPlone/profiles/uninstall/kssregistry.xml
-<span id="" class="" i18n:domain="plone.formwidget.namedfile"
+<span id="" class="" i18n:domain="plone"
tal:attributes="id view/id;
class view/klass;
style view/style;
@@ -31,7 +31,6 @@
tal:attributes="href view/download_url">Filename</a>
<span class="discreet"> &mdash;<tal:doc_type condition="doc_type">
<span tal:replace="doc_type"
- i18n:domain="plone"
i18n:translate="">ContentType</span>,</tal:doc_type>
<span tal:define="sizekb view/file_size"
tal:replace="sizekb" i18n:translate="">100</span>
diff --git a/plone/formwidget/namedfile/file_input.pt b/plone/formwidget/namedfile/file_input.pt
index 425dd38..72e265b 100644
--- a/plone/formwidget/namedfile/file_input.pt
+++ b/plone/formwidget/namedfile/file_input.pt
@@ -1,5 +1,5 @@
<span
- i18n:domain="plone.formwidget.namedfile"
+ i18n:domain="plone"
tal:attributes="id view/id;
class view/klass;
style view/style;
@@ -39,7 +39,6 @@
>Filename</a>
<span class="discreet"> &mdash;<tal:doc_type condition="doc_type">
<span tal:replace="doc_type"
- i18n:domain="plone"
i18n:translate="">ContentType</span>,</tal:doc_type>
<span tal:define="sizekb view/file_size" tal:replace="sizekb"
i18n:translate="">100</span>
diff --git a/plone/formwidget/namedfile/image_display.pt b/plone/formwidget/namedfile/image_display.pt
index 3645c0b..86f28a4 100644
--- a/plone/formwidget/namedfile/image_display.pt
+++ b/plone/formwidget/namedfile/image_display.pt
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<object name="portal_kss" meta_type="KSS Registry">
- <kineticstylesheet remove="True" id="linguaplone.kss"/>
+ <kineticstylesheet remove="true" id="linguaplone.kss"/>
</object>
diff --git a/Products/LinguaPlone/profiles/uninstall/reference_catalog.xml b/Products/LinguaPlone/profiles/uninstall/reference_catalog.xml
index 4487449..58d6311 100644
--- a/Products/LinguaPlone/profiles/uninstall/reference_catalog.xml
+++ b/Products/LinguaPlone/profiles/uninstall/reference_catalog.xml
-<span id="" class="" i18n:domain="plone.formwidget.namedfile"
+<span id="" class="" i18n:domain="plone"
tal:attributes="id view/id;
class view/klass;
style view/style;
diff --git a/plone/formwidget/namedfile/image_input.pt b/plone/formwidget/namedfile/image_input.pt
index 75e34bd..8173d3a 100644
--- a/plone/formwidget/namedfile/image_input.pt
+++ b/plone/formwidget/namedfile/image_input.pt
@@ -1,5 +1,5 @@
<span
- i18n:domain="plone.formwidget.namedfile"
+ i18n:domain="plone"
tal:attributes="id view/id;
class view/klass;
style view/style;
@@ -43,7 +43,6 @@
>Filename</a>
<span class="discreet"> &mdash;<tal:doc_type condition="doc_type">
<span tal:replace="doc_type"
- i18n:domain="plone"
i18n:translate="">ContentType</span>,</tal:doc_type>
<span tal:define="sizekb view/file_size" tal:replace="sizekb"
i18n:translate="">100</span>


Repository: plone.formwidget.namedfile


Branch: refs/heads/master
Date: 2016-01-27T14:23:58+01:00
Author: Stephan Klinger (staeff) <stephan.klinger@freitag.de>
Commit: https://github.com/plone/plone.formwidget.namedfile/commit/d56502218db05a8d23ad592be87de8ca46efeb0a

Update CHANGES.txt

Files changed:
M CHANGES.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 17351a8..6a1b38f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,9 @@ Changelog
-------------------

New:
+- Use plone i18n domain
+ See https://github.com/plone/plone.formwidget.namedfile/pull/18
+ [staeff]

- Add Finnish translations [petri]



Repository: plone.formwidget.namedfile


Branch: refs/heads/master
Date: 2016-01-27T14:34:43+01:00
Author: Vincent Fretin (vincentfretin) <vincent.fretin@gmail.com>
Commit: https://github.com/plone/plone.formwidget.namedfile/commit/a27a4613d86546da8ce023746c5853c6eb7cd466

Merge pull request #18 from plone/use-plone-i18n-domain

Use plone i18n domain

Files changed:
M CHANGES.rst
M plone/formwidget/namedfile/__init__.py
M plone/formwidget/namedfile/configure.zcml
M plone/formwidget/namedfile/file_display.pt
M plone/formwidget/namedfile/file_input.pt
M plone/formwidget/namedfile/image_display.pt
M plone/formwidget/namedfile/image_input.pt

diff --git a/CHANGES.rst b/CHANGES.rst
index 17351a8..6a1b38f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,9 @@ Changelog
-------------------

New:
+- Use plone i18n domain
+ See https://github.com/plone/plone.formwidget.namedfile/pull/18
+ [staeff]

- Add Finnish translations [petri]

diff --git a/plone/formwidget/namedfile/__init__.py b/plone/formwidget/namedfile/__init__.py
index a1e34f3..99b3379 100644
--- a/plone/formwidget/namedfile/__init__.py
+++ b/plone/formwidget/namedfile/__init__.py
@@ -2,6 +2,6 @@
from plone.formwidget.namedfile.widget import NamedFileWidget # noqa
from plone.formwidget.namedfile.widget import NamedImageFieldWidget # noqa
from plone.formwidget.namedfile.widget import NamedImageWidget # noqa
-import zope.i18nmessageid
+from zope.i18nmessageid import MessageFactory

-MessageFactory = zope.i18nmessageid.MessageFactory('plone.formwidget.namedfile')
+_ = MessageFactory('plone')
diff --git a/plone/formwidget/namedfile/configure.zcml b/plone/formwidget/namedfile/configure.zcml
index bce3532..cc805f8 100644
--- a/plone/formwidget/namedfile/configure.zcml
+++ b/plone/formwidget/namedfile/configure.zcml
@@ -3,7 +3,7 @@
xmlns:z3c="http://namespaces.zope.org/z3c"
xmlns:browser="http://namespaces.zope.org/browser"
xmlns:i18n="http://namespaces.zope.org/i18n"
- i18n_domain="plone.formwidget.namedfile">
+ i18n_domain="plone">

<include package="z3c.form" file="meta.zcml" />
<include package="z3c.form" />
diff --git a/plone/formwidget/namedfile/file_display.pt b/plone/formwidget/namedfile/file_display.pt
index 2d10b4a..423fe10 100644
--- a/plone/formwidget/namedfile/file_display.pt
+++ b/plone/formwidget/namedfile/file_display.pt
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<object name="reference_catalog">
- <column value="Language" remove="True"/>
+ <column remove="true" value="Language"/>
</object>
diff --git a/Products/LinguaPlone/profiles/uninstall/skins.xml b/Products/LinguaPlone/profiles/uninstall/skins.xml
index d7d7b6c..ba42155 100644
--- a/Products/LinguaPlone/profiles/uninstall/skins.xml
+++ b/Products/LinguaPlone/profiles/uninstall/skins.xml
@@ -1,9 +1,7 @@
<?xml version="1.0"?>
<object name="portal_skins">
- <object name="LinguaPlone" meta_type="Filesystem Directory View"
- directory="Products.LinguaPlone:skins/LinguaPlone"
- remove="True"/>
- <skin-path name="*">
- <layer name="LinguaPlone" remove="True" />
- </skin-path>
+ <object remove="true" name="LinguaPlone" meta_type="Filesystem Directory View" directory="Products.LinguaPlone:skins/LinguaPlone"/>
+ <skin-path name="*">
+ <layer remove="true" name="LinguaPlone"/>
+ </skin-path>
</object>
diff --git a/Products/LinguaPlone/profiles/uninstall/uid_catalog.xml b/Products/LinguaPlone/profiles/uninstall/uid_catalog.xml
index d0ce76f..f2183fd 100644
--- a/Products/LinguaPlone/profiles/uninstall/uid_catalog.xml
+++ b/Products/LinguaPlone/profiles/uninstall/uid_catalog.xml
-<span id="" class="" i18n:domain="plone.formwidget.namedfile"
+<span id="" class="" i18n:domain="plone"
tal:attributes="id view/id;
class view/klass;
style view/style;
@@ -31,7 +31,6 @@
tal:attributes="href view/download_url">Filename</a>
<span class="discreet"> &mdash;<tal:doc_type condition="doc_type">
<span tal:replace="doc_type"
- i18n:domain="plone"
i18n:translate="">ContentType</span>,</tal:doc_type>
<span tal:define="sizekb view/file_size"
tal:replace="sizekb" i18n:translate="">100</span>
diff --git a/plone/formwidget/namedfile/file_input.pt b/plone/formwidget/namedfile/file_input.pt
index 425dd38..72e265b 100644
--- a/plone/formwidget/namedfile/file_input.pt
+++ b/plone/formwidget/namedfile/file_input.pt
@@ -1,5 +1,5 @@
<span
- i18n:domain="plone.formwidget.namedfile"
+ i18n:domain="plone"
tal:attributes="id view/id;
class view/klass;
style view/style;
@@ -39,7 +39,6 @@
>Filename</a>
<span class="discreet"> &mdash;<tal:doc_type condition="doc_type">
<span tal:replace="doc_type"
- i18n:domain="plone"
i18n:translate="">ContentType</span>,</tal:doc_type>
<span tal:define="sizekb view/file_size" tal:replace="sizekb"
i18n:translate="">100</span>
diff --git a/plone/formwidget/namedfile/image_display.pt b/plone/formwidget/namedfile/image_display.pt
index 3645c0b..86f28a4 100644
--- a/plone/formwidget/namedfile/image_display.pt
+++ b/plone/formwidget/namedfile/image_display.pt
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<object name="uid_catalog">
- <index name="Language" meta_type="FieldIndex" remove="True"/>
+ <index remove="true" name="Language" meta_type="FieldIndex"/>
</object>
-<span id="" class="" i18n:domain="plone.formwidget.namedfile"
+<span id="" class="" i18n:domain="plone"
tal:attributes="id view/id;
class view/klass;
style view/style;
diff --git a/plone/formwidget/namedfile/image_input.pt b/plone/formwidget/namedfile/image_input.pt
index 75e34bd..8173d3a 100644
--- a/plone/formwidget/namedfile/image_input.pt
+++ b/plone/formwidget/namedfile/image_input.pt
@@ -1,5 +1,5 @@
<span
- i18n:domain="plone.formwidget.namedfile"
+ i18n:domain="plone"
tal:attributes="id view/id;
class view/klass;
style view/style;
@@ -43,7 +43,6 @@
>Filename</a>
<span class="discreet"> &mdash;<tal:doc_type condition="doc_type">
<span tal:replace="doc_type"
- i18n:domain="plone"
i18n:translate="">ContentType</span>,</tal:doc_type>
<span tal:define="sizekb view/file_size" tal:replace="sizekb"
i18n:translate="">100</span>


0 comments on commit 2f7cd05

Please sign in to comment.