Merge pull request #360 from n8-dev/feature/359-Plural-and-Singular-C…

…MS-Message-update Change Links to Link(s) to match the rest of the messages
silverstripe · Jan 6, 2025 · d5684f7 · d5684f7
2 parents 9f8cb42 + 05a0082
commit d5684f7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ artifacts/
 coverage/
 vendor/
 .idea/
+.vscode
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/lang/en.js b/client/lang/en.js
@@ -24,6 +24,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "LinkField.LINK_MODIFIED_LABEL": "Modified",
     "LinkField.LINK_MODIFIED_TITLE": "Link has unpublished changes",
     "LinkField.SAVE_RECORD_FIRST": "Cannot add links until the record has been saved",
+    "LinkField.SAVE_RECORD_FIRST_SINGLE": "Cannot add link until the record has been saved",
     "LinkField.SAVE_SUCCESS": "Saved link",
     "LinkField.SORT_ERROR": "Unable to sort links",
     "LinkField.SORT_SUCCESS": "Updated link sort order"

diff --git a/client/lang/src/en.json b/client/lang/src/en.json
@@ -17,6 +17,7 @@
     "LinkField.LINK_MODIFIED_LABEL": "Modified",
     "LinkField.LINK_MODIFIED_TITLE": "Link has unpublished changes",
     "LinkField.SAVE_RECORD_FIRST": "Cannot add links until the record has been saved",
+    "LinkField.SAVE_RECORD_FIRST_SINGLE": "Cannot add link until the record has been saved",
     "LinkField.SAVE_SUCCESS": "Saved link",
     "LinkField.SORT_ERROR": "Unable to sort links",
     "LinkField.SORT_SUCCESS": "Updated link sort order"

diff --git a/client/src/components/LinkField/LinkField.js b/client/src/components/LinkField/LinkField.js
@@ -524,7 +524,9 @@ const LinkField = ({
   const renderPicker = !loadingError && !inHistoryViewer && !saveRecordFirst && (isMulti || linkIDs.length === 0);
   const renderModal = !loadingError && !saveRecordFirst && Boolean(editingID);
   const loadingErrorText = i18n._t('LinkField.FAILED_TO_LOAD_LINKS', 'Failed to load link(s)');
-  const saveRecordFirstText = i18n._t('LinkField.SAVE_RECORD_FIRST', 'Cannot add links until the record has been saved');
+  const saveRecordFirstText = isMulti 
+    ? i18n._t('LinkField.SAVE_RECORD_FIRST', 'Cannot add links until the record has been saved')
+    : i18n._t('LinkField.SAVE_RECORD_FIRST_SINGLE', 'Cannot add link until the record has been saved');
   const links = renderLinks();
 
   return <LinkFieldContext.Provider value={{
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ artifacts/ @@
     coverage/
     vendor/
     .idea/
+    .vscode