global: fix localization

This commit is contained in:
Ammar Ahmed
2024-10-14 12:54:50 +05:00
parent b1f21c1abe
commit ffe068dbd5
15 changed files with 3475 additions and 5375 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -13,12 +13,15 @@ global.Buffer = require('buffer').Buffer;
import '../app/common/logger/index';
import { DOMParser } from './worker.js';
global.DOMParser = DOMParser;
import { $en, setI18nGlobal,$de } from "@notesnook/intl";
import {setI18nGlobal } from "@notesnook/intl";
import { i18n } from "@lingui/core";
import {
messages as $en
} from "@notesnook/intl/locales/$en.json";
i18n.load({
en: $en,
de: $de
});
i18n.activate("de");
setI18nGlobal(i18n);
i18n.activate("en");
setI18nGlobal(i18n);

View File

@@ -970,8 +970,6 @@ PODS:
- React
- react-native-background-actions (2.6.7):
- React-Core
- react-native-begin-background-task (0.1.0):
- React
- react-native-blob-util (0.18.3):
- React-Core
- react-native-config (1.5.1):
@@ -983,7 +981,7 @@ PODS:
- react-native-document-picker (7.1.3):
- React-Core
- react-native-fingerprint-scanner (5.0.0):
- React-Core
- React
- react-native-get-random-values (1.9.0):
- React-Core
- react-native-gzip (1.1.0):
@@ -1488,7 +1486,6 @@ DEPENDENCIES:
- React-Mapbuffer (from `../../node_modules/react-native/ReactCommon`)
- react-native-actions-shortcuts (from `../../node_modules/react-native-actions-shortcuts`)
- react-native-background-actions (from `../../node_modules/react-native-background-actions`)
- react-native-begin-background-task (from `../../node_modules/react-native-begin-background-task`)
- react-native-blob-util (from `../../node_modules/react-native-blob-util`)
- react-native-config (from `../../node_modules/react-native-config`)
- react-native-date-picker (from `../../node_modules/react-native-date-picker`)
@@ -1645,8 +1642,6 @@ EXTERNAL SOURCES:
:path: "../../node_modules/react-native-actions-shortcuts"
react-native-background-actions:
:path: "../../node_modules/react-native-background-actions"
react-native-begin-background-task:
:path: "../../node_modules/react-native-begin-background-task"
react-native-blob-util:
:path: "../../node_modules/react-native-blob-util"
react-native-config:
@@ -1838,12 +1833,11 @@ SPEC CHECKSUMS:
React-Mapbuffer: 6c1cacdbf40b531f549eba249e531a7d0bfd8e7f
react-native-actions-shortcuts: 5d9cf0c9c308333dfcc1e05c3f9afa8c428e2533
react-native-background-actions: 2c251c986f23347f9c1722f05fd296938f60edb1
react-native-begin-background-task: 3b889e07458afc5822a7277cf9cbc7cd077e39ee
react-native-blob-util: 2d36383bb52c15c5451be81cb7ddf22bc34a12a6
react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
react-native-date-picker: 93e43b3084cea595b4d68b1405d6d99849663bd6
react-native-document-picker: ec07866a30707f23660c0f3ae591d669d3e89096
react-native-fingerprint-scanner: be63e626b31fb951780a5fac5328b065a61a3d6e
react-native-fingerprint-scanner: 3e8c46641b5751a31f45e66789d4b6f342be5e6d
react-native-get-random-values: dee677497c6a740b71e5612e8dbd83e7539ed5bb
react-native-gzip: c5e87ee9e359f02350e3a2ee52eb35eddc398868
react-native-html-to-pdf-lite: 21bfb169bf4cbcd7bec9f736975ee1b3f5292d4a

View File

@@ -58,7 +58,7 @@
"react-native-notification-sounds": "0.5.5",
"react-native-orientation": "https://github.com/yamill/react-native-orientation.git",
"react-native-pdf": "6.6.2",
"react-native-privacy-snapshot": "https://github.com/standardnotes/react-native-privacy-snapshot.git",
"react-native-privacy-snapshot": "github:standardnotes/react-native-privacy-snapshot",
"react-native-scoped-storage": "^1.9.5",
"react-native-securerandom": "^1.0.1",
"react-native-share": "^7.2.0",

View File

@@ -26,7 +26,8 @@
"react": "18.2.0",
"react-native": "0.74.5",
"react-native-actions-sheet": "^0.9.7",
"react-native-mmkv-storage": "^0.10.2"
"react-native-mmkv-storage": "^0.10.2",
"react-native-privacy-snapshot": "github:standardnotes/react-native-privacy-snapshot"
},
"devDependencies": {
"fonteditor-core": "^2.1.11",
@@ -4077,6 +4078,7 @@
"license": "GPL-3.0-or-later",
"dependencies": {
"@notesnook/common": "file:../common",
"@notesnook/intl": "file:../intl",
"@notesnook/theme": "file:../theme",
"@notesnook/ui": "file:../ui",
"@social-embed/lib": "^0.1.0-next.7",
@@ -4126,9 +4128,8 @@
"unfurl.js": "^6.4.0"
},
"devDependencies": {
"@emotion/react": "11.13.3",
"@emotion/react": "11.11.1",
"@mdi/js": "^7.4.47",
"@mdi/react": "^1.6.1",
"@theme-ui/components": "^0.16.2",
"@theme-ui/core": "^0.16.2",
"@types/katex": "^0.16.7",
@@ -4153,7 +4154,6 @@
"peerDependencies": {
"@emotion/react": ">=11",
"@mdi/js": ">=7.2.96",
"@mdi/react": ">=1.6.1",
"@theme-ui/components": ">=0.16.0",
"@theme-ui/core": ">=0.16.0",
"framer-motion": ">=11",
@@ -4170,8 +4170,8 @@
"hasInstallScript": true,
"dependencies": {
"@emotion/react": "11.11.1",
"@lingui/core": "4.11.2",
"@lingui/react": "4.11.2",
"@lingui/core": "4.11.4",
"@lingui/react": "4.11.4",
"@mdi/js": "^7.2.96",
"@mdi/react": "^1.6.0",
"@notesnook/editor": "file:../editor",
@@ -21991,14 +21991,6 @@
"dev": true,
"license": "Apache-2.0"
},
"../../packages/editor/node_modules/@mdi/react": {
"version": "1.6.1",
"dev": true,
"license": "MIT",
"dependencies": {
"prop-types": "^15.7.2"
}
},
"../../packages/editor/node_modules/@notesnook/common": {
"resolved": "../../packages/common",
"link": true
@@ -24762,18 +24754,20 @@
"../../packages/intl": {
"name": "@notesnook/intl",
"version": "1.0.0",
"hasInstallScript": true,
"license": "GPL-3.0-or-later",
"devDependencies": {
"@babel/core": "^7.24.9",
"@babel/preset-env": "^7.20.2",
"@lingui/cli": "^4.11.2",
"@lingui/macro": "^4.11.2",
"@lingui/swc-plugin": "^4.0.7",
"@rspack/cli": "^0.6.2",
"@rspack/core": "^0.6.2",
"@lingui/cli": "^4.11.4",
"@lingui/macro": "^4.11.4 ",
"@lingui/swc-plugin": "^4.0.10",
"@types/react": "^18.2.39",
"babel-plugin-macros": "^3.1.0",
"react": "18.2.0",
"typescript": "5.5.3"
"typescript": "5.5.3",
"vite": "^5.4.8",
"vite-plugin-dts": "^4.2.3",
"vite-plugin-static-copy": "^2.0.0",
"vite-plugin-swc-transform": "^1.0.1"
},
"peerDependencies": {
"@lingui/macro": "*",
@@ -27234,7 +27228,6 @@
"devDependencies": {
"@emotion/react": "11.11.1",
"@mdi/js": "^7.2.96",
"@mdi/react": "^1.6.1",
"@theme-ui/components": "^0.16.1",
"@theme-ui/core": "^0.16.1",
"@types/react": "^18.2.39",
@@ -27249,7 +27242,6 @@
"peerDependencies": {
"@emotion/react": ">=11",
"@mdi/js": ">=7",
"@mdi/react": ">=1",
"@theme-ui/components": ">=0.16",
"@theme-ui/core": ">=0.16",
"framer-motion": ">=10",
@@ -27456,14 +27448,6 @@
"dev": true,
"license": "Apache-2.0"
},
"../../packages/ui/node_modules/@mdi/react": {
"version": "1.6.1",
"dev": true,
"license": "MIT",
"dependencies": {
"prop-types": "^15.7.2"
}
},
"../../packages/ui/node_modules/@notesnook/theme": {
"resolved": "../../packages/theme",
"link": true
@@ -29537,7 +29521,6 @@
"react-native-notification-sounds": "0.5.5",
"react-native-orientation": "https://github.com/yamill/react-native-orientation.git",
"react-native-pdf": "6.6.2",
"react-native-privacy-snapshot": "https://github.com/standardnotes/react-native-privacy-snapshot.git",
"react-native-quick-sqlite": "^8.0.6",
"react-native-reanimated": "3.14.0",
"react-native-safe-area-context": "^4.10.8",
@@ -43826,7 +43809,7 @@
},
"node_modules/react-native-privacy-snapshot": {
"version": "1.0.0",
"license": "MIT",
"resolved": "git+ssh://git@github.com/standardnotes/react-native-privacy-snapshot.git#653e904c90fc6f2b578da59138f2bfe5d7f942fe",
"peerDependencies": {
"react": "^16.13.1",
"react-native": "^0.62.0"

View File

@@ -46,7 +46,7 @@
"diffblazer": "^1.0.1",
"react": "18.2.0",
"react-native": "0.74.5",
"react-native-mmkv-storage": "^0.10.2",
"react-native-actions-sheet": "^0.9.7"
"react-native-actions-sheet": "^0.9.7",
"react-native-mmkv-storage": "^0.10.2"
}
}

View File

@@ -993,8 +993,8 @@
"@emotion/react": "11.11.1",
"@hazae41/foras": "^2.1.4",
"@henrygd/queue": "^1.0.6",
"@lingui/core": "4.11.2",
"@lingui/react": "4.11.2",
"@lingui/core": "4.11.4",
"@lingui/react": "4.11.4",
"@mdi/js": "^7.2.96",
"@mdi/react": "^1.6.1",
"@notesnook-importer/core": "^2.1.1",
@@ -1061,7 +1061,6 @@
"react-virtuoso": "^4.6.2",
"timeago.js": "4.0.2",
"tinycolor2": "^1.6.0",
"vite-plugin-commonjs": "^0.10.1",
"w3c-keyname": "^2.2.6",
"web-streams-polyfill": "^3.1.1",
"wouter": "2.12.1",

File diff suppressed because it is too large Load Diff

View File

@@ -92,9 +92,8 @@
"unfurl.js": "^6.4.0"
},
"devDependencies": {
"@emotion/react": "11.13.3",
"@emotion/react": "11.11.1",
"@mdi/js": "^7.4.47",
"@mdi/react": "^1.6.1",
"@theme-ui/components": "^0.16.2",
"@theme-ui/core": "^0.16.2",
"@types/katex": "^0.16.7",
@@ -119,7 +118,6 @@
"peerDependencies": {
"@emotion/react": ">=11",
"@mdi/js": ">=7.2.96",
"@mdi/react": ">=1.6.1",
"@theme-ui/components": ">=0.16.0",
"@theme-ui/core": ">=0.16.0",
"framer-motion": ">=11",
@@ -4464,7 +4462,7 @@
"version": "15.7.11",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
"integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==",
"devOptional": true
"dev": true
},
"node_modules/@types/q": {
"version": "1.5.8",
@@ -4488,7 +4486,7 @@
"version": "18.2.39",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.39.tgz",
"integrity": "sha512-Oiw+ppED6IremMInLV4HXGbfbG6GyziY3kqAwJYOR0PNbkYDmLWQA3a95EhdSmamsvbkJN96ZNN+YD+fGjzSBA==",
"devOptional": true,
"dev": true,
"dependencies": {
"@types/prop-types": "*",
"@types/scheduler": "*",
@@ -4523,7 +4521,7 @@
"version": "0.16.8",
"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
"integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==",
"devOptional": true
"dev": true
},
"node_modules/@types/semver": {
"version": "7.5.6",
@@ -9808,7 +9806,7 @@
"version": "9.0.21",
"resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz",
"integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==",
"devOptional": true,
"dev": true,
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/immer"
@@ -17906,21 +17904,6 @@
"is-typedarray": "^1.0.0"
}
},
"node_modules/typescript": {
"version": "4.9.5",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
"integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
"dev": true,
"license": "Apache-2.0",
"peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
"node": ">=4.2.0"
}
},
"node_modules/unbox-primitive": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",

View File

@@ -184,6 +184,7 @@
"../intl": {
"name": "@notesnook/intl",
"version": "1.0.0",
"hasInstallScript": true,
"license": "GPL-3.0-or-later",
"devDependencies": {
"@lingui/cli": "^4.11.4",
@@ -195,6 +196,7 @@
"typescript": "5.5.3",
"vite": "^5.4.8",
"vite-plugin-dts": "^4.2.3",
"vite-plugin-static-copy": "^2.0.0",
"vite-plugin-swc-transform": "^1.0.1"
},
"peerDependencies": {
@@ -1368,23 +1370,6 @@
"@styled-system/css": "^5.1.5"
}
},
"node_modules/@theme-ui/color-modes": {
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/@theme-ui/color-modes/-/color-modes-0.16.2.tgz",
"integrity": "sha512-jWEWx53lxNgWCT38i/kwLV2rsvJz8lVZgi5oImnVwYba9VejXD23q1ckbNFJHosQ8KKXY87ht0KPC6BQFIiHtQ==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@theme-ui/core": "^0.16.2",
"@theme-ui/css": "^0.16.2",
"deepmerge": "^4.2.2"
},
"peerDependencies": {
"@emotion/react": "^11.11.1",
"react": ">=18"
}
},
"node_modules/@theme-ui/components": {
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/@theme-ui/components/-/components-0.16.2.tgz",
@@ -1430,23 +1415,6 @@
"@emotion/react": "^11.11.1"
}
},
"node_modules/@theme-ui/theme-provider": {
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/@theme-ui/theme-provider/-/theme-provider-0.16.2.tgz",
"integrity": "sha512-LRnVevODcGqO0JyLJ3wht+PV3ZoZcJ7XXLJAJWDoGeII4vZcPQKwVy4Lpz/juHsZppQxKcB3U+sQDGBnP25irQ==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@theme-ui/color-modes": "^0.16.2",
"@theme-ui/core": "^0.16.2",
"@theme-ui/css": "^0.16.2"
},
"peerDependencies": {
"@emotion/react": "^11.11.1",
"react": ">=18"
}
},
"node_modules/@tiptap/core": {
"version": "2.6.6",
"resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.6.6.tgz",
@@ -2902,7 +2870,8 @@
"node_modules/js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
"dev": true
},
"node_modules/jsesc": {
"version": "2.5.2",
@@ -2960,6 +2929,7 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
"dev": true,
"dependencies": {
"js-tokens": "^3.0.0 || ^4.0.0"
},
@@ -3524,6 +3494,7 @@
"version": "18.3.1",
"resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
"integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
"dev": true,
"dependencies": {
"loose-envify": "^1.1.0"
},
@@ -3544,6 +3515,7 @@
"version": "18.3.1",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
"integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
"dev": true,
"dependencies": {
"loose-envify": "^1.1.0",
"scheduler": "^0.23.2"
@@ -3694,6 +3666,7 @@
"version": "0.23.2",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
"integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
"dev": true,
"dependencies": {
"loose-envify": "^1.1.0"
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -7,6 +7,7 @@
"": {
"name": "@notesnook/intl",
"version": "1.0.0",
"hasInstallScript": true,
"license": "GPL-3.0-or-later",
"devDependencies": {
"@lingui/cli": "^4.11.4",
@@ -1159,24 +1160,6 @@
"node": ">=16.0.0"
}
},
"node_modules/@lingui/react": {
"version": "4.11.4",
"resolved": "https://registry.npmjs.org/@lingui/react/-/react-4.11.4.tgz",
"integrity": "sha512-f7re4HhjI6CLBV1CY/PcI3VYP5zS4rtfU33speWnfkymsxGIXQv4ol3BqrgPLGhypMl2nKcL5nfL+LewrLIW8g==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.20.13",
"@lingui/core": "4.11.4"
},
"engines": {
"node": ">=16.0.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
}
},
"node_modules/@lingui/swc-plugin": {
"version": "4.0.10",
"resolved": "https://registry.npmjs.org/@lingui/swc-plugin/-/swc-plugin-4.0.10.tgz",

View File

@@ -61,11 +61,8 @@ export const strings = {
note: () => t`Note`,
notes: (count: number) =>
plural(count, {
one: "# note",
other: "# notes",
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
//@ts-ignore
_0: "No notes"
one: `note`,
other: `# notes`
}),
downloading: () => t`Downloading`,
uploading: () => t`Uploading`,
@@ -194,18 +191,17 @@ export const strings = {
| "dateDeleted"
) =>
select(key, {
dateCreated: "Created at",
dateEdited: "Last edited at",
dateModifed: "Last modified at",
dateUploaded: "Uploaded at",
dateDeleted: "Deleted at",
dateCreated: `Created at`,
dateEdited: `Last edited at`,
dateModifed: `Last modified at`,
dateUploaded: `Uploaded at`,
dateDeleted: `Deleted at`,
other: key
}),
noNotePropertiesNotice: (i18n: I18n) =>
t(i18n)`Start writing to save your note.`,
noteSyncedNoticeHeading: (i18n: I18n) => t(i18n)`Encrypted and synced`,
noteSyncedNoticeDesc: (type: string, i18n: I18n) =>
t(i18n)`No one can view this ${type} except you.`,
noNotePropertiesNotice: () => t`Start writing to save your note.`,
noteSyncedNoticeHeading: () => t`Encrypted and synced`,
noteSyncedNoticeDesc: (type: string) =>
t`No one can view this ${type} except you.`,
emptyPlaceholders: (type: "notebook" | "tag" | "note") =>
select(type, {
other: "This list is empty",

View File

@@ -1422,23 +1422,6 @@
"@styled-system/css": "^5.1.5"
}
},
"node_modules/@theme-ui/color-modes": {
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/@theme-ui/color-modes/-/color-modes-0.16.2.tgz",
"integrity": "sha512-jWEWx53lxNgWCT38i/kwLV2rsvJz8lVZgi5oImnVwYba9VejXD23q1ckbNFJHosQ8KKXY87ht0KPC6BQFIiHtQ==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@theme-ui/core": "^0.16.2",
"@theme-ui/css": "^0.16.2",
"deepmerge": "^4.2.2"
},
"peerDependencies": {
"@emotion/react": "^11.11.1",
"react": ">=18"
}
},
"node_modules/@theme-ui/components": {
"version": "0.16.1",
"dev": true,
@@ -1485,23 +1468,6 @@
"@emotion/react": "^11.11.1"
}
},
"node_modules/@theme-ui/theme-provider": {
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/@theme-ui/theme-provider/-/theme-provider-0.16.2.tgz",
"integrity": "sha512-LRnVevODcGqO0JyLJ3wht+PV3ZoZcJ7XXLJAJWDoGeII4vZcPQKwVy4Lpz/juHsZppQxKcB3U+sQDGBnP25irQ==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@theme-ui/color-modes": "^0.16.2",
"@theme-ui/core": "^0.16.2",
"@theme-ui/css": "^0.16.2"
},
"peerDependencies": {
"@emotion/react": "^11.11.1",
"react": ">=18"
}
},
"node_modules/@types/parse-json": {
"version": "4.0.2",
"dev": true,