Backport i18n polishing (#5542) and update locales (#5695)

Co-authored-by: Mikel Larreategi <mlarreategi@codesyntax.com>
Co-authored-by: David Glick <david@glicksoftware.com>

package.json

@@ -247,7 +247,7 @@
     "@loadable/component": "5.14.1",
     "@loadable/server": "5.14.0",
     "@loadable/webpack-plugin": "5.15.2",
-    "@plone/scripts": "^3.2.1",
+    "@plone/scripts": "^3.3.1",
     "@testing-library/cypress": "9.0.0",
     "@testing-library/jest-dom": "5.16.4",
     "@testing-library/react": "12.1.5",

packages/scripts/i18n.cjs

@@ -104,8 +104,8 @@ function getMessages() {
 function messagesToPot(messages) {
   return map(keys(messages).sort(), (key) =>
     [
+      `#. Default: "${messages[key].defaultMessage.trim()}"`,
       ...map(messages[key].filenames, (filename) => `#: ${filename}`),
-      `# defaultMessage: ${messages[key].defaultMessage}`,
       `msgid "${key}"`,
       'msgstr ""',
     ].join('\n'),
@@ -124,10 +124,10 @@ msgstr ""
 "POT-Creation-Date: ${new Date().toISOString()}\\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\\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"
+"MIME-Version: 1.0\\n"
 "Language-Code: en\\n"
 "Language-Name: English\\n"
 "Preferred-Encodings: utf-8\\n"
@@ -153,7 +153,7 @@ function poToJson({ registry, addonMode }) {
           language === 'en'
             ? item.msgstr[0] ||
               (item.comments[0]
-                ? item.comments[0].replace('defaultMessage: ', '')
+                ? item.comments[0].replace('. Default: ', '')
                 : '')
             : item.msgstr[0];
       }
@@ -212,7 +212,7 @@ function poToJson({ registry, addonMode }) {
  */
 function formatHeader(comments, headers) {
   return [
-    ...map(comments, (comment) => `# ${comment}`),
+    ...map(comments, (comment) => `#. ${comment}`),
     'msgid ""',
     'msgstr ""',
     ...map(keys(headers), (key) => `"${key}: ${headers[key]}\\n"`),
@@ -227,7 +227,6 @@ function formatHeader(comments, headers) {
  */
 function syncPoByPot() {
   const pot = Pofile.parse(fs.readFileSync('locales/volto.pot', 'utf8'));
-
   map(glob('locales/**/*.po'), (filename) => {
     const po = Pofile.parse(fs.readFileSync(filename, 'utf8'));
 
@@ -237,8 +236,8 @@ function syncPoByPot() {
 ${map(pot.items, (item) => {
   const poItem = find(po.items, { msgid: item.msgid });
   return [
+    `#. ${item.extractedComments[0]}`,
     `${map(item.references, (ref) => `#: ${ref}`).join('\n')}`,
-    `# ${item.comments[0]}`,
     `msgid "${item.msgid}"`,
     `msgstr "${poItem ? poItem.msgstr : ''}"`,
   ].join('\n');

packages/scripts/news/5542.internal

@@ -0,0 +1 @@
+Polish po file handling @erral

packages/volto/news/5542.internal

@@ -0,0 +1 @@
+Polish po file handling @erral

src/components/manage/Contents/Contents.jsx

@@ -1226,10 +1226,8 @@ class Contents extends Component {
                           this.state.containedItemsToDelete > 0 ? (
                             <>
                               <FormattedMessage
-                                id="Some items are also a folder.
-                              By deleting them you will delete {containedItemsToDelete} {variation} inside the folders."
-                                defaultMessage="Some items are also a folder.
-                              By deleting them you will delete {containedItemsToDelete} {variation} inside the folders."
+                                id="Some items are also a folder. By deleting them you will delete {containedItemsToDelete} {variation} inside the folders."
+                                defaultMessage="Some items are also a folder. By deleting them you will delete {containedItemsToDelete} {variation} inside the folders."
                                 values={{
                                   containedItemsToDelete: (
                                     <span>
@@ -1323,10 +1321,8 @@ class Contents extends Component {
                         ) : this.state.containedItemsToDelete > 0 ? (
                           <>
                             <FormattedMessage
-                              id="This item is also a folder.
-                            By deleting it you will delete {containedItemsToDelete} {variation} inside the folder."
-                              defaultMessage="This item is also a folder.
-                            By deleting it you will delete {containedItemsToDelete} {variation} inside the folder."
+                              id="This item is also a folder. By deleting it you will delete {containedItemsToDelete} {variation} inside the folder."
+                              defaultMessage="This item is also a folder. By deleting it you will delete {containedItemsToDelete} {variation} inside the folder."
                               values={{
                                 containedItemsToDelete: (
                                   <span>

src/config/Blocks.jsx

@@ -451,7 +451,7 @@ const blocksConfig = {
           },
           {
             id: 'daterangeFacet',
-            title: 'Date range',
+            title: 'Date Range',
             view: DateRangeFacet,
             isDefault: false,
             stateToValue: DateRangeFacet.stateToValue,

yarn.lock

@@ -3359,9 +3359,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@plone/scripts@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "@plone/scripts@npm:3.2.1"
+"@plone/scripts@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "@plone/scripts@npm:3.3.1"
   dependencies:
     "@babel/core": ^7.0.0
     babel-plugin-react-intl: 5.1.17
@@ -3379,7 +3379,7 @@ __metadata:
     addon: addon/index.js
     changelogupdater: changelogupdater.cjs
     i18n: i18n.cjs
-  checksum: e0d2fc60945e545db034724979f20e30d37039f00a86428eb3d0ee256103c6b062e6136520643649be3614816abc4effae063d2a9c84be42e0af03b829bc9b9e
+  checksum: ca61990664378456f3ea97f3cbd00ed9c805990edc6a3d4d452e6a858ff21297e24bede4706307136506399898fdbb8934f8af55de9848a1adb9235295cda8db
   languageName: node
   linkType: hard
 
@@ -3401,7 +3401,7 @@ __metadata:
     "@loadable/component": 5.14.1
     "@loadable/server": 5.14.0
     "@loadable/webpack-plugin": 5.15.2
-    "@plone/scripts": ^3.2.1
+    "@plone/scripts": ^3.3.1
     "@storybook/addon-actions": ^6.5.15
     "@storybook/addon-controls": 6.5.15
     "@storybook/addon-essentials": ^6.5.15