Skip to content

Commit

Permalink
fix: word explains display error
Browse files Browse the repository at this point in the history 
#686
  • Loading branch information
@Pylogmon
Pylogmon committed Feb 24, 2024
1 parent a22a548 commit b95a367
Showing 1 changed file with 62 additions and 53 deletions.
115 changes: 62 additions & 53 deletions src/window/Translate/components/TargetArea/index.jsx
View file
Expand Up @@ -315,7 +315,7 @@ export default function TargetArea(props) {
const [boundRef, bounds] = useMeasure({ scroll: true });
const springs = useSpring({
from: { height: 0 },
to: { height: hide ? 0 : bounds.height }
to: { height: hide ? 0 : bounds.height },
});

return (
Expand Down Expand Up @@ -352,8 +352,7 @@ export default function TargetArea(props) {
}
>
{translateServiceName.startsWith('[plugin]') ? (
<div
className='my-auto'>{`${pluginList['translate'][translateServiceName].display} `}</div>
<div className='my-auto'>{`${pluginList['translate'][translateServiceName].display} `}</div>
) : (
<div className='my-auto'>
{t(`services.translate.${translateServiceName}.title`)}
Expand Down Expand Up @@ -441,15 +440,17 @@ export default function TargetArea(props) {
<div key={nanoid()}>
{pronunciation['region'] && (
<span
className={`text-[${appFontSize}px] mr-[12px] text-default-500`}>
{pronunciation['region']}
</span>
className={`text-[${appFontSize}px] mr-[12px] text-default-500`}
>
{pronunciation['region']}
</span>
)}
{pronunciation['symbol'] && (
<span
className={`text-[${appFontSize}px] mr-[12px] text-default-500`}>
{pronunciation['symbol']}
</span>
className={`text-[${appFontSize}px] mr-[12px] text-default-500`}
>
{pronunciation['symbol']}
</span>
)}
{pronunciation['voice'] && pronunciation['voice'] !== '' && (
<HiOutlineVolumeUp
Expand All @@ -470,33 +471,33 @@ export default function TargetArea(props) {
explanations['explains'].map((explain, index) => {
return (
<span key={nanoid()}>
{index === 0 ? (
<>
<span
className={`text-[${
appFontSize - 2
}px] text-default-500 mr-[12px]`}
>
{explanations['trait']}
</span>
<span
className={`font-bold text-[${appFontSize}px] select-text`}
>
{explain}
</span>
<br />
</>
) : (
<span
className={`text-[${
appFontSize - 2
}px] text-default-500 select-text`}
key={nanoid()}
>
{explain}
{index === 0 ? (
<>
<span
className={`text-[${
appFontSize - 2
}px] text-default-500 mr-[12px]`}
>
{explanations['trait']}
</span>
<span
className={`font-bold text-[${appFontSize}px] select-text`}
>
{explain}
</span>
<br />
</>
) : (
<span
className={`text-[${
appFontSize - 2
}px] text-default-500 select-text mr-1`}
key={nanoid()}
>
{explain}
</span>
)}
</span>
)}
</span>
);
})}
</div>
Expand All @@ -507,18 +508,19 @@ export default function TargetArea(props) {
result['associations'].map((association) => {
return (
<div key={nanoid()}>
<span className={`text-[${appFontSize}px] text-default-500`}>
{association}
</span>
<span className={`text-[${appFontSize}px] text-default-500`}>
{association}
</span>
</div>
);
})}
{result['sentence'] &&
result['sentence'].map((sentence, index) => {
return (
<div key={nanoid()}>
<span
className={`text-[${appFontSize - 2}px] mr-[12px]`}>{index + 1}.</span>
<span className={`text-[${appFontSize - 2}px] mr-[12px]`}>
{index + 1}.
</span>
<>
{sentence['source'] && (
<span
Expand Down Expand Up @@ -560,7 +562,9 @@ export default function TargetArea(props) {
)}
</CardBody>
<CardFooter
className={`bg-content1 rounded-none rounded-b-[10px] flex px-[12px] p-[5px] ${hide && 'hidden'}`}
className={`bg-content1 rounded-none rounded-b-[10px] flex px-[12px] p-[5px] ${
hide && 'hidden'
}`}
>
<ButtonGroup>
<Tooltip content={t('translate.speak')}>
Expand Down Expand Up @@ -647,7 +651,10 @@ export default function TargetArea(props) {
}
} else {
const LanguageEnum = builtinServices[translateServiceName].Language;
if (newSourceLanguage in LanguageEnum && newTargetLanguage in LanguageEnum) {
if (
newSourceLanguage in LanguageEnum &&
newTargetLanguage in LanguageEnum
) {
setIsLoading(true);
setHide(true);
const setHideOnce = invokeOnce(setHide);
Expand Down Expand Up @@ -735,16 +742,18 @@ export default function TargetArea(props) {
}
);
} else {
builtinCollectionServices[serviceName].collection(sourceText, result).then(
(_) => {
toast.success(t('translate.add_collection_success'), {
style: toastStyle,
});
},
(e) => {
toast.error(e.toString(), { style: toastStyle });
}
);
builtinCollectionServices[serviceName]
.collection(sourceText, result)
.then(
(_) => {
toast.success(t('translate.add_collection_success'), {
style: toastStyle,
});
},
(e) => {
toast.error(e.toString(), { style: toastStyle });
}
);
}
}}
>
Expand All @@ -764,5 +773,5 @@ export default function TargetArea(props) {
</div>
</animated.div>
</Card>
);
);
}

0 comments on commit b95a367

Please sign in to comment.