Skip to content

Commit

Permalink
[fc] Repository: plone.i18n
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2022-08-25T01:13:47+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.i18n@d447fc2

Added native names for German and Dutch country-specific language variants.

Then all related language variants are shown together in the language control panel.
Fixes plone/Products.CMFPlone#824, at least for these two languages.

Files changed:
A news/824.bugfix
M plone/i18n/locales/languages.py
Repository: plone.i18n

Branch: refs/heads/master
Date: 2022-08-25T17:31:39+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.i18n@57cda76

Merge pull request #44 from plone/maurits-native-names-de-nl

Added native names for German and Dutch language variants

Files changed:
A news/824.bugfix
M plone/i18n/locales/languages.py
  • Loading branch information
@jensens
jensens committed Aug 25, 2022
1 parent 7d5054c commit 810b28b
Showing 1 changed file with 17 additions and 46 deletions.
63 changes: 17 additions & 46 deletions last_commit.txt
View file
@@ -1,66 +1,37 @@
Repository: Products.CMFPlone
Repository: plone.i18n


Branch: refs/heads/master
Date: 2022-08-24T11:44:55+02:00
Date: 2022-08-25T01:13:47+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/Products.CMFPlone/commit/689bf016b1aa04a268c68cbde9f31bedfd206deb
Commit: https://github.com/plone/plone.i18n/commit/d447fc29389278794f5ffb7372b86602835f8f8c

Fixed adding control panel action via ZMI.
Added native names for German and Dutch country-specific language variants.

Files changed:
A news/1959.bugfix
M Products/CMFPlone/PloneControlPanel.py

b'diff --git a/Products/CMFPlone/PloneControlPanel.py b/Products/CMFPlone/PloneControlPanel.py\nindex 0748f25765..494841d45f 100644\n--- a/Products/CMFPlone/PloneControlPanel.py\n+++ b/Products/CMFPlone/PloneControlPanel.py\n@@ -224,7 +224,7 @@ def addAction(self,\n description=\'\',\n REQUEST=None,\n ):\n- # Add an action to our list.\n+ """Add an action to our list."""\n if not name:\n raise ValueError(\'A name is required.\')\n \ndiff --git a/news/1959.bugfix b/news/1959.bugfix\nnew file mode 100644\nindex 0000000000..04254865c2\n--- /dev/null\n+++ b/news/1959.bugfix\n@@ -0,0 +1,2 @@\n+Fixed adding control panel action via ZMI.\n+[maurits]\n'

Repository: Products.CMFPlone


Branch: refs/heads/master
Date: 2022-08-24T22:53:50+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/Products.CMFPlone/commit/590d2a636b2430badf1083f7aa339f19c80916f2

Fixed test registerConfiglet: instead of NotFound we get Unauthorized.

Files changed:
M Products/CMFPlone/tests/testSecurity.py

b'diff --git a/Products/CMFPlone/tests/testSecurity.py b/Products/CMFPlone/tests/testSecurity.py\nindex 5286d8ee2a..dc1eff08c1 100644\n--- a/Products/CMFPlone/tests/testSecurity.py\n+++ b/Products/CMFPlone/tests/testSecurity.py\n@@ -87,7 +87,9 @@ def test_widget_traversal_2(self):\n def test_registerConfiglet_1(self):\n VECTOR = "/plone/portal_controlpanel/registerConfiglet?id=cake&name=Cakey&action=woo&permission=View&icon_expr="\n res = self.publish(VECTOR)\n- self.assertEqual(404, res.status)\n+ self.assertEqual(302, res.status)\n+ self.assertTrue(res.headers[\'location\'].startswith(\n+ \'http://nohost/plone/acl_users/credentials_cookie_auth/require_login\'))\n \n def test_registerConfiglet_2(self):\n VECTOR = "/plone/portal_controlpanel/registerConfiglet?id=cake&name=Cakey&action=woo&permission=View&icon_expr="\n'

Repository: Products.CMFPlone


Branch: refs/heads/master
Date: 2022-08-24T22:54:55+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/Products.CMFPlone/commit/41f8144bb6868db4ce86f2e5d4e39f8254428328

Merge branch 'master' into maurits-issue-1959-60
Then all related language variants are shown together in the language control panel.
Fixes https://github.com/plone/Products.CMFPlone/issues/824, at least for these two languages.

Files changed:
M Products/CMFPlone/browser/templates/plone-addsite.pt
M Products/CMFPlone/controlpanel/browser/maintenance.pt
A news/824.bugfix
M plone/i18n/locales/languages.py

b'diff --git a/Products/CMFPlone/browser/templates/plone-addsite.pt b/Products/CMFPlone/browser/templates/plone-addsite.pt\nindex 95641ab424..c4ff0769e1 100644\n--- a/Products/CMFPlone/browser/templates/plone-addsite.pt\n+++ b/Products/CMFPlone/browser/templates/plone-addsite.pt\n@@ -1,5 +1,4 @@\n-<!DOCTYPE html\n- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n+<!DOCTYPE html>\n <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:i18n="http://xml.zope.org/namespaces/i18n" lang="en"\n i18n:domain="plone">\n@@ -14,9 +13,9 @@\n <link rel="stylesheet"\n type="text/css"\n href="${string:${context/absolute_url}/++resource++plone-admin-ui.css}" />\n- <script type="text/javascript" tal:attributes="src string:${context/absolute_url}/++resource++jstz-1.0.4.min.js">\n+ <script tal:attributes="src string:${context/absolute_url}/++resource++jstz-1.0.4.min.js">\n </script>\n- <script type="text/javascript" tal:attributes="src string:${context/absolute_url}/++resource++plone-admin-ui.js">\n+ <script tal:attributes="src string:${context/absolute_url}/++resource++plone-admin-ui.js">\n </script>\n </head>\n \ndiff --git a/Products/CMFPlone/controlpanel/browser/maintenance.pt b/Products/CMFPlone/controlpanel/browser/maintenance.pt\nindex ecd8f30279..4c31999511 100644\n--- a/Products/CMFPlone/controlpanel/browser/maintenance.pt\n+++ b/Products/CMFPlone/controlpanel/browser/maintenance.pt\n@@ -1,3 +1,4 @@\n+<!DOCTYPE html>\n <html xmlns="http://www.w3.org/1999/xhtml"\n xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:tal="http://xml.zope.org/namespaces/tal"\n@@ -145,7 +146,7 @@\n \n </form>\n \n- <script type="text/javascript"\n+ <script\n tal:define="extra_script view/extra_script | nothing"\n tal:condition="extra_script"\n tal:content="structure extra_script">\n'
b'diff --git a/news/824.bugfix b/news/824.bugfix\nnew file mode 100644\nindex 0000000..8313353\n--- /dev/null\n+++ b/news/824.bugfix\n@@ -0,0 +1,3 @@\n+Added native names for German and Dutch country-specific language variants.\n+Then all related language variants are shown together in the language control panel.\n+[maurits]\ndiff --git a/plone/i18n/locales/languages.py b/plone/i18n/locales/languages.py\nindex e2516a1..90342b4 100644\n--- a/plone/i18n/locales/languages.py\n+++ b/plone/i18n/locales/languages.py\n@@ -713,26 +713,32 @@ class MetadataLanguageAvailability(LanguageAvailability):\n },\n "de-be": {\n "name": "German (Belgium)",\n+ "native": "Deutsch (Belgien)",\n "flag": "countryflag/de",\n },\n "de-ch": {\n "name": "German (Switzerland)",\n+ "native": "Deutsch (Schweiz)",\n "flag": "countryflag/ch",\n },\n "de-de": {\n "name": "German (Germany)",\n+ "native": "Deutsch (Deutschland)",\n "flag": "countryflag/de",\n },\n "de-dk": {\n "name": "German (Denmark)",\n+ "native": "Deutsch (Danmark)",\n "flag": "countryflag/de",\n },\n "de-li": {\n "name": "German (Liechtenstein)",\n+ "native": "Deutsch (Liechtenstein)",\n "flag": "countryflag/li",\n },\n "de-lu": {\n "name": "German (Luxembourg)",\n+ "native": "Deutsch (Luxemburg)",\n "flag": "countryflag/de",\n },\n "el-cy": {\n@@ -1357,22 +1363,27 @@ class MetadataLanguageAvailability(LanguageAvailability):\n },\n "nl-an": {\n "name": "Dutch (Netherlands Antilles)",\n+ "native": "Nederlands (Antillen)",\n "flag": "countryflag/an",\n },\n "nl-aw": {\n "name": "Dutch (Aruba)",\n+ "native": "Nederlands (Aruba)",\n "flag": "countryflag/aw",\n },\n "nl-be": {\n "name": "Dutch (Belgium)",\n+ "native": "Nederlands (Belgi\xc3\xab)",\n "flag": "countryflag/be",\n },\n "nl-nl": {\n "name": "Dutch (Netherlands)",\n+ "native": "Nederlands (Nederland)",\n "flag": "countryflag/nl",\n },\n "nl-sr": {\n "name": "Dutch (Suriname)",\n+ "native": "Nederlands (Suriname)",\n "flag": "countryflag/sr",\n },\n "pt-ao": {\n'

Repository: Products.CMFPlone
Repository: plone.i18n


Branch: refs/heads/master
Date: 2022-08-25T17:28:55+02:00
Date: 2022-08-25T17:31:39+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/Products.CMFPlone/commit/55d9d19b75a1d5706b37d1554b73d30fc5d2910a
Commit: https://github.com/plone/plone.i18n/commit/57cda7657a5a5122e9c5f5a5bac9fe4ccc500b60

Merge pull request #3620 from plone/maurits-issue-1959-60
Merge pull request #44 from plone/maurits-native-names-de-nl

Fixed adding control panel action via ZMI. [6.0]
Added native names for German and Dutch language variants

Files changed:
A news/1959.bugfix
M Products/CMFPlone/PloneControlPanel.py
M Products/CMFPlone/tests/testSecurity.py
A news/824.bugfix
M plone/i18n/locales/languages.py

b'diff --git a/Products/CMFPlone/PloneControlPanel.py b/Products/CMFPlone/PloneControlPanel.py\nindex 0748f25765..494841d45f 100644\n--- a/Products/CMFPlone/PloneControlPanel.py\n+++ b/Products/CMFPlone/PloneControlPanel.py\n@@ -224,7 +224,7 @@ def addAction(self,\n description=\'\',\n REQUEST=None,\n ):\n- # Add an action to our list.\n+ """Add an action to our list."""\n if not name:\n raise ValueError(\'A name is required.\')\n \ndiff --git a/Products/CMFPlone/tests/testSecurity.py b/Products/CMFPlone/tests/testSecurity.py\nindex 5286d8ee2a..dc1eff08c1 100644\n--- a/Products/CMFPlone/tests/testSecurity.py\n+++ b/Products/CMFPlone/tests/testSecurity.py\n@@ -87,7 +87,9 @@ def test_widget_traversal_2(self):\n def test_registerConfiglet_1(self):\n VECTOR = "/plone/portal_controlpanel/registerConfiglet?id=cake&name=Cakey&action=woo&permission=View&icon_expr="\n res = self.publish(VECTOR)\n- self.assertEqual(404, res.status)\n+ self.assertEqual(302, res.status)\n+ self.assertTrue(res.headers[\'location\'].startswith(\n+ \'http://nohost/plone/acl_users/credentials_cookie_auth/require_login\'))\n \n def test_registerConfiglet_2(self):\n VECTOR = "/plone/portal_controlpanel/registerConfiglet?id=cake&name=Cakey&action=woo&permission=View&icon_expr="\ndiff --git a/news/1959.bugfix b/news/1959.bugfix\nnew file mode 100644\nindex 0000000000..04254865c2\n--- /dev/null\n+++ b/news/1959.bugfix\n@@ -0,0 +1,2 @@\n+Fixed adding control panel action via ZMI.\n+[maurits]\n'
b'diff --git a/news/824.bugfix b/news/824.bugfix\nnew file mode 100644\nindex 0000000..8313353\n--- /dev/null\n+++ b/news/824.bugfix\n@@ -0,0 +1,3 @@\n+Added native names for German and Dutch country-specific language variants.\n+Then all related language variants are shown together in the language control panel.\n+[maurits]\ndiff --git a/plone/i18n/locales/languages.py b/plone/i18n/locales/languages.py\nindex e2516a1..90342b4 100644\n--- a/plone/i18n/locales/languages.py\n+++ b/plone/i18n/locales/languages.py\n@@ -713,26 +713,32 @@ class MetadataLanguageAvailability(LanguageAvailability):\n },\n "de-be": {\n "name": "German (Belgium)",\n+ "native": "Deutsch (Belgien)",\n "flag": "countryflag/de",\n },\n "de-ch": {\n "name": "German (Switzerland)",\n+ "native": "Deutsch (Schweiz)",\n "flag": "countryflag/ch",\n },\n "de-de": {\n "name": "German (Germany)",\n+ "native": "Deutsch (Deutschland)",\n "flag": "countryflag/de",\n },\n "de-dk": {\n "name": "German (Denmark)",\n+ "native": "Deutsch (Danmark)",\n "flag": "countryflag/de",\n },\n "de-li": {\n "name": "German (Liechtenstein)",\n+ "native": "Deutsch (Liechtenstein)",\n "flag": "countryflag/li",\n },\n "de-lu": {\n "name": "German (Luxembourg)",\n+ "native": "Deutsch (Luxemburg)",\n "flag": "countryflag/de",\n },\n "el-cy": {\n@@ -1357,22 +1363,27 @@ class MetadataLanguageAvailability(LanguageAvailability):\n },\n "nl-an": {\n "name": "Dutch (Netherlands Antilles)",\n+ "native": "Nederlands (Antillen)",\n "flag": "countryflag/an",\n },\n "nl-aw": {\n "name": "Dutch (Aruba)",\n+ "native": "Nederlands (Aruba)",\n "flag": "countryflag/aw",\n },\n "nl-be": {\n "name": "Dutch (Belgium)",\n+ "native": "Nederlands (Belgi\xc3\xab)",\n "flag": "countryflag/be",\n },\n "nl-nl": {\n "name": "Dutch (Netherlands)",\n+ "native": "Nederlands (Nederland)",\n "flag": "countryflag/nl",\n },\n "nl-sr": {\n "name": "Dutch (Suriname)",\n+ "native": "Nederlands (Suriname)",\n "flag": "countryflag/sr",\n },\n "pt-ao": {\n'

0 comments on commit 810b28b

Please sign in to comment.