Update routing (attempt at fix, manual add) (#3874)

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: {

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: {

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: {

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: {

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: {

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: {

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: {

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: {

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: {

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: {

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),

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: {

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: {

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: {

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: {

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: {},

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: {

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: {

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: {

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: {

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: {

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: {

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,

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: {

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"
-}
+}