Skip to content

Commit 9e94817

Browse files
committed
chore: update and add new languages
1 parent 6eee71d commit 9e94817

15 files changed

+1029
-57
lines changed

.prettierrc.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ module.exports = {
88
"/(lib)",
99
"/(redux|mobx)",
1010
"/(context)",
11-
"/(ui|common)|.svg|.webp|.png|.jpg$",
11+
"/(ui|common)$",
12+
".svg|.webp|.png|.jpg$",
1213
"^[./]",
1314
],
1415
importOrderSeparation: true,

package.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"dependencies": {
6363
"@fontsource/bitter": "^4.5.0",
6464
"@insertish/vite-plugin-babel-macros": "^1.0.5",
65+
"@revoltchat/ui": "^1.0.31",
6566
"fs-extra": "^10.0.0",
6667
"klaw": "^3.0.0",
6768
"react-beautiful-dnd": "^13.1.0",
@@ -91,7 +92,6 @@
9192
"@fontsource/ubuntu-mono": "^4.4.5",
9293
"@hcaptcha/react-hcaptcha": "^0.3.6",
9394
"@preact/preset-vite": "^2.0.0",
94-
"@revoltchat/ui": "1.0.31",
9595
"@rollup/plugin-replace": "^2.4.2",
9696
"@styled-icons/boxicons-logos": "^10.38.0",
9797
"@styled-icons/boxicons-regular": "^10.38.0",
@@ -131,7 +131,7 @@
131131
"markdown-it": "^12.0.6",
132132
"markdown-it-emoji": "^2.0.0",
133133
"mediasoup-client": "npm:@insertish/[email protected]",
134-
"mobx": "^6.3.2",
134+
"mobx": "^6.6.0",
135135
"mobx-react-lite": "^3.3.0",
136136
"preact": "^10.5.14",
137137
"preact-context-menu": "0.4.0-patch.0",
@@ -162,5 +162,8 @@
162162
"repository": "https://github.com/revoltchat/revite.git",
163163
"author": "Paul <[email protected]>",
164164
"license": "MIT",
165-
"packageManager": "[email protected]"
165+
"packageManager": "[email protected]",
166+
"resolutions": {
167+
"@revoltchat/ui": "portal:../components"
168+
}
166169
}

src/mobx/stores/LocaleOptions.ts

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export function findLanguage(lang?: string): Language {
3131
const value = Language[key as keyof typeof Language];
3232

3333
// Skip alternative/joke languages
34+
if (Languages[value].cat === "const") continue;
3435
if (Languages[value].cat === "alt") continue;
3536

3637
values.push(value);

src/pages/settings/assets/flags/brittany.svg

+161
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Flag of Brittany
2+
CC BY-SA 4.0
3+
https://commons.wikimedia.org/wiki/File:Flag_of_Brittany.svg
4+
5+
Enchanting Table
6+
Minecraft game render
7+
https://minecraft.fandom.com/wiki/Enchanting_Table?file=Enchanting_Table.gif
8+
9+
Flag of Esperanto
10+
Public Domain
11+
https://commons.wikimedia.org/wiki/File:Flag_of_Esperanto.svg
12+
13+
Flag of Kurdistan
14+
Public Domain
15+
https://commons.wikimedia.org/wiki/File:Flag_of_Kurdistan.svg
16+
17+
Tamil Nadu Flag
18+
CC BY-SA 3.0
19+
https://commons.wikimedia.org/wiki/File:..Tamil_Nadu_Flag(INDIA).png
20+
21+
Toki Pona Flag
22+
Free for any use
23+
https://www.reddit.com/r/tokipona/comments/mevzbn/a_flag_for_toki_pona/gsk3euc/
24+
25+
Flag of Veneto
26+
CC BY-SA 3.0
27+
https://commons.wikimedia.org/wiki/File:Flag_of_Veneto.svg

src/pages/settings/assets/flags/toki_pona.svg

+276
Loading

src/pages/settings/assets/flags/veneto.svg

+499
Loading

src/pages/settings/assets/toki_pona.svg

-28
This file was deleted.

src/pages/settings/panes/Languages.tsx

+44-12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { Check } from "@styled-icons/boxicons-regular";
12
import { observer } from "mobx-react-lite";
23

34
import styles from "./Panes.module.scss";
@@ -6,19 +7,22 @@ import { useMemo } from "preact/hooks";
67

78
import { useApplicationState } from "../../../mobx/State";
89

9-
import Emoji from "../../../components/common/Emoji";
10-
import Checkbox from "../../../components/ui/Checkbox";
11-
import Tip from "../../../components/ui/Tip";
12-
import enchantingTableWEBP from "../assets/enchanting_table.webp";
13-
import esperantoFlagSVG from "../assets/esperanto.svg";
14-
import tamilFlagPNG from "../assets/tamil_nadu_flag.png";
15-
import tokiponaSVG from "../assets/toki_pona.svg";
10+
import britannyFlagSVG from "../assets/flags/brittany.svg";
11+
import enchantingTableWEBP from "../assets/flags/enchanting_table.webp";
12+
import esperantoFlagSVG from "../assets/flags/esperanto.svg";
13+
import kurdistanFlagSVG from "../assets/flags/kurdistan.svg";
14+
import tamilFlagPNG from "../assets/flags/tamil_nadu.png";
15+
import tokiponaSVG from "../assets/flags/toki_pona.svg";
16+
import venetoFlagSVG from "../assets/flags/veneto.svg";
1617

1718
import {
1819
Language,
1920
LanguageEntry,
2021
Languages as Langs,
2122
} from "../../../../external/lang/Languages";
23+
import Emoji from "../../../components/common/Emoji";
24+
import Checkbox from "../../../components/ui/Checkbox";
25+
import Tip from "../../../components/ui/Tip";
2226

2327
type Key = [Language, LanguageEntry];
2428

@@ -40,22 +44,48 @@ function Entry({ entry: [x, lang], selected, onSelect }: Props) {
4044
checked={selected}
4145
onChange={onSelect}>
4246
<div className={styles.flag}>
43-
{lang.i18n === "eo" ? (
47+
{lang.i18n === "vec" ? (
48+
<img
49+
src={venetoFlagSVG}
50+
width={42}
51+
loading="lazy"
52+
style={{ objectFit: "cover", borderRadius: "6px" }}
53+
/>
54+
) : lang.i18n === "br" ? (
55+
<img
56+
src={britannyFlagSVG}
57+
width={42}
58+
loading="lazy"
59+
style={{ objectFit: "cover", borderRadius: "6px" }}
60+
/>
61+
) : lang.i18n === "ckb" ? (
62+
<img
63+
src={kurdistanFlagSVG}
64+
width={42}
65+
loading="lazy"
66+
style={{ objectFit: "cover", borderRadius: "6px" }}
67+
/>
68+
) : lang.i18n === "eo" ? (
4469
<img
4570
src={esperantoFlagSVG}
4671
width={42}
4772
loading="lazy"
48-
style={{ objectFit: "contain", borderRadius: "6px" }}
73+
style={{ objectFit: "cover", borderRadius: "6px" }}
4974
/>
5075
) : lang.i18n === "ta" ? (
5176
<img
5277
src={tamilFlagPNG}
5378
width={42}
5479
loading="lazy"
55-
style={{ objectFit: "contain" }}
80+
style={{ objectFit: "cover" }}
5681
/>
5782
) : lang.emoji === "🙂" ? (
58-
<img src={tokiponaSVG} width={42} loading="lazy" />
83+
<img
84+
src={tokiponaSVG}
85+
width={42}
86+
loading="lazy"
87+
style={{ borderRadius: "6px" }}
88+
/>
5989
) : lang.emoji === "🪄" ? (
6090
<img
6191
src={enchantingTableWEBP}
@@ -67,7 +97,9 @@ function Entry({ entry: [x, lang], selected, onSelect }: Props) {
6797
<Emoji size={42} emoji={lang.emoji} />
6898
)}
6999
</div>
70-
<span className={styles.description}>{lang.display}</span>
100+
<span className={styles.description}>
101+
{lang.display} {lang.verified && <Check size={16} />}
102+
</span>
71103
</Checkbox>
72104
);
73105
}

yarn.lock

+11-12
Original file line numberDiff line numberDiff line change
@@ -2096,20 +2096,19 @@ __metadata:
20962096
languageName: node
20972097
linkType: hard
20982098

2099-
"@revoltchat/ui@npm:1.0.31":
2100-
version: 1.0.31
2101-
resolution: "@revoltchat/ui@npm:1.0.31"
2099+
"@revoltchat/ui@portal:../components::locator=client%40workspace%3A.":
2100+
version: 0.0.0-use.local
2101+
resolution: "@revoltchat/ui@portal:../components::locator=client%40workspace%3A."
21022102
dependencies:
21032103
"@styled-icons/boxicons-logos": ^10.38.0
21042104
"@styled-icons/boxicons-regular": ^10.38.0
21052105
"@styled-icons/boxicons-solid": ^10.38.0
2106-
mobx: ^6.5.0
2106+
mobx: ^6.6.0
21072107
mobx-react-lite: ^3.3.0
21082108
peerDependencies:
21092109
revolt-api: "*"
2110-
checksum: 8f93757d131ae7d784e744b774f6f6b9bea4e09a3fb48762334caf23e4ab08db209649eba1435f9fa82bdf7bfbfb78100fef6d13e7e0f715d0e2c82c52abf74d
21112110
languageName: node
2112-
linkType: hard
2111+
linkType: soft
21132112

21142113
"@rollup/plugin-babel@npm:^5.2.0":
21152114
version: 5.3.0
@@ -3386,7 +3385,7 @@ __metadata:
33863385
"@hcaptcha/react-hcaptcha": ^0.3.6
33873386
"@insertish/vite-plugin-babel-macros": ^1.0.5
33883387
"@preact/preset-vite": ^2.0.0
3389-
"@revoltchat/ui": 1.0.31
3388+
"@revoltchat/ui": ^1.0.31
33903389
"@rollup/plugin-replace": ^2.4.2
33913390
"@styled-icons/boxicons-logos": ^10.38.0
33923391
"@styled-icons/boxicons-regular": ^10.38.0
@@ -3428,7 +3427,7 @@ __metadata:
34283427
markdown-it: ^12.0.6
34293428
markdown-it-emoji: ^2.0.0
34303429
mediasoup-client: "npm:@insertish/[email protected]"
3431-
mobx: ^6.3.2
3430+
mobx: ^6.6.0
34323431
mobx-react-lite: ^3.3.0
34333432
preact: ^10.5.14
34343433
preact-context-menu: 0.4.0-patch.0
@@ -5867,10 +5866,10 @@ __metadata:
58675866
languageName: node
58685867
linkType: hard
58695868

5870-
"mobx@npm:^6.5.0":
5871-
version: 6.5.0
5872-
resolution: "mobx@npm:6.5.0"
5873-
checksum: 1210fb0b1c515b5f0ec2916296c32ca19b733e03b34f180af382d44b90668a15b4143c69bb06ca8785ebc3da3e761c6c60d0e72c945c199efc823088af1941ab
5869+
"mobx@npm:^6.6.0":
5870+
version: 6.6.0
5871+
resolution: "mobx@npm:6.6.0"
5872+
checksum: 369b8d6830ec286e9c856c80002c7a554d46bca739b7f76432cb56b3ce1fe0a7ed7e5a994b9793d30023beeff0dd16300a501e831fa97107104e4fedc7d4af8f
58745873
languageName: node
58755874
linkType: hard
58765875

0 commit comments

Comments
 (0)