From b2874e309f82d02320390a5c929c0cc65d5758ee Mon Sep 17 00:00:00 2001 From: davisagli Date: Thu, 12 Dec 2024 11:04:46 -0800 Subject: [PATCH] [fc] Repository: plone.app.users Branch: refs/heads/master Date: 2024-12-12T16:15:15+01:00 Author: Mikel Larreategi (erral) Commit: https://github.com/plone/plone.app.users/commit/6ab77fcee20a8e2b9dc514e282e603685d202e4f missing string for locales Files changed: M plone/app/users/schema.py Repository: plone.app.users Branch: refs/heads/master Date: 2024-12-12T16:15:50+01:00 Author: Mikel Larreategi (erral) Commit: https://github.com/plone/plone.app.users/commit/d9f409e5c3268dc699a8b100b9b2456df47f0723 changelog Files changed: A news/132.bugfix Repository: plone.app.users Branch: refs/heads/master Date: 2024-12-12T11:04:46-08:00 Author: David Glick (davisagli) Commit: https://github.com/plone/plone.app.users/commit/2e7332f820ba6c0b2222bf81413f386ff8fc2d58 Merge pull request #132 from plone/erral-missing-string missing string for locales Files changed: A news/132.bugfix M plone/app/users/schema.py --- last_commit.txt | 50 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index daa021304e..cd786e5497 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,20 +1,48 @@ -Repository: plone.restapi +Repository: plone.app.users -Branch: refs/heads/main -Date: 2024-12-11T16:06:59-08:00 +Branch: refs/heads/master +Date: 2024-12-12T16:15:15+01:00 +Author: Mikel Larreategi (erral) +Commit: https://github.com/plone/plone.app.users/commit/6ab77fcee20a8e2b9dc514e282e603685d202e4f + +missing string for locales + +Files changed: +M plone/app/users/schema.py + +b'diff --git a/plone/app/users/schema.py b/plone/app/users/schema.py\nindex 2c5fdbf..5735fd6 100644\n--- a/plone/app/users/schema.py\n+++ b/plone/app/users/schema.py\n@@ -79,7 +79,7 @@ class IUserDataSchema(Interface):\n \n email = ProtectedEmail(\n title=_("label_email", default="Email"),\n- description="We will use this address if you need to recover your " "password",\n+ description=_("We will use this address if you need to recover your password"),\n required=True,\n constraint=checkEmailAddress,\n )\n' + +Repository: plone.app.users + + +Branch: refs/heads/master +Date: 2024-12-12T16:15:50+01:00 +Author: Mikel Larreategi (erral) +Commit: https://github.com/plone/plone.app.users/commit/d9f409e5c3268dc699a8b100b9b2456df47f0723 + +changelog + +Files changed: +A news/132.bugfix + +b'diff --git a/news/132.bugfix b/news/132.bugfix\nnew file mode 100644\nindex 00000000..80c8b72a\n--- /dev/null\n+++ b/news/132.bugfix\n@@ -0,0 +1 @@\n+Add missing locale for translations [erral]\n' + +Repository: plone.app.users + + +Branch: refs/heads/master +Date: 2024-12-12T11:04:46-08:00 Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.restapi/commit/d012d3f784c5897d5b70164daabdb99b3903ebca +Commit: https://github.com/plone/plone.app.users/commit/2e7332f820ba6c0b2222bf81413f386ff8fc2d58 -fix time-dependence of event recurrent tests (#1850) +Merge pull request #132 from plone/erral-missing-string -* fix time-dependence of event recurrent tests - -* changelog +missing string for locales Files changed: -A news/1850.internal -M src/plone/restapi/tests/test_serializer_summary.py +A news/132.bugfix +M plone/app/users/schema.py -b'diff --git a/news/1850.internal b/news/1850.internal\nnew file mode 100644\nindex 000000000..d4a67450a\n--- /dev/null\n+++ b/news/1850.internal\n@@ -0,0 +1 @@\n+Fix time-dependence of tests. @davisagli\ndiff --git a/src/plone/restapi/tests/test_serializer_summary.py b/src/plone/restapi/tests/test_serializer_summary.py\nindex 9a7b7db45..e186c2f31 100644\n--- a/src/plone/restapi/tests/test_serializer_summary.py\n+++ b/src/plone/restapi/tests/test_serializer_summary.py\n@@ -17,6 +17,7 @@\n from zope.interface import alsoProvides\n \n import Missing\n+import pytz\n import unittest\n \n \n@@ -234,14 +235,15 @@ def setUp(self):\n )\n self.portal.portal_types.DXTestDocument.behaviors = behaviors\n \n+ self.start = datetime(1995, 7, 31, 13, 45, tzinfo=pytz.timezone("UTC"))\n self.event = createContentInContainer(\n self.portal,\n "DXTestDocument",\n id="doc1",\n title="Lorem Ipsum event",\n description="Description event",\n- start=datetime.now(),\n- end=datetime.now() + timedelta(hours=1),\n+ start=self.start,\n+ end=self.start + timedelta(hours=1),\n recurrence="RRULE:FREQ=DAILY;COUNT=3", # see https://github.com/plone/plone.app.event/blob/master/plone/app/event/tests/base_setup.py\n )\n \n@@ -256,7 +258,7 @@ def tearDown(self):\n "this test needs a plone.app.event version that does not include a IContentListingObject adapter",\n )\n def test_dx_event_with_recurrence_old_version(self):\n- tomorrow = datetime.now() + timedelta(days=1)\n+ tomorrow = self.start + timedelta(days=1)\n tomorrow_str = tomorrow.strftime("%Y-%m-%d")\n ot = OccurrenceTraverser(self.event, self.request)\n ocurrence = ot.publishTraverse(self.request, tomorrow_str)\n@@ -269,7 +271,7 @@ def test_dx_event_with_recurrence_old_version(self):\n "this test needs a plone.app.event version that includes a IContentListingObject adapter",\n )\n def test_dx_event_with_recurrence_new_version(self):\n- tomorrow = datetime.now() + timedelta(days=1)\n+ tomorrow = self.start + timedelta(days=1)\n tomorrow_str = tomorrow.strftime("%Y-%m-%d")\n ot = OccurrenceTraverser(self.event, self.request)\n ocurrence = ot.publishTraverse(self.request, tomorrow_str)\n' +b'diff --git a/news/132.bugfix b/news/132.bugfix\nnew file mode 100644\nindex 00000000..80c8b72a\n--- /dev/null\n+++ b/news/132.bugfix\n@@ -0,0 +1 @@\n+Add missing locale for translations [erral]\ndiff --git a/plone/app/users/schema.py b/plone/app/users/schema.py\nindex 2c5fdbf4..5735fd62 100644\n--- a/plone/app/users/schema.py\n+++ b/plone/app/users/schema.py\n@@ -79,7 +79,7 @@ class IUserDataSchema(Interface):\n \n email = ProtectedEmail(\n title=_("label_email", default="Email"),\n- description="We will use this address if you need to recover your " "password",\n+ description=_("We will use this address if you need to recover your password"),\n required=True,\n constraint=checkEmailAddress,\n )\n'