reorganize accessibility translation keys

Signed-off-by: Prince Mendiratta <[email protected]>
Expensify · Mar 27, 2023 · f8f848e · f8f848e
1 parent ddabb59
commit f8f848e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/languages/en.js b/src/languages/en.js
@@ -276,6 +276,8 @@ export default {
         fabNewChat: 'New chat (Floating action)',
         chatPinned: 'Chat pinned',
         draftedMessage: 'Drafted message',
+        listOfChatMessages: 'List of chat messages',
+        listOfChats: 'List of chats',
     },
     iou: {
         amount: 'Amount',
@@ -608,6 +610,7 @@ export default {
             invalidFormatEmailLogin: 'The email entered is invalid. Please fix the format and try again.',
         },
         cannotGetAccountDetails: 'Couldn\'t retrieve account details, please try to sign in again.',
+        loginForm: 'Login form',
     },
     personalDetails: {
         error: {
@@ -1205,14 +1208,11 @@ export default {
     allCountries: CONST.ALL_COUNTRIES,
     accessibilityHints: {
         navigateToChatsList: 'Navigate back to chats list',
-        listOfChatMessages: 'List of chat messages',
         chatWelcomeMessage: 'Chat welcome message',
         navigatesToChat: 'Navigates to a chat',
         newMessageLineIndicator: 'New message line indicator',
         chatMessage: 'Chat message',
         lastChatMessagePreview: 'Last chat message preview',
-        loginForm: 'Login form',
-        listOfChats: 'List of chats',
         workspaceName: 'Workspace name',
         chatUserDisplayNames: 'Chat user display names',
         scrollToNewestMessages: 'Scroll to newest messages',

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -275,6 +275,8 @@ export default {
         fabNewChat: 'Nuevo chat',
         chatPinned: 'Chat fijado',
         draftedMessage: 'Mensaje borrador',
+        listOfChatMessages: 'Lista de mensajes del chat',
+        listOfChats: 'lista de chats',
     },
     iou: {
         amount: 'Importe',
@@ -607,6 +609,7 @@ export default {
             invalidFormatEmailLogin: 'El email introducido no es válido. Corrígelo e inténtalo de nuevo.',
         },
         cannotGetAccountDetails: 'No se pudieron cargar los detalles de tu cuenta, por favor intenta iniciar sesión de nuevo.',
+        loginForm: 'Formulario de inicio de sesión',
     },
     personalDetails: {
         error: {
@@ -1671,14 +1674,11 @@ export default {
     },
     accessibilityHints: {
         navigateToChatsList: 'Vuelve a la lista de chats',
-        listOfChatMessages: 'Lista de mensajes del chat',
         chatWelcomeMessage: 'Mensaje de bienvenida al chat',
         navigatesToChat: 'Navega a un chat',
         newMessageLineIndicator: 'Indicador de nueva línea de mensaje',
         chatMessage: 'mensaje de chat',
         lastChatMessagePreview: 'Vista previa del último mensaje del chat',
-        loginForm: 'Formulario de inicio de sesión',
-        listOfChats: 'lista de chats',
         workspaceName: 'Nombre del espacio de trabajo',
         chatUserDisplayNames: 'Nombres de los usuarios del chat',
         scrollToNewestMessages: 'Desplázate a los mensajes más recientes',

diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
@@ -151,7 +151,7 @@ class ReportActionsList extends React.Component {
         return (
             <Animated.View style={[StyleUtils.fade(this.state.fadeInAnimation), styles.flex1]}>
                 <InvertedFlatList
-                    accessibilityLabel={this.props.translate('accessibilityHints.listOfChatMessages')}
+                    accessibilityLabel={this.props.translate('sidebarScreen.listOfChatMessages')}
                     ref={ReportScrollManager.flatListRef}
                     data={this.props.sortedReportActions}
                     renderItem={this.renderItem}

diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
@@ -140,7 +140,7 @@ class SidebarLinks extends React.Component {
         return (
             <View
                 accessibilityElementsHidden={this.props.isSmallScreenWidth && !this.props.isDrawerOpen}
-                accessibilityLabel={this.props.translate('accessibilityHints.listOfChats')}
+                accessibilityLabel={this.props.translate('sidebarScreen.listOfChats')}
                 style={[styles.flex1, styles.h100]}
             >
                 <View

diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js
@@ -168,7 +168,7 @@ class LoginForm extends React.Component {
         const serverErrorText = ErrorUtils.getLatestErrorMessage(this.props.account);
         return (
             <>
-                <View accessibilityLabel={this.props.translate('accessibilityHints.loginForm')} style={[styles.mt3]}>
+                <View accessibilityLabel={this.props.translate('loginForm.loginForm')} style={[styles.mt3]}>
                     <TextInput
                         ref={el => this.input = el}
                         label={this.props.translate('loginForm.phoneOrEmail')}

diff --git a/tests/ui/UnreadIndicatorsTest.js b/tests/ui/UnreadIndicatorsTest.js
@@ -52,7 +52,7 @@ beforeAll(() => {
 });
 
 function scrollUpToRevealNewMessagesBadge() {
-    const hintText = Localize.translateLocal('accessibilityHints.listOfChatMessages');
+    const hintText = Localize.translateLocal('sidebarScreen.listOfChatMessages');
     fireEvent.scroll(screen.queryByLabelText(hintText), {
         nativeEvent: {
             contentOffset: {
@@ -106,7 +106,7 @@ function navigateToSidebarOption(index) {
  * @return {Boolean}
  */
 function isDrawerOpen() {
-    const hintText = Localize.translateLocal('accessibilityHints.listOfChats');
+    const hintText = Localize.translateLocal('sidebarScreen.listOfChats');
     const sidebarLinks = screen.queryAllByLabelText(hintText);
     return !lodashGet(sidebarLinks, [0, 'props', 'accessibilityElementsHidden']);
 }
@@ -132,7 +132,7 @@ function signInAndGetAppWithUnreadChat() {
     render(<App />);
     return waitForPromisesToResolveWithAct()
         .then(() => {
-            const hintText = Localize.translateLocal('accessibilityHints.loginForm');
+            const hintText = Localize.translateLocal('loginForm.loginForm');
             const loginForm = screen.queryAllByLabelText(hintText);
             expect(loginForm).toHaveLength(1);
 
@@ -208,7 +208,7 @@ describe('Unread Indicators', () => {
             expect(LocalNotification.showCommentNotification.mock.calls).toHaveLength(0);
 
             // Verify the sidebar links are rendered
-            const sidebarLinksHintText = Localize.translateLocal('accessibilityHints.listOfChats');
+            const sidebarLinksHintText = Localize.translateLocal('sidebarScreen.listOfChats');
             const sidebarLinks = screen.queryAllByLabelText(sidebarLinksHintText);
             expect(sidebarLinks).toHaveLength(1);
             expect(isDrawerOpen()).toBe(true);