Skip to content

Commit

Permalink
chore: update and add new languages
Browse files Browse the repository at this point in the history
  • Loading branch information
insertish committed May 25, 2022
1 parent 6eee71d commit 9e94817
Show file tree
Hide file tree
Showing 15 changed files with 1,029 additions and 57 deletions.
3 changes: 2 additions & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ module.exports = {
"/(lib)",
"/(redux|mobx)",
"/(context)",
"/(ui|common)|.svg|.webp|.png|.jpg$",
"/(ui|common)$",
".svg|.webp|.png|.jpg$",
"^[./]",
],
importOrderSeparation: true,
Expand Down
2 changes: 1 addition & 1 deletion external/lang
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"dependencies": {
"@fontsource/bitter": "^4.5.0",
"@insertish/vite-plugin-babel-macros": "^1.0.5",
"@revoltchat/ui": "^1.0.31",
"fs-extra": "^10.0.0",
"klaw": "^3.0.0",
"react-beautiful-dnd": "^13.1.0",
Expand Down Expand Up @@ -91,7 +92,6 @@
"@fontsource/ubuntu-mono": "^4.4.5",
"@hcaptcha/react-hcaptcha": "^0.3.6",
"@preact/preset-vite": "^2.0.0",
"@revoltchat/ui": "1.0.31",
"@rollup/plugin-replace": "^2.4.2",
"@styled-icons/boxicons-logos": "^10.38.0",
"@styled-icons/boxicons-regular": "^10.38.0",
Expand Down Expand Up @@ -131,7 +131,7 @@
"markdown-it": "^12.0.6",
"markdown-it-emoji": "^2.0.0",
"mediasoup-client": "npm:@insertish/[email protected]",
"mobx": "^6.3.2",
"mobx": "^6.6.0",
"mobx-react-lite": "^3.3.0",
"preact": "^10.5.14",
"preact-context-menu": "0.4.0-patch.0",
Expand Down Expand Up @@ -162,5 +162,8 @@
"repository": "https://github.com/revoltchat/revite.git",
"author": "Paul <[email protected]>",
"license": "MIT",
"packageManager": "[email protected]"
"packageManager": "[email protected]",
"resolutions": {
"@revoltchat/ui": "portal:../components"
}
}
1 change: 1 addition & 0 deletions src/mobx/stores/LocaleOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export function findLanguage(lang?: string): Language {
const value = Language[key as keyof typeof Language];

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

values.push(value);
Expand Down
161 changes: 161 additions & 0 deletions src/pages/settings/assets/flags/brittany.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
1 change: 1 addition & 0 deletions src/pages/settings/assets/flags/kurdistan.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions src/pages/settings/assets/flags/sources.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Flag of Brittany
CC BY-SA 4.0
https://commons.wikimedia.org/wiki/File:Flag_of_Brittany.svg

Enchanting Table
Minecraft game render
https://minecraft.fandom.com/wiki/Enchanting_Table?file=Enchanting_Table.gif

Flag of Esperanto
Public Domain
https://commons.wikimedia.org/wiki/File:Flag_of_Esperanto.svg

Flag of Kurdistan
Public Domain
https://commons.wikimedia.org/wiki/File:Flag_of_Kurdistan.svg

Tamil Nadu Flag
CC BY-SA 3.0
https://commons.wikimedia.org/wiki/File:..Tamil_Nadu_Flag(INDIA).png

Toki Pona Flag
Free for any use
https://www.reddit.com/r/tokipona/comments/mevzbn/a_flag_for_toki_pona/gsk3euc/

Flag of Veneto
CC BY-SA 3.0
https://commons.wikimedia.org/wiki/File:Flag_of_Veneto.svg
276 changes: 276 additions & 0 deletions src/pages/settings/assets/flags/toki_pona.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
499 changes: 499 additions & 0 deletions src/pages/settings/assets/flags/veneto.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 0 additions & 28 deletions src/pages/settings/assets/toki_pona.svg

This file was deleted.

56 changes: 44 additions & 12 deletions src/pages/settings/panes/Languages.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Check } from "@styled-icons/boxicons-regular";
import { observer } from "mobx-react-lite";

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

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

import Emoji from "../../../components/common/Emoji";
import Checkbox from "../../../components/ui/Checkbox";
import Tip from "../../../components/ui/Tip";
import enchantingTableWEBP from "../assets/enchanting_table.webp";
import esperantoFlagSVG from "../assets/esperanto.svg";
import tamilFlagPNG from "../assets/tamil_nadu_flag.png";
import tokiponaSVG from "../assets/toki_pona.svg";
import britannyFlagSVG from "../assets/flags/brittany.svg";
import enchantingTableWEBP from "../assets/flags/enchanting_table.webp";
import esperantoFlagSVG from "../assets/flags/esperanto.svg";
import kurdistanFlagSVG from "../assets/flags/kurdistan.svg";
import tamilFlagPNG from "../assets/flags/tamil_nadu.png";
import tokiponaSVG from "../assets/flags/toki_pona.svg";
import venetoFlagSVG from "../assets/flags/veneto.svg";

import {
Language,
LanguageEntry,
Languages as Langs,
} from "../../../../external/lang/Languages";
import Emoji from "../../../components/common/Emoji";
import Checkbox from "../../../components/ui/Checkbox";
import Tip from "../../../components/ui/Tip";

type Key = [Language, LanguageEntry];

Expand All @@ -40,22 +44,48 @@ function Entry({ entry: [x, lang], selected, onSelect }: Props) {
checked={selected}
onChange={onSelect}>
<div className={styles.flag}>
{lang.i18n === "eo" ? (
{lang.i18n === "vec" ? (
<img
src={venetoFlagSVG}
width={42}
loading="lazy"
style={{ objectFit: "cover", borderRadius: "6px" }}
/>
) : lang.i18n === "br" ? (
<img
src={britannyFlagSVG}
width={42}
loading="lazy"
style={{ objectFit: "cover", borderRadius: "6px" }}
/>
) : lang.i18n === "ckb" ? (
<img
src={kurdistanFlagSVG}
width={42}
loading="lazy"
style={{ objectFit: "cover", borderRadius: "6px" }}
/>
) : lang.i18n === "eo" ? (
<img
src={esperantoFlagSVG}
width={42}
loading="lazy"
style={{ objectFit: "contain", borderRadius: "6px" }}
style={{ objectFit: "cover", borderRadius: "6px" }}
/>
) : lang.i18n === "ta" ? (
<img
src={tamilFlagPNG}
width={42}
loading="lazy"
style={{ objectFit: "contain" }}
style={{ objectFit: "cover" }}
/>
) : lang.emoji === "🙂" ? (
<img src={tokiponaSVG} width={42} loading="lazy" />
<img
src={tokiponaSVG}
width={42}
loading="lazy"
style={{ borderRadius: "6px" }}
/>
) : lang.emoji === "🪄" ? (
<img
src={enchantingTableWEBP}
Expand All @@ -67,7 +97,9 @@ function Entry({ entry: [x, lang], selected, onSelect }: Props) {
<Emoji size={42} emoji={lang.emoji} />
)}
</div>
<span className={styles.description}>{lang.display}</span>
<span className={styles.description}>
{lang.display} {lang.verified && <Check size={16} />}
</span>
</Checkbox>
);
}
Expand Down
23 changes: 11 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2096,20 +2096,19 @@ __metadata:
languageName: node
linkType: hard

"@revoltchat/ui@npm:1.0.31":
version: 1.0.31
resolution: "@revoltchat/ui@npm:1.0.31"
"@revoltchat/ui@portal:../components::locator=client%40workspace%3A.":
version: 0.0.0-use.local
resolution: "@revoltchat/ui@portal:../components::locator=client%40workspace%3A."
dependencies:
"@styled-icons/boxicons-logos": ^10.38.0
"@styled-icons/boxicons-regular": ^10.38.0
"@styled-icons/boxicons-solid": ^10.38.0
mobx: ^6.5.0
mobx: ^6.6.0
mobx-react-lite: ^3.3.0
peerDependencies:
revolt-api: "*"
checksum: 8f93757d131ae7d784e744b774f6f6b9bea4e09a3fb48762334caf23e4ab08db209649eba1435f9fa82bdf7bfbfb78100fef6d13e7e0f715d0e2c82c52abf74d
languageName: node
linkType: hard
linkType: soft

"@rollup/plugin-babel@npm:^5.2.0":
version: 5.3.0
Expand Down Expand Up @@ -3386,7 +3385,7 @@ __metadata:
"@hcaptcha/react-hcaptcha": ^0.3.6
"@insertish/vite-plugin-babel-macros": ^1.0.5
"@preact/preset-vite": ^2.0.0
"@revoltchat/ui": 1.0.31
"@revoltchat/ui": ^1.0.31
"@rollup/plugin-replace": ^2.4.2
"@styled-icons/boxicons-logos": ^10.38.0
"@styled-icons/boxicons-regular": ^10.38.0
Expand Down Expand Up @@ -3428,7 +3427,7 @@ __metadata:
markdown-it: ^12.0.6
markdown-it-emoji: ^2.0.0
mediasoup-client: "npm:@insertish/[email protected]"
mobx: ^6.3.2
mobx: ^6.6.0
mobx-react-lite: ^3.3.0
preact: ^10.5.14
preact-context-menu: 0.4.0-patch.0
Expand Down Expand Up @@ -5867,10 +5866,10 @@ __metadata:
languageName: node
linkType: hard

"mobx@npm:^6.5.0":
version: 6.5.0
resolution: "mobx@npm:6.5.0"
checksum: 1210fb0b1c515b5f0ec2916296c32ca19b733e03b34f180af382d44b90668a15b4143c69bb06ca8785ebc3da3e761c6c60d0e72c945c199efc823088af1941ab
"mobx@npm:^6.6.0":
version: 6.6.0
resolution: "mobx@npm:6.6.0"
checksum: 369b8d6830ec286e9c856c80002c7a554d46bca739b7f76432cb56b3ce1fe0a7ed7e5a994b9793d30023beeff0dd16300a501e831fa97107104e4fedc7d4af8f
languageName: node
linkType: hard

Expand Down

0 comments on commit 9e94817

Please sign in to comment.