From: Dessalines Date: Sat, 18 Sep 2021 14:27:49 +0000 (-0400) Subject: Use my fork of inferno-i18next. Fixes #413 (#415) X-Git-Url: http://these/git/%7B%60https:/README.ja.md?a=commitdiff_plain;h=4b23b78efeb71d36ed595aa975e1e2dd71ccaf2a;p=lemmy-ui.git Use my fork of inferno-i18next. Fixes #413 (#415) --- diff --git a/.eslintrc.json b/.eslintrc.json index 093a700..4e05f0c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -16,6 +16,7 @@ "warnOnUnsupportedTypeScriptVersion": false }, "rules": { + "@typescript-eslint/ban-ts-comment": 0, "@typescript-eslint/no-explicit-any": 0, "@typescript-eslint/explicit-module-boundary-types": 0, "arrow-body-style": 0, diff --git a/package.json b/package.json index 4ff3860..3a13537 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "inferno-create-element": "^7.4.9", "inferno-helmet": "^5.2.1", "inferno-hydrate": "^7.4.9", - "inferno-i18next": "github:nimbusec-oss/inferno-i18next#semver:^7.4.2", + "inferno-i18next-dess": "^0.0.1", "inferno-router": "^7.4.9", "inferno-server": "^7.4.9", "isomorphic-cookie": "^1.2.4", diff --git a/src/shared/components/app/app.tsx b/src/shared/components/app/app.tsx index ddf466b..bac634e 100644 --- a/src/shared/components/app/app.tsx +++ b/src/shared/components/app/app.tsx @@ -1,6 +1,6 @@ import { Component } from "inferno"; import { Helmet } from "inferno-helmet"; -import { Provider } from "inferno-i18next"; +import { Provider } from "inferno-i18next-dess"; import { Route, Switch } from "inferno-router"; import { GetSiteResponse } from "lemmy-js-client"; import { i18n } from "../../i18next"; diff --git a/src/shared/components/comment/comment-form.tsx b/src/shared/components/comment/comment-form.tsx index 95dff71..515e3d9 100644 --- a/src/shared/components/comment/comment-form.tsx +++ b/src/shared/components/comment/comment-form.tsx @@ -1,5 +1,5 @@ import { Component } from "inferno"; -import { T } from "inferno-i18next"; +import { T } from "inferno-i18next-dess"; import { Link } from "inferno-router"; import { CommentResponse, diff --git a/src/shared/components/home/home.tsx b/src/shared/components/home/home.tsx index 3cdb238..d06bf01 100644 --- a/src/shared/components/home/home.tsx +++ b/src/shared/components/home/home.tsx @@ -1,5 +1,5 @@ import { Component, linkEvent } from "inferno"; -import { T } from "inferno-i18next"; +import { T } from "inferno-i18next-dess"; import { Link } from "inferno-router"; import { AddAdminResponse, diff --git a/src/shared/components/home/login.tsx b/src/shared/components/home/login.tsx index b227d64..612a6b7 100644 --- a/src/shared/components/home/login.tsx +++ b/src/shared/components/home/login.tsx @@ -1,5 +1,5 @@ import { Component, linkEvent } from "inferno"; -import { T } from "inferno-i18next"; +import { T } from "inferno-i18next-dess"; import { GetCaptchaResponse, GetSiteResponse, diff --git a/src/shared/components/post/post-listings.tsx b/src/shared/components/post/post-listings.tsx index 3dc8260..12d5193 100644 --- a/src/shared/components/post/post-listings.tsx +++ b/src/shared/components/post/post-listings.tsx @@ -1,5 +1,5 @@ import { Component } from "inferno"; -import { T } from "inferno-i18next"; +import { T } from "inferno-i18next-dess"; import { Link } from "inferno-router"; import { PostView } from "lemmy-js-client"; import { i18n } from "../../i18next"; diff --git a/src/shared/components/private_message/private-message-form.tsx b/src/shared/components/private_message/private-message-form.tsx index 542c48b..60ae52d 100644 --- a/src/shared/components/private_message/private-message-form.tsx +++ b/src/shared/components/private_message/private-message-form.tsx @@ -1,5 +1,5 @@ import { Component, linkEvent } from "inferno"; -import { T } from "inferno-i18next"; +import { T } from "inferno-i18next-dess"; import { Prompt } from "inferno-router"; import { CreatePrivateMessage, diff --git a/src/shared/utils.ts b/src/shared/utils.ts index 642bb75..1720607 100644 --- a/src/shared/utils.ts +++ b/src/shared/utils.ts @@ -1431,3 +1431,14 @@ export function initializeSite(site: GetSiteResponse) { UserService.Instance.myUserInfo = site.my_user; i18n.changeLanguage(getLanguage()); } + +let SHORTNUM_SI_FORMAT = new Intl.NumberFormat("en-US", { + maximumFractionDigits: 1, + //@ts-ignore + notation: "compact", + compactDisplay: "short", +}); + +export function numToSI(value: any) { + return SHORTNUM_SI_FORMAT.format(value); +} diff --git a/yarn.lock b/yarn.lock index bf33823..ab16314 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4045,9 +4045,10 @@ inferno-hydrate@^7.4.9: dependencies: inferno "7.4.9" -"inferno-i18next@github:nimbusec-oss/inferno-i18next#semver:^7.4.2": - version "7.4.2" - resolved "https://codeload.github.com/nimbusec-oss/inferno-i18next/tar.gz/54b9be591ccd62c53799ad23e35f17144a62f909" +inferno-i18next-dess@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/inferno-i18next-dess/-/inferno-i18next-dess-0.0.1.tgz#48ae6bb4c3a617e59ff8dc97b9ed70f2ef762206" + integrity sha512-z/6UnuWFMyBivfR3SI9AmgA0/JvXARqtG/9BQryaLPenlG7iAb4cN2TeSt0mHIgFOo01QHVWZ8dqn7jZRijp2Q== dependencies: html-parse-stringify2 "^2.0.1" inferno "^7.4.2"