fix: recurrence string and edit recurrence (#482)

* fix: recurrence string and edit recurrence * fix: en locales and release file
RedTurtle · Jan 15, 2024 · 276cbef · 276cbef
1 parent ccf45b3
commit 276cbef
Show file tree

Hide file tree

Showing 9 changed files with 225 additions and 8 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -41,6 +41,16 @@
 - ...
 -->
 
+## Versione x.x.x (dd/mm/yyyy)
+
+### Migliorie
+
+- Migliorata il testo della ricorrenza di un evento.
+
+### Fix
+
+- Risolto un problema nell'edit della ricorrenza di un evento.
+
 ## Versione 11.2.0 (11/01/2023)
 
 ### Migliorie

diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po
@@ -2919,6 +2919,36 @@ msgstr ""
 msgid "risultati_indagini_customer_satisfaction"
 msgstr ""
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

diff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po
@@ -2904,6 +2904,36 @@ msgstr "Rights"
 msgid "risultati_indagini_customer_satisfaction"
 msgstr "Customer satisfaction survey results"
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr "in"
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr "nd"
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr "on the"
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr "rd"
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr "st"
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr "th"
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

diff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po
@@ -2913,6 +2913,36 @@ msgstr "Derechos"
 msgid "risultati_indagini_customer_satisfaction"
 msgstr "Resultados de la encuesta de satisfacción del cliente"
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

diff --git a/locales/fr/LC_MESSAGES/volto.po b/locales/fr/LC_MESSAGES/volto.po
@@ -2921,6 +2921,36 @@ msgstr "Droits"
 msgid "risultati_indagini_customer_satisfaction"
 msgstr "Résultats des enquêtes de satisfaction clients"
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

diff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po
@@ -2904,6 +2904,36 @@ msgstr "Diritti"
 msgid "risultati_indagini_customer_satisfaction"
 msgstr "Risultati indagini di customer satisfaction"
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr "il giorno"
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr " "
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr "il giorno"
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr " "
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr " "
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr " "
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

diff --git a/locales/volto.pot b/locales/volto.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2024-01-11T11:04:31.849Z\n"
+"POT-Creation-Date: 2024-01-11T13:44:40.490Z\n"
 "Last-Translator: Plone i18n <[email protected]>\n"
 "Language-Team: Plone i18n <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -2906,6 +2906,36 @@ msgstr ""
 msgid "risultati_indagini_customer_satisfaction"
 msgstr ""
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

diff --git a/src/customizations/volto/components/manage/Widgets/RecurrenceWidget/RecurrenceWidget.jsx b/src/customizations/volto/components/manage/Widgets/RecurrenceWidget/RecurrenceWidget.jsx
@@ -37,7 +37,6 @@ import {
   FREQUENCES,
   WEEKLY_DAYS,
   MONDAYFRIDAY_DAYS,
-  toISOString,
   rrulei18n,
 } from '@plone/volto/components/manage/Widgets/RecurrenceWidget/Utils';
 
@@ -437,17 +436,17 @@ class RecurrenceWidget extends Component {
         case 'until':
           let mDate = null;
           if (value) {
-            mDate = this.moment(new Date(value));
+            mDate = moment(new Date(value));
             if (typeof value === 'string') {
-              mDate = this.moment(new Date(value));
+              mDate = moment(new Date(value));
             } else {
               //object-->Date()
-              mDate = this.moment(value);
+              mDate = moment(value);
             }
 
             if (this.props.formData.end) {
               //set time from formData.end
-              const mEnd = this.moment(new Date(this.props.formData.end));
+              const mEnd = moment(new Date(this.props.formData.end));
               mDate.set('hour', mEnd.get('hour'));
               mDate.set('minute', mEnd.get('minute'));
             }
@@ -476,8 +475,8 @@ class RecurrenceWidget extends Component {
       field === 'dtstart'
         ? value
         : rruleSet.dtstart()
-        ? rruleSet.dtstart()
-        : new Date();
+          ? rruleSet.dtstart()
+          : new Date();
     var exdates =
       field === 'exdates' ? value : Object.assign([], rruleSet.exdates());
 

diff --git a/src/overrideTranslations.jsx b/src/overrideTranslations.jsx
@@ -0,0 +1,28 @@
+import { defineMessages } from 'react-intl';
+
+defineMessages({
+  rrule_st: {
+    id: 'rrule_st',
+    defaultMessage: '_', //in italiano non si traduce
+  },
+  rrule_nd: {
+    id: 'rrule_nd',
+    defaultMessage: '_', //in italiano non si traduce
+  },
+  rrule_rd: {
+    id: 'rrule_rd',
+    defaultMessage: '_', //in italiano non si traduce
+  },
+  rrule_th: {
+    id: 'rrule_th',
+    defaultMessage: '_', //in italiano non si traduce
+  },
+  rrule_in: {
+    id: 'rrule_in',
+    defaultMessage: 'il giorno',
+  },
+  rrule_on_the: {
+    id: 'rrule_on the',
+    defaultMessage: 'il',
+  },
+});