Skip to content

Commit

Permalink
Merge branch 'main' into fix-scrolling-on-discover-page
Browse files Browse the repository at this point in the history
  • Loading branch information
Captain Jack Sparrow authored May 31, 2024
2 parents b67fc99 + 95a5e1a commit c807754
Show file tree
Hide file tree
Showing 19 changed files with 1,645 additions and 1,433 deletions.
1,498 changes: 738 additions & 760 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
window.__CONFIG__ = {
// The URL for the CORS proxy, the URL must NOT end with a slash!
// If not specified, the onboarding will not allow a "default setup". The user will have to use the extension or set up a proxy themselves
VITE_CORS_PROXY_URL: "https://sudo-proxy.up.railway.app",
VITE_CORS_PROXY_URL: "REPLACE THIS",

// The READ API key to access TMDB
VITE_TMDB_READ_API_KEY: "eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiI1NzlkZWYyZDY5ZWFlNDk4ZjJiOTI4MTgyNDdjM2ViMCIsInN1YiI6IjY2MjdmMGJlNjJmMzM1MDE0YmQ4NTFmMiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.h3KpPvkiaz8uNz1bntAKqsPrxG_4UUWaY3kYME6N6m8",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Locales are difficult, here is some guidance.

## Process on adding new languages
1. Use Weblate to add translations, see contributing guidelines.
1. Use [Weblate](https://weblate.tinypixel.uk/projects/sudo-flix/main) to add translations, see contributing guidelines.
2. Add your language to `@/assets/languages.ts`. Must be in ISO format (ISO-639 for language and ISO-3166 for country/region). For joke languages, use any format.
3. If the language code doesn't have a region specified (Such as in `pt-BR`, `BR` being the region), add a default region in `@/utils/language.ts` at `defaultLanguageCodes`
4. If the language code doesn't contain a region (Such as in `zh-Hant`), add a default country in `@/utils/language.ts` at `countryPriority`.
4 changes: 2 additions & 2 deletions src/assets/languages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import bg from "@/assets/locales/bg.json";
import bn from "@/assets/locales/bn.json";
import ca from "@/assets/locales/ca.json";
import caVl from "@/assets/locales/[email protected]";
import cat from "@/assets/locales/cat.json";
import cs from "@/assets/locales/cs.json";
import de from "@/assets/locales/de.json";
import el from "@/assets/locales/el.json";
Expand All @@ -21,6 +20,7 @@ import id from "@/assets/locales/id.json";
import is from "@/assets/locales/is-IS.json";
import it from "@/assets/locales/it.json";
import ja from "@/assets/locales/ja.json";
import kitty from "@/assets/locales/kitty.json";
import ko from "@/assets/locales/ko.json";
import lv from "@/assets/locales/lv.json";
import minion from "@/assets/locales/minion.json";
Expand Down Expand Up @@ -62,7 +62,7 @@ export const locales = {
he,
sv,
pirate,
cat,
kitty,
uwu,
minion,
lv,
Expand Down
7 changes: 5 additions & 2 deletions src/assets/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -368,14 +368,17 @@
"customChoice": "Drop or upload file",
"customizeLabel": "Customize",
"offChoice": "Off",
"OpenSubtitlesChoice": "OpenSubtitles",
"settings": {
"backlink": "Custom subtitles",
"delay": "Subtitle delay",
"fixCapitals": "Fix capitalization"
},
"title": "Subtitles",
"unknownLanguage": "Unknown",
"dropSubtitleFile": "Drop subtitle file here! >_<"
"dropSubtitleFile": "Drop subtitle file here! >_<",
"scrapeButton": "Scrape subtitles",
"empty": "There are no provided subtitles for this."
}
},
"metadata": {
Expand Down Expand Up @@ -474,7 +477,7 @@
},
"screens": {
"dmca": {
"text": "Welcome to sudo-flix's DMCA contact page. If you believe your copyrighted work has been improperly used on our platform (😢), please send a detailed DMCA notice to: <bold>[email protected]</bold> below. Please include a description of the copyrighted material, your contact details, and a statement of good faith belief. We're committed to resolving these matters promptly and appreciate your cooperation.",
"text": "Welcome to sudo-flix's DMCA contact page. If you believe your copyrighted work has been improperly used on our platform (😢), please send a detailed DMCA notice to: <bold>{{dmca}}</bold> below. Please include a description of the copyrighted material, your contact details, and a statement of good faith belief. We're committed to resolving these matters promptly and appreciate your cooperation.",
"title": "DMCA :("
},
"loadingApp": "Loading application",
Expand Down
Loading

0 comments on commit c807754

Please sign in to comment.