Adjust i18n types (prepare for i18next-react update)

packages/apps-config/src/endpoints/index.ts

@@ -13,14 +13,10 @@ export { CUSTOM_ENDPOINT_KEY } from './development.js';
 export * from './production.js';
 export * from './testing.js';
 
-function defaultT (keyOrText: string, text?: string, options?: TOptions): string {
+function defaultT (keyOrText: string, text?: string | TOptions, options?: TOptions): string {
   return (
-    (
-      options &&
-      options.replace &&
-      options.replace.host
-    ) ||
-    text ||
+    (options?.replace?.host as string) ||
+    text?.toString() ||
     keyOrText
   );
 }

packages/apps-config/src/types.ts

@@ -3,7 +3,7 @@
 
 export interface TOptions {
   ns?: string;
-  replace?: Record<string, string>
+  replace?: Record<string, unknown>
 }
 
-export type TFunction = (keyOrText: string, text?: string, options?: TOptions) => string;
+export type TFunction = (keyOrText: string, textOrOptions?: string | TOptions, options?: TOptions) => string;

packages/apps-routing/src/accounts.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component, { useCounter } from '@polkadot/app-accounts';
 
@@ -15,7 +14,7 @@ export default function create (t: TFunction): Route {
     group: 'accounts',
     icon: 'users',
     name: 'accounts',
-    text: t<string>('nav.accounts', 'Accounts', { ns: 'apps-routing' }),
+    text: t('nav.accounts', 'Accounts', { ns: 'apps-routing' }),
     useCounter
   };
 }

packages/apps-routing/src/addresses.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component from '@polkadot/app-addresses';
 
@@ -15,6 +14,6 @@ export default function create (t: TFunction): Route {
     group: 'accounts',
     icon: 'address-card',
     name: 'addresses',
-    text: t<string>('nav.addresses', 'Address book', { ns: 'apps-routing' })
+    text: t('nav.addresses', 'Address book', { ns: 'apps-routing' })
   };
 }

packages/apps-routing/src/alliance.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component, { useCounter } from '@polkadot/app-alliance';
 
@@ -17,7 +16,7 @@ export default function create (t: TFunction): Route {
     group: 'governance',
     icon: 'people-group',
     name: 'alliance',
-    text: t<string>('nav.alliance', 'Alliance', { ns: 'apps-routing' }),
+    text: t('nav.alliance', 'Alliance', { ns: 'apps-routing' }),
     useCounter
   };
 }

packages/apps-routing/src/assets.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component from '@polkadot/app-assets';
 
@@ -18,6 +17,6 @@ export default function create (t: TFunction): Route {
     group: 'network',
     icon: 'shopping-basket',
     name: 'assets',
-    text: t<string>('nav.assets', 'Assets', { ns: 'apps-routing' })
+    text: t('nav.assets', 'Assets', { ns: 'apps-routing' })
   };
 }

packages/apps-routing/src/bounties.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component, { useCounter } from '@polkadot/app-bounties';
 
@@ -17,7 +16,7 @@ export default function create (t: TFunction): Route {
     group: 'governance',
     icon: 'coins',
     name: 'bounties',
-    text: t<string>('nav.bounties', 'Bounties', { ns: 'apps-routing' }),
+    text: t('nav.bounties', 'Bounties', { ns: 'apps-routing' }),
     useCounter
   };
 }

packages/apps-routing/src/calendar.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component from '@polkadot/app-calendar';
 
@@ -15,6 +14,6 @@ export default function create (t: TFunction): Route {
     group: 'network',
     icon: 'calendar-alt',
     name: 'calendar',
-    text: t<string>('nav.calendar', 'Event calendar', { ns: 'apps-routing' })
+    text: t('nav.calendar', 'Event calendar', { ns: 'apps-routing' })
   };
 }

packages/apps-routing/src/claims.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component, { useCounter } from '@polkadot/app-claims';
 
@@ -18,7 +17,7 @@ export default function create (t: TFunction): Route {
     group: 'accounts',
     icon: 'star',
     name: 'claims',
-    text: t<string>('nav.claims', 'Claim Tokens', { ns: 'apps-routing' }),
+    text: t('nav.claims', 'Claim Tokens', { ns: 'apps-routing' }),
     useCounter
   };
 }

packages/apps-routing/src/collator.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component from '@polkadot/app-collator';
 
@@ -17,6 +16,6 @@ export default function create (t: TFunction): Route {
     group: 'network',
     icon: 'timeline',
     name: 'collators',
-    text: t<string>('nav.collator', 'Collators', { ns: 'apps-routing' })
+    text: t('nav.collator', 'Collators', { ns: 'apps-routing' })
   };
 }

packages/apps-routing/src/contracts.ts

@@ -1,9 +1,8 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
 import type { ApiPromise } from '@polkadot/api';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component from '@polkadot/app-contracts';
 import { assertReturn } from '@polkadot/util';
@@ -32,6 +31,6 @@ export default function create (t: TFunction): Route {
     group: 'developer',
     icon: 'compress',
     name: 'contracts',
-    text: t<string>('nav.contracts', 'Contracts', { ns: 'apps-routing' })
+    text: t('nav.contracts', 'Contracts', { ns: 'apps-routing' })
   };
 }

packages/apps-routing/src/council.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component, { useCounter } from '@polkadot/app-council';
 
@@ -18,7 +17,7 @@ export default function create (t: TFunction): Route {
     group: 'governance',
     icon: 'building',
     name: 'council',
-    text: t<string>('nav.council', 'Council', { ns: 'apps-routing' }),
+    text: t('nav.council', 'Council', { ns: 'apps-routing' }),
     useCounter
   };
 }

packages/apps-routing/src/democracy.ts

@@ -1,9 +1,8 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
 import type { ApiPromise } from '@polkadot/api';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component, { useCounter } from '@polkadot/app-democracy';
 
@@ -32,7 +31,7 @@ export default function create (t: TFunction): Route {
     group: 'governance',
     icon: 'calendar-check',
     name: 'democracy',
-    text: t<string>('nav.democracy', 'Democracy', { ns: 'apps-routing' }),
+    text: t('nav.democracy', 'Democracy', { ns: 'apps-routing' }),
     useCounter
   };
 }

packages/apps-routing/src/explorer.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component from '@polkadot/app-explorer';
 
@@ -15,6 +14,6 @@ export default function create (t: TFunction): Route {
     group: 'network',
     icon: 'braille',
     name: 'explorer',
-    text: t<string>('nav.explorer', 'Explorer', { ns: 'apps-routing' })
+    text: t('nav.explorer', 'Explorer', { ns: 'apps-routing' })
   };
 }

packages/apps-routing/src/extrinsics.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component from '@polkadot/app-extrinsics';
 
@@ -16,6 +15,6 @@ export default function create (t: TFunction): Route {
     group: 'developer',
     icon: 'envelope-open-text',
     name: 'extrinsics',
-    text: t<string>('nav.extrinsics', 'Extrinsics', { ns: 'apps-routing' })
+    text: t('nav.extrinsics', 'Extrinsics', { ns: 'apps-routing' })
   };
 }

packages/apps-routing/src/fellowship.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component, { useCounter } from '@polkadot/app-fellowship';
 
@@ -20,7 +19,7 @@ export default function create (t: TFunction): Route {
     group: 'governance',
     icon: 'people-arrows',
     name: 'fellowship',
-    text: t<string>('nav.fellowship', 'Fellowship', { ns: 'apps-routing' }),
+    text: t('nav.fellowship', 'Fellowship', { ns: 'apps-routing' }),
     useCounter
   };
 }

packages/apps-routing/src/files.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component from '@polkadot/app-files';
 
@@ -16,6 +15,6 @@ export default function create (t: TFunction): Route {
     group: 'developer',
     icon: 'file',
     name: 'files',
-    text: t<string>('nav.files', 'Files (IPFS)', { ns: 'apps-routing' })
+    text: t('nav.files', 'Files (IPFS)', { ns: 'apps-routing' })
   };
 }

packages/apps-routing/src/gilt.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component from '@polkadot/app-gilt';
 
@@ -18,6 +17,6 @@ export default function create (t: TFunction): Route {
     group: 'network',
     icon: 'leaf',
     name: 'gilt',
-    text: t<string>('nav.gilt', 'Gilt', { ns: 'apps-routing' })
+    text: t('nav.gilt', 'Gilt', { ns: 'apps-routing' })
   };
 }

packages/apps-routing/src/index.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Routes } from './types.js';
+import type { Routes, TFunction } from './types.js';
 
 import accounts from './accounts.js';
 import addresses from './addresses.js';

packages/apps-routing/src/js.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component from '@polkadot/app-js';
 
@@ -15,6 +14,6 @@ export default function create (t: TFunction): Route {
     group: 'developer',
     icon: 'code',
     name: 'js',
-    text: t<string>('nav.js', 'JavaScript', { ns: 'apps-routing' })
+    text: t('nav.js', 'JavaScript', { ns: 'apps-routing' })
   };
 }

packages/apps-routing/src/membership.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component, { useCounter } from '@polkadot/app-membership';
 
@@ -18,7 +17,7 @@ export default function create (t: TFunction): Route {
     group: 'governance',
     icon: 'people-carry',
     name: 'membership',
-    text: t<string>('nav.membership', 'Membership', { ns: 'apps-routing' }),
+    text: t('nav.membership', 'Membership', { ns: 'apps-routing' }),
     useCounter
   };
 }

packages/apps-routing/src/nfts.ts

@@ -1,8 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { TFunction } from 'i18next';
-import type { Route } from './types.js';
+import type { Route, TFunction } from './types.js';
 
 import Component from '@polkadot/app-nfts';
 
@@ -17,6 +16,6 @@ export default function create (t: TFunction): Route {
     group: 'network',
     icon: 'shopping-cart',
     name: 'nfts',
-    text: t<string>('nav.nfts', 'NFTs', { ns: 'apps-routing' })
+    text: t('nav.nfts', 'NFTs', { ns: 'apps-routing' })
   };
 }