From 5f5bbf0ffb96d714ffd140298c4bddfca80f604b Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Wed, 14 Oct 2020 21:38:54 +0200
Subject: [PATCH] Update routing (attempt at fix, manual add) (#3874)

---
 packages/apps-routing/src/accounts.ts             | 3 ++-
 packages/apps-routing/src/addresses.ts            | 3 ++-
 packages/apps-routing/src/calendar.ts             | 3 ++-
 packages/apps-routing/src/claims.ts               | 3 ++-
 packages/apps-routing/src/contracts.ts            | 3 ++-
 packages/apps-routing/src/council.ts              | 3 ++-
 packages/apps-routing/src/democracy.ts            | 3 ++-
 packages/apps-routing/src/explorer.ts             | 3 ++-
 packages/apps-routing/src/extrinsics.ts           | 3 ++-
 packages/apps-routing/src/generic-asset.ts        | 3 ++-
 packages/apps-routing/src/index.ts                | 4 ++--
 packages/apps-routing/src/js.ts                   | 3 ++-
 packages/apps-routing/src/parachains.ts           | 3 ++-
 packages/apps-routing/src/poll.ts                 | 3 ++-
 packages/apps-routing/src/rpc.ts                  | 3 ++-
 packages/apps-routing/src/settings.ts             | 3 ++-
 packages/apps-routing/src/signing.ts              | 3 ++-
 packages/apps-routing/src/society.ts              | 3 ++-
 packages/apps-routing/src/staking.ts              | 3 ++-
 packages/apps-routing/src/storage.ts              | 3 ++-
 packages/apps-routing/src/sudo.ts                 | 3 ++-
 packages/apps-routing/src/techcomm.ts             | 3 ++-
 packages/apps-routing/src/transfer.ts             | 3 ++-
 packages/apps-routing/src/treasury.ts             | 3 ++-
 packages/apps/public/locales/en/apps-routing.json | 9 +++++----
 25 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/packages/apps-routing/src/accounts.ts b/packages/apps-routing/src/accounts.ts
index 2ebd4955a9..91c8774310 100644
--- a/packages/apps-routing/src/accounts.ts
+++ b/packages/apps-routing/src/accounts.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component, { useCounter } from '@polkadot/app-accounts';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/addresses.ts b/packages/apps-routing/src/addresses.ts
index e517ac7865..e23510c7a3 100644
--- a/packages/apps-routing/src/addresses.ts
+++ b/packages/apps-routing/src/addresses.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-addresses';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/calendar.ts b/packages/apps-routing/src/calendar.ts
index 4e12b804e1..7d53838ec8 100644
--- a/packages/apps-routing/src/calendar.ts
+++ b/packages/apps-routing/src/calendar.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-calendar';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/claims.ts b/packages/apps-routing/src/claims.ts
index 81c1675e55..687786ef24 100644
--- a/packages/apps-routing/src/claims.ts
+++ b/packages/apps-routing/src/claims.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component, { useCounter } from '@polkadot/app-claims';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/contracts.ts b/packages/apps-routing/src/contracts.ts
index d9ecd12451..5d386d4212 100644
--- a/packages/apps-routing/src/contracts.ts
+++ b/packages/apps-routing/src/contracts.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-contracts';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/council.ts b/packages/apps-routing/src/council.ts
index b3b49fe263..b17c80a4f2 100644
--- a/packages/apps-routing/src/council.ts
+++ b/packages/apps-routing/src/council.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component, { useCounter } from '@polkadot/app-council';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/democracy.ts b/packages/apps-routing/src/democracy.ts
index c1c3bab2a9..1b617116f9 100644
--- a/packages/apps-routing/src/democracy.ts
+++ b/packages/apps-routing/src/democracy.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component, { useCounter } from '@polkadot/app-democracy';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/explorer.ts b/packages/apps-routing/src/explorer.ts
index 0e4d98231a..5f0db3997f 100644
--- a/packages/apps-routing/src/explorer.ts
+++ b/packages/apps-routing/src/explorer.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-explorer';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/extrinsics.ts b/packages/apps-routing/src/extrinsics.ts
index a9052f81b6..8418ad3cc3 100644
--- a/packages/apps-routing/src/extrinsics.ts
+++ b/packages/apps-routing/src/extrinsics.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-extrinsics';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/generic-asset.ts b/packages/apps-routing/src/generic-asset.ts
index 2c9e85d3c1..ed238705ba 100644
--- a/packages/apps-routing/src/generic-asset.ts
+++ b/packages/apps-routing/src/generic-asset.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-generic-asset';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/index.ts b/packages/apps-routing/src/index.ts
index a8f37e87d8..c0644b6adf 100644
--- a/packages/apps-routing/src/index.ts
+++ b/packages/apps-routing/src/index.ts
@@ -1,6 +1,7 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Routes } from './types';
 
 import accounts from './accounts';
@@ -27,9 +28,8 @@ import techcomm from './techcomm';
 import transfer from './transfer';
 import treasury from './treasury';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Routes {
+export default function create (t: TFunction): Routes {
   return [
-    // dashboard(t),
     accounts(t),
     addresses(t),
     explorer(t),
diff --git a/packages/apps-routing/src/js.ts b/packages/apps-routing/src/js.ts
index 5402cc999c..08e48557a3 100644
--- a/packages/apps-routing/src/js.ts
+++ b/packages/apps-routing/src/js.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-js';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/parachains.ts b/packages/apps-routing/src/parachains.ts
index 69ca52df34..ba607f1659 100644
--- a/packages/apps-routing/src/parachains.ts
+++ b/packages/apps-routing/src/parachains.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-parachains';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/poll.ts b/packages/apps-routing/src/poll.ts
index ba7ba1598b..d40312eee4 100644
--- a/packages/apps-routing/src/poll.ts
+++ b/packages/apps-routing/src/poll.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-poll';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/rpc.ts b/packages/apps-routing/src/rpc.ts
index a98c5484a5..3107ac2e68 100644
--- a/packages/apps-routing/src/rpc.ts
+++ b/packages/apps-routing/src/rpc.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-rpc';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/settings.ts b/packages/apps-routing/src/settings.ts
index 6143026134..a885ec6970 100644
--- a/packages/apps-routing/src/settings.ts
+++ b/packages/apps-routing/src/settings.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component, { useCounter } from '@polkadot/app-settings';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {},
diff --git a/packages/apps-routing/src/signing.ts b/packages/apps-routing/src/signing.ts
index cf17f5129a..5aba78ce43 100644
--- a/packages/apps-routing/src/signing.ts
+++ b/packages/apps-routing/src/signing.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-signing';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/society.ts b/packages/apps-routing/src/society.ts
index 4c8cbffadc..089b3b94f9 100644
--- a/packages/apps-routing/src/society.ts
+++ b/packages/apps-routing/src/society.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component, { useCounter } from '@polkadot/app-society';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/staking.ts b/packages/apps-routing/src/staking.ts
index ae0ac5852f..a1dfa0b864 100644
--- a/packages/apps-routing/src/staking.ts
+++ b/packages/apps-routing/src/staking.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-staking';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/storage.ts b/packages/apps-routing/src/storage.ts
index 319a11d6a5..4a781fdee9 100644
--- a/packages/apps-routing/src/storage.ts
+++ b/packages/apps-routing/src/storage.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-storage';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/sudo.ts b/packages/apps-routing/src/sudo.ts
index 07ee18d504..7ebcb01f9c 100644
--- a/packages/apps-routing/src/sudo.ts
+++ b/packages/apps-routing/src/sudo.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component from '@polkadot/app-sudo';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/techcomm.ts b/packages/apps-routing/src/techcomm.ts
index a00761c889..bd2a098d5f 100644
--- a/packages/apps-routing/src/techcomm.ts
+++ b/packages/apps-routing/src/techcomm.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component, { useCounter } from '@polkadot/app-tech-comm';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps-routing/src/transfer.ts b/packages/apps-routing/src/transfer.ts
index 28138eca63..79088b5036 100644
--- a/packages/apps-routing/src/transfer.ts
+++ b/packages/apps-routing/src/transfer.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Modal from '@polkadot/app-accounts/modals/Transfer';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component: Modal,
     Modal,
diff --git a/packages/apps-routing/src/treasury.ts b/packages/apps-routing/src/treasury.ts
index 7a4f83a438..6e0717b31e 100644
--- a/packages/apps-routing/src/treasury.ts
+++ b/packages/apps-routing/src/treasury.ts
@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { TFunction } from 'i18next';
 import { Route } from './types';
 
 import Component, { useCounter } from '@polkadot/app-treasury';
 
-export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+export default function create (t: TFunction): Route {
   return {
     Component,
     display: {
diff --git a/packages/apps/public/locales/en/apps-routing.json b/packages/apps/public/locales/en/apps-routing.json
index b765fafbc2..9319bf5e35 100644
--- a/packages/apps/public/locales/en/apps-routing.json
+++ b/packages/apps/public/locales/en/apps-routing.json
@@ -1,25 +1,26 @@
 {
   "nav.accounts": "Accounts",
+  "nav.addresses": "Address book",
+  "nav.calendar": "Event calendar",
   "nav.claims": "Claim Tokens",
   "nav.contracts": "Contracts",
   "nav.council": "Council",
-  "nav.dashboard": "Dashboard",
   "nav.democracy": "Democracy",
   "nav.explorer": "Explorer",
   "nav.extrinsics": "Extrinsics",
   "nav.generic-asset": "Generic asset",
   "nav.github": "GitHub",
-  "nav.i18n": "I18n Translator",
   "nav.js": "Javascript",
   "nav.parachains": "Parachains",
+  "nav.rpc": "RPC calls",
   "nav.settings": "Settings",
+  "nav.signing": "Sign and verify",
   "nav.society": "Society",
   "nav.staking": "Staking",
   "nav.storage": "Chain state",
   "nav.sudo": "Sudo",
   "nav.tech-comm": "Tech. comm.",
-  "nav.toolbox": "Toolbox",
   "nav.transfer": "Transfer",
   "nav.treasury": "Treasury",
   "nav.wiki": "Wiki"
-}
\ No newline at end of file
+}