Merge pull request #2119 from oasisprotocol/lw/fix-translations

Fix extracting translations
oasisprotocol · Jan 30, 2025 · 5530919 · 5530919
2 parents d912c81 + 9e25e40
commit 5530919
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 28 deletions.
diff --git a/.changelog/2119.process.md b/.changelog/2119.process.md
@@ -0,0 +1 @@
+Fix extracting translations
diff --git a/extension/src/ExtLedgerAccessPopup/ExtLedgerAccessPopup.tsx b/extension/src/ExtLedgerAccessPopup/ExtLedgerAccessPopup.tsx
@@ -79,12 +79,10 @@ export function ExtLedgerAccessPopup() {
           <img src={logotype} alt="Oasis" width="75" height="75" />
         </Box>
         <Header fill textAlign="center">
-          {t('ledger.extension.grantAccess', 'Grant access to your Ledger')}
+          {t('ledger.extension.grantAccess', 'Grant access to your USB Ledger')}
         </Header>
         <Box gap="medium">
-          <p>
-            {t('ledger.instructionSteps.connectUsbLedger', 'Connect your USB Ledger device to the computer')}
-          </p>
+          <p>{t('ledger.instructionSteps.connectUsbLedger', 'Connect your Ledger to this device via USB')}</p>
 
           {connection === 'connecting' && (
             <Box

diff --git a/internals/extractMessages/i18next-scanner.config.js b/internals/extractMessages/i18next-scanner.config.js
@@ -1,10 +1,16 @@
 const typescriptTransform = require('i18next-scanner-typescript')
 
 module.exports = {
-  input: ['src/**/**.{js,jsx,ts,tsx}', '!**/node_modules/**', '!src/**/*.test.{ts,tsx}'],
+  input: [
+    'src/**/**.{js,jsx,ts,tsx}',
+    '!src/**/*.test.{ts,tsx}',
+    'extension/src/**/**.{js,jsx,ts,tsx}',
+    '!extension/src/**/*.test.{ts,tsx}',
+    '!**/node_modules/**',
+  ],
   output: './',
   options: {
-    debug: false,
+    debug: true, // Warn about duplicate translation keys with differing texts.
     removeUnusedKeys: true,
     sort: true,
     func: {

diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "lint-changelog": "markdownlint --config .changelog/.markdownlint.yml .changelog/",
     "changelog": "node ./internals/scripts/changelog.js",
     "release-tag": "node ./internals/scripts/release-tag.js",
-    "extract-messages": "rm src/locales/en/translation.json && i18next-scanner --config=internals/extractMessages/i18next-scanner.config.js && node ./internals/scripts/normalize-translations.js ./src/locales/*/translation.json",
+    "extract-messages": "rm src/locales/en/translation.json && i18next-scanner --config=internals/extractMessages/i18next-scanner.config.js | grep -v 'Added a new translation key' && node ./internals/scripts/normalize-translations.js ./src/locales/*/translation.json",
     "fix-grommet-icons-types": "node ./internals/scripts/fix-grommet-icons-types.js",
     "print-extension-dev-csp": "node ./internals/scripts/print-extension-dev-csp.js",
     "android": "yarn build && yarn cap sync android && yarn cap run android -l --external",

diff --git a/playwright/tests/extension.spec.ts b/playwright/tests/extension.spec.ts
@@ -34,7 +34,7 @@ test.describe('The extension popup should load', () => {
     await page.goto(`${extensionPopupURL}/open-wallet`)
     const popupPromise = context.waitForEvent('page')
     await page.getByRole('button', { name: /Ledger/i }).click()
-    await page.getByRole('button', { name: /Grant access to your Ledger/i }).click()
+    await page.getByRole('button', { name: /Grant access to your USB Ledger/i }).click()
     const popup = await popupPromise
     await popup.waitForLoadState()
     await popup.getByRole('button', { name: /Connect Ledger device/i }).click()

diff --git a/playwright/tests/syncTabs.spec.ts b/playwright/tests/syncTabs.spec.ts
@@ -155,7 +155,7 @@ test.describe('syncTabs', () => {
       await page.getByTestId('toolbar-contacts-tab').click()
       await page.getByText('You have no contacts yet.')
 
-      await page.getByRole('button', { name: 'Add Contact' }).click()
+      await page.getByRole('button', { name: 'Add contact' }).click()
       await page.getByPlaceholder('Name').fill('stakefish')
       await page
         .getByPlaceholder('Address', { exact: true })
@@ -167,7 +167,7 @@ test.describe('syncTabs', () => {
       await tab2.getByTestId('account-selector').click()
       await tab2.getByTestId('toolbar-contacts-tab').click()
       await expect(tab2.getByTestId('account-choice')).toHaveCount(1)
-      await tab2.getByRole('button', { name: 'Add Contact' }).click()
+      await tab2.getByRole('button', { name: 'Add contact' }).click()
       await tab2.getByPlaceholder('Name').fill('Foo')
       await tab2
         .getByPlaceholder('Address', { exact: true })

diff --git a/src/app/components/Toolbar/Features/Contacts/AddContact.tsx b/src/app/components/Toolbar/Features/Contacts/AddContact.tsx
@@ -20,7 +20,7 @@ export const AddContact = ({ setLayerVisibility }: AddContactProps) => {
   return (
     <LayerContainer hideLayer={() => setLayerVisibility(false)}>
       <Tabs>
-        <Tab title={t('toolbar.contacts.add', 'Add Contact')} style={{ textTransform: 'capitalize' }}>
+        <Tab title={t('toolbar.contacts.add', 'Add contact')} style={{ textTransform: 'capitalize' }}>
           <Box flex="grow" justify="center">
             <ContactAccountForm
               onCancel={() => setLayerVisibility(false)}

diff --git a/src/app/components/Toolbar/Features/Contacts/__tests__/__snapshots__/index.test.tsx.snap b/src/app/components/Toolbar/Features/Contacts/__tests__/__snapshots__/index.test.tsx.snap
@@ -460,7 +460,7 @@ exports[`<Contacts  /> should match snapshot 1`] = `
         class="c13"
         type="button"
       >
-        Add Contact
+        Add contact
       </button>
     </div>
   </div>

diff --git a/src/app/components/Toolbar/Features/Contacts/__tests__/index.test.tsx b/src/app/components/Toolbar/Features/Contacts/__tests__/index.test.tsx
@@ -47,7 +47,7 @@ describe('<Contacts  />', () => {
   it('should render unavailable state', () => {
     renderComponent(configureAppStore({}))
     expect(screen.getByText(/To start adding contacts create a profile while/)).toBeInTheDocument()
-    expect(screen.queryByText('Add Contact')).not.toBeInTheDocument()
+    expect(screen.queryByText('Add contact')).not.toBeInTheDocument()
     expect(screen.getByRole('button', { name: 'opening a wallet' })).toBeInTheDocument()
   })
 
@@ -68,13 +68,13 @@ describe('<Contacts  />', () => {
   it('should render empty state', () => {
     renderComponent(store)
     expect(screen.getByText('You have no contacts yet.')).toBeInTheDocument()
-    expect(screen.getByText('Add Contact')).toBeInTheDocument()
+    expect(screen.getByText('Add contact')).toBeInTheDocument()
     expect(screen.queryByTestId('account-choice')).not.toBeInTheDocument()
   })
 
   it('should show Add Contact form overlay', async () => {
     renderComponent(store)
-    await userEvent.click(screen.getByRole('button', { name: 'Add Contact' }))
+    await userEvent.click(screen.getByRole('button', { name: 'Add contact' }))
     expect(screen.getByPlaceholderText('Name')).toBeInTheDocument()
     expect(screen.getByPlaceholderText('Address')).toBeInTheDocument()
   })

diff --git a/src/app/pages/OpenWalletPage/Features/FromBleLedger/index.tsx b/src/app/pages/OpenWalletPage/Features/FromBleLedger/index.tsx
@@ -42,7 +42,7 @@ export function FromBleLedger() {
         <li>
           {t('ledger.instructionSteps.deviceIsPaired', 'Make sure your Ledger is paired with this device')}
         </li>
-        <li>{t('ledger.instructionSteps.closeLedgerLive', 'Close Ledger Live app on the device')}</li>
+        <li>{t('ledger.instructionSteps.closeLedgerLive', 'Close the Ledger Live app on your computer')}</li>
         <li>{t('ledger.instructionSteps.openOasisApp', 'Open the Oasis app on your Ledger')}</li>
       </ol>
       <Box direction="row" margin={{ top: 'medium' }}>

diff --git a/src/app/pages/OpenWalletPage/Features/FromPrivateKey/index.tsx b/src/app/pages/OpenWalletPage/Features/FromPrivateKey/index.tsx
@@ -88,7 +88,7 @@ export function FromPrivateKey(props: Props) {
 
         <Box pad={{ vertical: 'medium' }}>
           <Box direction="row" justify="between" margin={{ top: 'medium' }}>
-            <Button type="submit" label={t('openWallet.mnemonic.import', 'Import my account')} primary />
+            <Button type="submit" label={t('openWallet.mnemonic.import', 'Import my wallet')} primary />
           </Box>
         </Box>
       </Form>

diff --git a/src/app/pages/ParaTimesPage/getParaTimeName.ts b/src/app/pages/ParaTimesPage/getParaTimeName.ts
@@ -5,10 +5,10 @@ import { ParaTime } from '../../../config'
 export const getParaTimeName = (t: TFunction, paraTime: ParaTime) => {
   switch (paraTime) {
     case ParaTime.Cipher:
+      // Discourage mistaken ParaTime deposits into Cipher accounts controlled
+      // by Binance. That requires contacting support to recover it.
       return `${t('paraTimes.common.cipher', 'Cipher')} ${t(
         'paraTimes.common.discouragedType',
-        // Discourage mistaken ParaTime deposits into Cipher accounts controlled
-        // by Binance. That requires contacting support to recover it.
         '(experimental)',
       )}`
     case ParaTime.Emerald:

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -107,9 +107,9 @@
   },
   "appTitle": "ROSE Wallet",
   "backends": {
+    "nexus": "Nexus API",
     "oasismonitor": "Oasis Monitor API",
-    "oasisscanV2": "Oasis Scan API v2",
-    "nexus": "Nexus API"
+    "oasisscanV2": "Oasis Scan API v2"
   },
   "banner": {
     "buildPreview": "Please note this is an experimental build of ROSE Wallet and your secrets are not safe. ONLY USE IT FOR TESTING.",
@@ -199,9 +199,9 @@
     "feedback": "We’d love your feedback at <EmailLink>[email protected]</EmailLink>",
     "github": "ROSE Wallet is <GithubLink>open source</GithubLink> and powered by",
     "poweredBy": {
+      "nexus": "Nexus API & Oasis gRPC",
       "oasismonitor": "Oasis Monitor API & Oasis gRPC",
-      "oasisscanV2": "Oasis Scan API v2 & Oasis gRPC",
-      "nexus": "Nexus API & Oasis gRPC"
+      "oasisscanV2": "Oasis Scan API v2 & Oasis gRPC"
     },
     "terms": "<TermsLink>Terms and Conditions</TermsLink>",
     "version": "Version: <ReleaseLink/> (commit: <CommitLink/>) built at {{buildTime}}"
@@ -236,16 +236,16 @@
       "closingPopup": "Closing... Please re-open the wallet app",
       "connect": "Connect Ledger device",
       "failed": "Connection failed",
-      "grantAccess": "Grant access to your Ledger",
+      "grantAccess": "Grant access to your USB Ledger",
       "succeed": "Device connected"
     },
     "instructionSteps": {
-      "closeLedgerLive": "Close Ledger Live app on the computer",
+      "closeLedgerLive": "Close the Ledger Live app on your computer",
       "connectBluetoothLedger": "Connect your Ledger to this device via Bluetooth",
-      "connectUsbLedger": "Connect your USB Ledger device to the computer",
+      "connectUsbLedger": "Connect your Ledger to this device via USB",
       "deviceIsPaired": "Make sure your Ledger is paired with this device",
       "header": "Steps:",
-      "openOasisApp": "Open the Oasis App on your Ledger device"
+      "openOasisApp": "Open the Oasis app on your Ledger"
     },
     "steps": {
       "accessingLedger": "Connecting with Ledger device",
@@ -468,7 +468,7 @@
   },
   "toolbar": {
     "contacts": {
-      "add": "Add Contact",
+      "add": "Add contact",
       "address": "Address",
       "cancel": "Cancel",
       "delete": {