Merge branch 'dev' into keyboard-improvements

This commit is contained in:
mrjvs 2023-12-29 13:12:07 +01:00 committed by GitHub
commit 1ce97af722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 47 deletions

View File

@ -124,15 +124,11 @@
},
"morning": {
"default": "What would you like to watch this morning?",
"extra": [
"I hear Before Sunrise is good"
]
"extra": ["I hear Before Sunrise is good"]
},
"night": {
"default": "What would you like to watch tonight?",
"extra": [
"Tired? I hear The Exorcist is good."
]
"extra": ["Tired? I hear The Exorcist is good."]
}
}
},
@ -211,18 +207,18 @@
"subtitles": {
"title": "Subtitles",
"customizeLabel": "Customize",
"offChoice": "Off",
"settings": {
"backlink": "Custom Subtitles",
"fixCapitals": "Fix capitalization",
"delay": "Caption delay"
"delay": "Subtitle delay",
"backlink": "Custom subtitles"
},
"title": "Captions",
"customChoice": "Select subtitle from file",
"offChoice": "Off",
"unknownLanguage": "Unknown"
},
"downloads": {
"disclaimer": "Downloads are taken directly from the provider. movie-web does not have control over how the downloads are provided.",
"downloadCaption": "Download current caption",
"downloadSubtitle": "Download current subtitle",
"downloadPlaylist": "Download playlist",
"downloadVideo": "Download video",
"hlsDisclaimer": "Downloads are taken directly from the provider. movie-web does not have control over how the downloads are provided. Please note that you are downloading an HLS playlist, this is intended for users familiar with advanced multimedia streaming.",
@ -243,14 +239,6 @@
},
"title": "Download"
},
"episodes": {
"button": "Episodes",
"emptyState": "There are no episodes in this season, check back later!",
"episodeBadge": "E{{episode}}",
"loadingError": "Error loading season",
"loadingList": "Loading...",
"loadingTitle": "Loading..."
},
"playback": {
"speedLabel": "Playback speed",
"title": "Playback settings"
@ -260,32 +248,6 @@
"hint": "You can try <0>switching source</0> to get different quality options.",
"iosNoQuality": "Due to Apple-defined limitations, quality selection is not available on iOS for this source. You can try <0>switching to another source</0> to get different quality options.",
"title": "Quality"
},
"settings": {
"captionItem": "Subtitle settings",
"downloadItem": "Download",
"enableCaptions": "Enable captions",
"experienceSection": "Viewing experience",
"playbackItem": "Playback settings",
"qualityItem": "Quality",
"sourceItem": "Video sources",
"videoSection": "Video settings"
},
"sources": {
"failed": {
"text": "There was an error while trying to find any videos, please try a different source.",
"title": "Failed to scrape"
},
"noEmbeds": {
"text": "We were unable to find any embeds, please try a different source.",
"title": "No embeds found"
},
"noStream": {
"text": "This source has no streams for this movie or show.",
"title": "No stream"
},
"title": "Sources",
"unknownOption": "Unknown"
}
},
"metadata": {
@ -412,7 +374,8 @@
"title": "Subtitles",
"previewQuote": "I must not fear. Fear is the mind-killer.",
"textSizeLabel": "Text size",
"title": "Captions"
"backgroundLabel": "Background opacity",
"colorLabel": "Color"
},
"connections": {
"server": {

View File

@ -23,7 +23,7 @@ export interface ScrapingSegment {
embedId?: string;
status: "failure" | "pending" | "notfound" | "success" | "waiting";
reason?: string;
error?: unknown;
error?: any;
percentage: number;
}

View File

@ -35,6 +35,8 @@ export function ScrapeErrorPart(props: ScrapeErrorPartProps) {
Object.values(data.sources).forEach((v) => {
str += `${v.id}: ${v.status}\n`;
if (v.reason) str += `${v.reason}\n`;
if (v.error?.message)
str += `${v.error.name ?? "unknown"}: ${v.error.message}\n`;
if (v.error) str += `${v.error.toString()}\n`;
});
return str;