languageNames moved to common

This commit is contained in:
nklhrstv 2020-03-14 23:46:48 +02:00
parent 352bbb171d
commit 4208368a22
4 changed files with 14 additions and 12 deletions

View file

@ -17,6 +17,7 @@ const SharePrompt = require('./SharePrompt');
const Slider = require('./Slider');
const TextInput = require('./TextInput');
const { ToastProvider, useToast } = require('./Toast');
const languageNames = require('./languageNames');
const routesRegexp = require('./routesRegexp');
const useAnimationFrame = require('./useAnimationFrame');
const useBinaryState = require('./useBinaryState');
@ -51,6 +52,7 @@ module.exports = {
TextInput,
ToastProvider,
useToast,
languageNames,
routesRegexp,
useAnimationFrame,
useBinaryState,

View file

@ -2,7 +2,7 @@ const React = require('react');
const PropTypes = require('prop-types');
const classnames = require('classnames');
const Icon = require('stremio-icons/dom');
const { Button, ColorInput } = require('stremio/common');
const { Button, ColorInput, languageNames } = require('stremio/common');
const DiscreteSelectInput = require('./DiscreteSelectInput');
const styles = require('./styles');
@ -120,8 +120,8 @@ const SubtitlesPicker = (props) => {
}
</Button>
{languages.map((lang, index) => (
<Button key={index} title={lang} className={classnames(styles['language-option'], { 'selected': selectedLanguage === lang })} data-lang={lang} onClick={languageOnClick}>
<div className={styles['language-label']}>{lang}</div>
<Button key={index} title={typeof languageNames[lang] === 'string' ? languageNames[lang] : lang} className={classnames(styles['language-option'], { 'selected': selectedLanguage === lang })} data-lang={lang} onClick={languageOnClick}>
<div className={styles['language-label']}>{typeof languageNames[lang] === 'string' ? languageNames[lang] : lang}</div>
{
selectedLanguage === lang ?
<div className={styles['icon']} />

View file

@ -1,20 +1,20 @@
const React = require('react');
const { useServices } = require('stremio/services');
const languages = require('./languages');
const { languageNames } = require('stremio/common');
const SUBTITLES_SIZES = [75, 100, 125, 150, 175, 200, 250];
const useProfileSettingsInputs = (profile) => {
const { core } = useServices();
const interfaceLanguageSelect = React.useMemo(() => ({
options: Object.keys(languages).map((code) => ({
options: Object.keys(languageNames).map((code) => ({
value: code,
label: languages[code]
label: languageNames[code]
})),
selected: [profile.settings.interface_language],
renderLabelText: () => {
return typeof languages[profile.settings.interface_language] === 'string' ?
languages[profile.settings.interface_language]
return typeof languageNames[profile.settings.interface_language] === 'string' ?
languageNames[profile.settings.interface_language]
:
profile.settings.interface_language;
},
@ -32,14 +32,14 @@ const useProfileSettingsInputs = (profile) => {
}
}), [profile.settings]);
const subtitlesLanguageSelect = React.useMemo(() => ({
options: Object.keys(languages).map((code) => ({
options: Object.keys(languageNames).map((code) => ({
value: code,
label: languages[code]
label: languageNames[code]
})),
selected: [profile.settings.subtitles_language],
renderLabelText: () => {
return typeof languages[profile.settings.subtitles_language] === 'string' ?
languages[profile.settings.subtitles_language]
return typeof languageNames[profile.settings.subtitles_language] === 'string' ?
languageNames[profile.settings.subtitles_language]
:
profile.settings.subtitles_language;
},