fix(uaa-parity): Localization fix for collapsed version event (#4012)

* fix(uaa-parity): Fix localization for collapsed version event

* fix(uaa-parity): Fix message

* fix(uaa-parity): Update intl and fallback conditional

* fix(uaa-parity): Fix en-us properties

* fix(uaa-parity): Fix messages

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: JChan106

i18n/en-US.properties

@@ -886,18 +886,22 @@ be.uploadsProvidedFolderNameInvalidMessage = Provided folder name, {name}, could
 be.uploadsRetryButtonTooltip = Retry upload
 # Error message shown when account storage limit has been reached
 be.uploadsStorageLimitErrorMessage = Account storage limit reached
-# Message displayed in the activity feed to represent the range of versions actioned by a single user. {name} is the user who did the action. {actionMessage} is the action. {versions} is a range of versions.
-be.versionCollapsed = {name} {actionMessage} v{versions}
 # Message displayed in the activity feed for a deleted version. {name} is the user who performed the action. {version_number} is the file version string.
 be.versionDeleted = {name} deleted v{version_number}
-# Message displayed in the activity feed to represent the range of versions actioned by multiple users. {numberOfCollaborators} is a number. {actionMessage} is the action. {versions} is a range of versions.
-be.versionMultipleUsersCollapsed = {numberOfCollaborators} collaborators {actionMessage} v{versions}
+# Message displayed in the activity feed to represent the range of versions restored by multiple users. {numberOfCollaborators} is a number. {versions} is a range of versions.
+be.versionMultipleUsersRestored = {numberOfCollaborators} collaborators restored v{versions}
+# Message displayed in the activity feed to represent the range of versions trashed by multiple users. {numberOfCollaborators} is a number. {versions} is a range of versions.
+be.versionMultipleUsersTrashed = {numberOfCollaborators} collaborators deleted v{versions}
 # Message displayed in the activity feed to represent the range of versions uploaded by multiple users. {numberOfCollaborators} is a number and {versions} is a range of versions.
 be.versionMultipleUsersUploaded = {numberOfCollaborators} collaborators uploaded v{versions}
 # Message displayed in the activity feed for a promoted version. {name} is the user who performed the action. {version_promoted} is the originating file version string. {version_number} is the file version string.
 be.versionPromoted = {name} promoted v{version_promoted} to v{version_number}
+# Message to indicate a user restored a file
+be.versionRestoreCollapsed = {name} restored v{versions}
 # Message displayed in the activity feed for a restored version. {name} is the user who performed the action. {version_number} is the file version string.
 be.versionRestored = {name} restored v{version_number}
+# Message to indicate a user trashed a file
+be.versionTrashCollapsed = {name} deleted v{versions}
 # Message displayed in the activity feed to represent the range of versions uploaded by a single user. {name} is the user who uploaded. {versions} is a range of versions.
 be.versionUploadCollapsed = {name} uploaded v{versions}
 # Message displayed in the activity feed for a newly uploaded version. {name} is the user who performed the action. {version_number} is the file version string.

src/elements/common/messages.js

@@ -831,23 +831,35 @@ const messages = defineMessages({
         description:
             'Message displayed in the activity feed to represent the range of versions uploaded by multiple users. {numberOfCollaborators} is a number and {versions} is a range of versions.',
     },
+    versionMultipleUsersRestored: {
+        id: 'be.versionMultipleUsersRestored',
+        defaultMessage: '{numberOfCollaborators} collaborators restored v{versions}',
+        description:
+            'Message displayed in the activity feed to represent the range of versions restored by multiple users. {numberOfCollaborators} is a number. {versions} is a range of versions.',
+    },
+    versionMultipleUsersTrashed: {
+        id: 'be.versionMultipleUsersTrashed',
+        defaultMessage: '{numberOfCollaborators} collaborators deleted v{versions}',
+        description:
+            'Message displayed in the activity feed to represent the range of versions trashed by multiple users. {numberOfCollaborators} is a number. {versions} is a range of versions.',
+    },
     versionUploadCollapsed: {
         id: 'be.versionUploadCollapsed',
         defaultMessage: '{name} uploaded v{versions}',
         description:
             'Message displayed in the activity feed to represent the range of versions uploaded by a single user. {name} is the user who uploaded. {versions} is a range of versions.',
     },
-    versionMultipleUsersCollapsed: {
-        id: 'be.versionMultipleUsersCollapsed',
-        defaultMessage: '{numberOfCollaborators} collaborators {actionMessage} v{versions}',
+    versionRestoreCollapsed: {
+        id: 'be.versionRestoreCollapsed',
+        defaultMessage: '{name} restored v{versions}',
         description:
-            'Message displayed in the activity feed to represent the range of versions actioned by multiple users. {numberOfCollaborators} is a number. {actionMessage} is the action. {versions} is a range of versions.',
+            'Message displayed in the activity feed to represent the range of versions restored by a single user. {name} is the user who restored. {versions} is a range of versions.',
     },
-    versionCollapsed: {
-        id: 'be.versionCollapsed',
-        defaultMessage: '{name} {actionMessage} v{versions}',
+    versionTrashCollapsed: {
+        id: 'be.versionTrashCollapsed',
+        defaultMessage: '{name} deleted v{versions}',
         description:
-            'Message displayed in the activity feed to represent the range of versions actioned by a single user. {name} is the user who did the action. {actionMessage} is the action. {versions} is a range of versions.',
+            'Message displayed in the activity feed to represent the range of versions deleted by a single user. {name} is the user who deleted. {versions} is a range of versions.',
     },
     versionUploaded: {
         id: 'be.versionUploaded',

src/elements/content-sidebar/activity-feed/version/CollapsedVersion.js

@@ -16,10 +16,6 @@ import type { User, FileVersions } from '../../../../common/types/core';
 import { ACTION_TYPE_CREATED, ACTION_TYPE_RESTORED, ACTION_TYPE_TRASHED } from '../../../../constants';
 import './Version.scss';
 
-const ACTION_MESSAGE_UPLOAD = 'uploaded';
-const ACTION_MESSAGE_RESTORE = 'restored';
-const ACTION_MESSAGE_TRASH = 'deleted';
-
 function getMessageForAction(
     action: string,
     collaborators: { [collaborator_id: string]: User } = {},
@@ -37,19 +33,22 @@ function getMessageForAction(
         return null;
     }
 
-    let actionMessage = '';
+    let singleUserMessage = messages.versionUploadCollapsed;
+    let multipleUsersMessage = messages.versionMultipleUsersUploaded;
     switch (action) {
         case ACTION_TYPE_CREATED:
-            actionMessage = ACTION_MESSAGE_UPLOAD;
+            singleUserMessage = messages.versionUploadCollapsed;
+            multipleUsersMessage = messages.versionMultipleUsersUploaded;
             break;
         case ACTION_TYPE_RESTORED:
-            actionMessage = ACTION_MESSAGE_RESTORE;
+            singleUserMessage = messages.versionRestoreCollapsed;
+            multipleUsersMessage = messages.versionMultipleUsersRestored;
             break;
         case ACTION_TYPE_TRASHED:
-            actionMessage = ACTION_MESSAGE_TRASH;
+            singleUserMessage = messages.versionTrashCollapsed;
+            multipleUsersMessage = messages.versionMultipleUsersTrashed;
             break;
         default:
-            actionMessage = '';
             break;
     }
 
@@ -68,11 +67,10 @@ function getMessageForAction(
         if (shouldUseUAA) {
             return (
                 <FormattedMessage
-                    {...messages.versionCollapsed}
+                    {...singleUserMessage}
                     values={{
                         name: <strong>{collaborator?.name}</strong>,
                         versions: versionRange,
-                        actionMessage,
                     }}
                 />
             );
@@ -92,11 +90,10 @@ function getMessageForAction(
     if (shouldUseUAA) {
         return (
             <FormattedMessage
-                {...messages.versionMultipleUsersCollapsed}
+                {...multipleUsersMessage}
                 values={{
                     numberOfCollaborators,
                     versions: versionRange,
-                    actionMessage,
                 }}
             />
         );