From 83626441a4fd13a5a0a51faa4d5daab68cbb7b37 Mon Sep 17 00:00:00 2001 From: James Dean Date: Thu, 7 Nov 2024 12:04:32 -0800 Subject: [PATCH 01/11] Update en.ts Updating to match Expensify terminology - "users" > "members" --- src/languages/en.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 2665bfe07ca9..fb7374769e79 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -707,7 +707,7 @@ const translations = { reportTypingIndicator: { isTyping: 'is typing...', areTyping: 'are typing...', - multipleUsers: 'Multiple users', + multipleUsers: 'Multiple members', }, reportArchiveReasons: { [CONST.REPORT.ARCHIVE_REASON.DEFAULT]: 'This chat room has been archived.', @@ -1210,7 +1210,7 @@ const translations = { deviceCredentials: 'Device credentials', invalidate: 'Invalidate', destroy: 'Destroy', - maskExportOnyxStateData: 'Mask fragile user data while exporting Onyx state', + maskExportOnyxStateData: 'Mask fragile member data while exporting Onyx state', exportOnyxState: 'Export Onyx state', importOnyxState: 'Import Onyx state', testCrash: 'Test crash', @@ -1643,7 +1643,7 @@ const translations = { }, groupChat: { lastMemberTitle: 'Heads up!', - lastMemberWarning: "Since you're the last person here, leaving will make this chat inaccessible to all users. Are you sure you want to leave?", + lastMemberWarning: "Since you're the last person here, leaving will make this chat inaccessible to all members. Are you sure you want to leave?", defaultReportName: ({displayName}: ReportArchiveReasonsClosedParams) => `${displayName}'s group chat`, }, languagePage: { @@ -3596,7 +3596,7 @@ const translations = { getTheExpensifyCardAndMore: 'Get the Expensify Card and more', }, people: { - genericFailureMessage: 'An error occurred removing a user from the workspace, please try again.', + genericFailureMessage: 'An error occurred removing a member from the workspace, please try again.', removeMembersPrompt: ({memberName}: {memberName: string}) => ({ one: `Are you sure you want to remove ${memberName}?`, other: 'Are you sure you want to remove these members?', @@ -4564,11 +4564,11 @@ const translations = { selectedForRandomAudit: `randomly selected for review`, selectedForRandomAuditMarkdown: `[randomly selected](https://help.expensify.com/articles/expensify-classic/reports/Set-a-random-report-audit-schedule) for review`, share: ({to}: ShareParams) => `invited member ${to}`, - unshare: ({to}: UnshareParams) => `removed user ${to}`, + unshare: ({to}: UnshareParams) => `removed member ${to}`, stripePaid: ({amount, currency}: StripePaidParams) => `paid ${currency}${amount}`, takeControl: `took control`, integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `failed to sync with ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, - addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'user' ? 'member' : 'admin'}`, + addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'member' ? 'member' : 'admin'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => `updated the role of ${email} from ${currentRole} to ${newRole}`, removeMember: ({email, role}: AddEmployeeParams) => `removed ${role} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `removed connection to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, @@ -4618,7 +4618,7 @@ const translations = { chatMessage: 'Chat message', lastChatMessagePreview: 'Last chat message preview', workspaceName: 'Workspace name', - chatUserDisplayNames: 'Chat user display names', + chatUserDisplayNames: 'Chat member display names', scrollToNewestMessages: 'Scroll to newest messages', prestyledText: 'Prestyled text', viewAttachment: 'View attachment', @@ -5217,7 +5217,7 @@ const translations = { hasDraftComment: 'Has draft comment', hasGBR: 'Has GBR', hasRBR: 'Has RBR', - pinnedByUser: 'Pinned by user', + pinnedByUser: 'Pinned by member', hasIOUViolations: 'Has IOU violations', hasAddWorkspaceRoomErrors: 'Has add workspace room errors', isUnread: 'Is unread (focus mode)', From 668189f4bc91684299475f61631f4d54492c04a5 Mon Sep 17 00:00:00 2001 From: James Dean Date: Thu, 7 Nov 2024 12:12:26 -0800 Subject: [PATCH 02/11] Update es.ts --- src/languages/es.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index ac7f86da9909..05080cb86d2c 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -1208,7 +1208,7 @@ const translations = { deviceCredentials: 'Credenciales del dispositivo', invalidate: 'Invalidar', destroy: 'Destruir', - maskExportOnyxStateData: 'Enmascare los datos frágiles del usuario mientras exporta el estado Onyx', + maskExportOnyxStateData: 'Enmascare los datos frágiles del miembro mientras exporta el estado Onyx', exportOnyxState: 'Exportar estado Onyx', importOnyxState: 'Importar estado Onyx', testCrash: 'Prueba de fallo', @@ -4612,14 +4612,14 @@ const translations = { selectedForRandomAudit: `seleccionado al azar para revisión`, selectedForRandomAuditMarkdown: `[seleccionado al azar](https://help.expensify.com/articles/expensify-classic/reports/Set-a-random-report-audit-schedule) para revisión`, share: ({to}: ShareParams) => `miembro invitado ${to}`, - unshare: ({to}: UnshareParams) => `usuario eliminado ${to}`, + unshare: ({to}: UnshareParams) => `miembro eliminado ${to}`, stripePaid: ({amount, currency}: StripePaidParams) => `pagado ${currency}${amount}`, takeControl: `tomó el control`, integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `no se pudo sincronizar con ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, addEmployee: ({email, role}: AddEmployeeParams) => `agregó a ${email} como ${role === 'user' ? 'miembro' : 'administrador'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => - `actualicé el rol ${email} de ${currentRole === 'user' ? 'miembro' : 'administrador'} a ${newRole === 'user' ? 'miembro' : 'administrador'}`, - removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${role === 'user' ? 'miembro' : 'administrador'} ${email}`, + `actualicé el rol ${email} de ${currentRole === 'miembro' ? 'miembro' : 'administrador'} a ${newRole === 'miembro' ? 'miembro' : 'administrador'}`, + removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${role === 'miembro' ? 'miembro' : 'administrador'} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `eliminó la conexión a ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, }, }, @@ -5127,7 +5127,7 @@ const translations = { chatMessage: 'mensaje de chat', lastChatMessagePreview: 'Vista previa del último mensaje del chat', workspaceName: 'Nombre del espacio de trabajo', - chatUserDisplayNames: 'Nombres de los usuarios del chat', + chatUserDisplayNames: 'Nombres de los miembros del chat', scrollToNewestMessages: 'Desplázate a los mensajes más recientes', prestyledText: 'texto preestilizado', viewAttachment: 'Ver archivo adjunto', @@ -5732,7 +5732,7 @@ const translations = { hasDraftComment: 'Tiene comentario en borrador', hasGBR: 'Tiene GBR', hasRBR: 'Tiene RBR', - pinnedByUser: 'Fijado por el usuario', + pinnedByUser: 'Fijado por el miembro', hasIOUViolations: 'Tiene violaciones de IOU', hasAddWorkspaceRoomErrors: 'Tiene errores al agregar sala de espacio de trabajo', isUnread: 'No leído (modo de enfoque)', From e706224330b1f1650efb7d1f37a83809498e8655 Mon Sep 17 00:00:00 2001 From: James Dean Date: Thu, 7 Nov 2024 12:27:40 -0800 Subject: [PATCH 03/11] Update en.ts --- src/languages/en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index fb7374769e79..d657c22a2ddb 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4568,7 +4568,7 @@ const translations = { stripePaid: ({amount, currency}: StripePaidParams) => `paid ${currency}${amount}`, takeControl: `took control`, integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `failed to sync with ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, - addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'member' ? 'member' : 'admin'}`, + addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'user' ? 'member' : 'admin'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => `updated the role of ${email} from ${currentRole} to ${newRole}`, removeMember: ({email, role}: AddEmployeeParams) => `removed ${role} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `removed connection to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, From 2f83cd769c35affdf37bf66fa738b9767e1399df Mon Sep 17 00:00:00 2001 From: James Dean Date: Thu, 7 Nov 2024 12:29:39 -0800 Subject: [PATCH 04/11] Update es.ts --- src/languages/es.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index 05080cb86d2c..8e004b1f6b29 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4618,8 +4618,8 @@ const translations = { integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `no se pudo sincronizar con ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, addEmployee: ({email, role}: AddEmployeeParams) => `agregó a ${email} como ${role === 'user' ? 'miembro' : 'administrador'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => - `actualicé el rol ${email} de ${currentRole === 'miembro' ? 'miembro' : 'administrador'} a ${newRole === 'miembro' ? 'miembro' : 'administrador'}`, - removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${role === 'miembro' ? 'miembro' : 'administrador'} ${email}`, + `actualicé el rol ${email} de ${currentRole === 'user' ? 'miembro' : 'administrador'} a ${newRole === 'user' ? 'miembro' : 'administrador'}`, + removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${role === 'user' ? 'miembro' : 'administrador'} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `eliminó la conexión a ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, }, }, From 225d66de6d836e28fb35b176a71e76383c191c57 Mon Sep 17 00:00:00 2001 From: James Dean Date: Thu, 7 Nov 2024 12:36:49 -0800 Subject: [PATCH 05/11] Update en.ts --- src/languages/en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index d657c22a2ddb..25115dfcdd17 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4568,7 +4568,7 @@ const translations = { stripePaid: ({amount, currency}: StripePaidParams) => `paid ${currency}${amount}`, takeControl: `took control`, integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `failed to sync with ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, - addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'user' ? 'member' : 'admin'}`, + addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${(role === 'member' || role === 'user') ? 'member' : 'admin'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => `updated the role of ${email} from ${currentRole} to ${newRole}`, removeMember: ({email, role}: AddEmployeeParams) => `removed ${role} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `removed connection to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, From f302f1be4879d0db275cf3c2c455c291b026a4c6 Mon Sep 17 00:00:00 2001 From: James Dean Date: Thu, 7 Nov 2024 13:18:26 -0800 Subject: [PATCH 06/11] Update es.ts --- src/languages/es.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index 8e004b1f6b29..1753625ed8aa 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4616,10 +4616,10 @@ const translations = { stripePaid: ({amount, currency}: StripePaidParams) => `pagado ${currency}${amount}`, takeControl: `tomó el control`, integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `no se pudo sincronizar con ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, - addEmployee: ({email, role}: AddEmployeeParams) => `agregó a ${email} como ${role === 'user' ? 'miembro' : 'administrador'}`, + addEmployee: ({email, role}: AddEmployeeParams) => `agregó a ${email} como ${(role === 'miembro' || role === 'user') ? 'miembro' : 'administrador'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => - `actualicé el rol ${email} de ${currentRole === 'user' ? 'miembro' : 'administrador'} a ${newRole === 'user' ? 'miembro' : 'administrador'}`, - removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${role === 'user' ? 'miembro' : 'administrador'} ${email}`, + `actualicé el rol ${email} de ${(currentRole === 'miembro' || role === 'user') ? 'miembro' : 'administrador'} a ${(newRole === 'miembro' || role === 'user') ? 'miembro' : 'administrador'}`, + removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${(role === 'miembro' || role === 'user') ? 'miembro' : 'administrador'} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `eliminó la conexión a ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, }, }, From b4a5a52019087b2ede20f4ceb45b75632feb911a Mon Sep 17 00:00:00 2001 From: NikkiWines Date: Fri, 8 Nov 2024 13:22:46 -0500 Subject: [PATCH 07/11] prettier to fix style --- src/languages/en.ts | 2 +- src/languages/es.ts | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 25115dfcdd17..7cedae404fa8 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4568,7 +4568,7 @@ const translations = { stripePaid: ({amount, currency}: StripePaidParams) => `paid ${currency}${amount}`, takeControl: `took control`, integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `failed to sync with ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, - addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${(role === 'member' || role === 'user') ? 'member' : 'admin'}`, + addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'member' || role === 'user' ? 'member' : 'admin'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => `updated the role of ${email} from ${currentRole} to ${newRole}`, removeMember: ({email, role}: AddEmployeeParams) => `removed ${role} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `removed connection to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, diff --git a/src/languages/es.ts b/src/languages/es.ts index 1753625ed8aa..704c4193b316 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4616,10 +4616,12 @@ const translations = { stripePaid: ({amount, currency}: StripePaidParams) => `pagado ${currency}${amount}`, takeControl: `tomó el control`, integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `no se pudo sincronizar con ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, - addEmployee: ({email, role}: AddEmployeeParams) => `agregó a ${email} como ${(role === 'miembro' || role === 'user') ? 'miembro' : 'administrador'}`, + addEmployee: ({email, role}: AddEmployeeParams) => `agregó a ${email} como ${role === 'miembro' || role === 'user' ? 'miembro' : 'administrador'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => - `actualicé el rol ${email} de ${(currentRole === 'miembro' || role === 'user') ? 'miembro' : 'administrador'} a ${(newRole === 'miembro' || role === 'user') ? 'miembro' : 'administrador'}`, - removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${(role === 'miembro' || role === 'user') ? 'miembro' : 'administrador'} ${email}`, + `actualicé el rol ${email} de ${currentRole === 'miembro' || role === 'user' ? 'miembro' : 'administrador'} a ${ + newRole === 'miembro' || role === 'user' ? 'miembro' : 'administrador' + }`, + removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${role === 'miembro' || role === 'user' ? 'miembro' : 'administrador'} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `eliminó la conexión a ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, }, }, From 49f5f2d6a6d47ac10761259dde0d233ce800d04f Mon Sep 17 00:00:00 2001 From: NikkiWines Date: Fri, 8 Nov 2024 13:23:48 -0500 Subject: [PATCH 08/11] use currentRole and newRole where applicable --- src/languages/es.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index 704c4193b316..efd520d68797 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4618,8 +4618,8 @@ const translations = { integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `no se pudo sincronizar con ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, addEmployee: ({email, role}: AddEmployeeParams) => `agregó a ${email} como ${role === 'miembro' || role === 'user' ? 'miembro' : 'administrador'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => - `actualicé el rol ${email} de ${currentRole === 'miembro' || role === 'user' ? 'miembro' : 'administrador'} a ${ - newRole === 'miembro' || role === 'user' ? 'miembro' : 'administrador' + `actualicé el rol ${email} de ${currentRole === 'miembro' || currentRole === 'user' ? 'miembro' : 'administrador'} a ${ + newRole === 'miembro' || newRole === 'user' ? 'miembro' : 'administrador' }`, removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${role === 'miembro' || role === 'user' ? 'miembro' : 'administrador'} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `eliminó la conexión a ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, From 848d8cff4e0bf745ba2856d245a3b531af0d32fb Mon Sep 17 00:00:00 2001 From: James Dean Date: Fri, 8 Nov 2024 11:34:13 -0800 Subject: [PATCH 09/11] Update en.ts --- src/languages/en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 7cedae404fa8..2d0cb597a57d 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -707,7 +707,7 @@ const translations = { reportTypingIndicator: { isTyping: 'is typing...', areTyping: 'are typing...', - multipleUsers: 'Multiple members', + multipleMembers: 'Multiple members', }, reportArchiveReasons: { [CONST.REPORT.ARCHIVE_REASON.DEFAULT]: 'This chat room has been archived.', From af0170f6d2870c3f4745679380f3741363eae281 Mon Sep 17 00:00:00 2001 From: James Dean Date: Fri, 8 Nov 2024 11:34:42 -0800 Subject: [PATCH 10/11] Update ReportTypingIndicator.tsx --- src/pages/home/report/ReportTypingIndicator.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportTypingIndicator.tsx b/src/pages/home/report/ReportTypingIndicator.tsx index a04a7700ec98..b5d0e973f031 100755 --- a/src/pages/home/report/ReportTypingIndicator.tsx +++ b/src/pages/home/report/ReportTypingIndicator.tsx @@ -48,7 +48,7 @@ function ReportTypingIndicator({reportID}: ReportTypingIndicatorProps) { style={[styles.chatItemComposeSecondaryRowSubText, styles.chatItemComposeSecondaryRowOffset]} numberOfLines={1} > - {translate('reportTypingIndicator.multipleUsers')} + {translate('reportTypingIndicator.multipleMembers')} {` ${translate('reportTypingIndicator.areTyping')}`} ); From 5a008be293c6c8e2e9c7d5ff48c06b481a7ca944 Mon Sep 17 00:00:00 2001 From: James Dean Date: Fri, 8 Nov 2024 11:42:20 -0800 Subject: [PATCH 11/11] Update es.ts --- src/languages/es.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index efd520d68797..f8f395ff92c2 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -701,7 +701,7 @@ const translations = { reportTypingIndicator: { isTyping: 'está escribiendo...', areTyping: 'están escribiendo...', - multipleUsers: 'Varios miembros', + multipleMembers: 'Varios miembros', }, reportArchiveReasons: { [CONST.REPORT.ARCHIVE_REASON.DEFAULT]: 'Esta sala de chat ha sido eliminada.',