normalize wording keys

apostrophecms · Oct 24, 2023 · 4b26eaa · 4b26eaa
1 parent 61d39e1
commit 4b26eaa
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 27 deletions.
diff --git a/i18n/en.json b/i18n/en.json
@@ -58,16 +58,14 @@
   "formName": "Form name",
   "forms": "Forms",
   "globalGroup": "Form Settings",
+  "group": "Group",
   "groupAdvanced": "Advanced",
   "groupAfterSubmission": "After submission",
   "groupForm": "Form",
-
-  "group": "Group",
-  "groupContents": "Groups Contents",
-  "groupContentsHelp": "Contains all form widgets excepts groups",
-  "groupLabel": "Group Label",
-  "groups": "Groups",
-
+  "groupGroups": "Groups",
+  "groupGroupsContents": "Groups Contents",
+  "groupGroupsContentsHelp": "Contains all form widgets excepts groups",
+  "groupGroupsLabel": "Group Label",
   "notFoundForm": "No matching form was found",
   "queryParamKey": "Key",
   "queryParamLimit": "Limit Saved Parameter Value Length (characters)",

diff --git a/index.js b/index.js
@@ -35,9 +35,7 @@ module.exports = {
     const group = {
       basics: {
         label: 'aposForm:groupForm',
-        fields: [
-          'contents'
-        ]
+        fields: [ 'contents' ]
       },
       afterSubmit: {
         label: 'aposForm:groupAfterSubmission',

diff --git a/modules/@apostrophecms/form-group-widget/index.js b/modules/@apostrophecms/form-group-widget/index.js
@@ -11,27 +11,29 @@ module.exports = {
   fields (self) {
     // Prevent nested groups
     const form = self.options.apos.modules['@apostrophecms/form'];
-    const formWidgets = Object.assign({}, form.fields.contents.options.widgets);
-    delete formWidgets['@apostrophecms/form-group'];
+    const {
+      '@apostrophecms/form-group': groupWidget,
+      ...formWidgets
+    } = form.fields.contents.options.widgets;
 
     return {
       add: {
         groups: {
-          label: 'aposForm:groups',
+          label: 'aposForm:groupGroups',
           type: 'array',
           required: true,
           titleField: 'label',
           inline: true,
           fields: {
             add: {
               label: {
-                label: 'aposForm:groupLabel',
+                label: 'aposForm:groupGroupsLabel',
                 type: 'string',
                 required: true
               },
               contents: {
-                label: 'aposForm:groupContents',
-                help: 'aposForm:groupContentsHelp',
+                label: 'aposForm:groupGroupsContents',
+                help: 'aposForm:groupGroupsContentsHelp',
                 type: 'area',
                 contextual: false,
                 options: {

diff --git a/modules/@apostrophecms/form-group-widget/ui/src/index.scss b/modules/@apostrophecms/form-group-widget/ui/src/index.scss
diff --git a/modules/@apostrophecms/form-group-widget/views/widget.html b/modules/@apostrophecms/form-group-widget/views/widget.html
@@ -1,6 +1,6 @@
 {% set prependIfPrefix = apos.modules['@apostrophecms/form'].prependIfPrefix %}
 
-<div data-apos-form-groups class="apos-form-groups {{ prependIfPrefix('__group') }}">
+<div data-apos-form-groups class="apos-form-groups {{ prependIfPrefix('__groups') }}">
   {% for group in data.widget.groups %}
     <fieldset
       class="apos-form-group {{ prependIfPrefix('__group') }}"

diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "form builder"
   ],
   "devDependencies": {
-    "apostrophe": "^3.4.0",
+    "apostrophe": "^3.58.1",
     "eslint": "^8.50.0",
     "eslint-config-apostrophe": "^4.1.0",
     "eslint-config-standard": "^17.1.0",
@@ -38,4 +38,4 @@
   "dependencies": {
     "connect-multiparty": "^2.2.0"
   }
-}
+}