diff --git a/package.json b/package.json index 919ef93..e425b58 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "description": "数字人直播间", "scripts": { "dev": "vite --host", - "dev-test": "vite --host --mode=test", + "dev-test": "set APP_LANGUAGE=en-US && vite --host --mode=test", "dev-lang-en": "set APP_LANGUAGE=en-US && vite --host --mode=lang-en", "build": "tsc && vite build", "build-test": "tsc && vite build --mode=test", diff --git a/src/assets/core.scss b/src/assets/core.scss index 4cb65b1..e362078 100644 --- a/src/assets/core.scss +++ b/src/assets/core.scss @@ -272,9 +272,12 @@ @apply text-right; .btn-to-top { @apply w-[44px] h-[44px] inline-block bg-blue-300 text-center p-0 transition hover:bg-blue-500; - min-width: 0; + min-width: 0 !important; border-radius: 50px; font-size: 24px; + svg{ + margin-left: 0 !important; + } } } diff --git a/src/i18n/translations/en-US.json b/src/i18n/translations/en-US.json index 94c1f63..2fb1de0 100644 --- a/src/i18n/translations/en-US.json +++ b/src/i18n/translations/en-US.json @@ -48,7 +48,8 @@ "news": { "delete_confirm": "Are you sure you want to delete this item?", "delete_confirm_count": "Are you sure you want to delete these {{count}} items?", - "delete_description": "This item will be deleted.
It can be recovered from the “news” page. ", + "delete_description": "This item will be deleted.
It can be recovered from the \"News\" page. ", + "delete_description_count": "These item will be deleted.
It can be recovered from the \"News\" page. ", "delete_empty": "Please select the items to delete", "download_empty": "Please select the news to download", "download_failed": "Download failed!", @@ -72,14 +73,14 @@ "push_streaming": "Pushing...", "push_success": "Push success", "push_to_edit": "Editing", - "pushed": "Pushed", + "pushed": "Editing", "search_key_title": "Please enter title keywords", - "source": "source", + "source": "Source", "title": "News content", - "title_image_count": "Number of pictures", + "title_image_count": "No. of images", "title_operate": "", - "title_time": "time", - "title_word_count": "Wordcount", + "title_time": "Time stamp", + "title_word_count": "Word count", "edit_digital_text": "MetaHuman Material", "edit_other_text": "Other media Material", "edit_generate_video_again": "Regenerate", @@ -105,7 +106,7 @@ "cancel": "Cancel", "confirm_text": "Confirm", "select": { - "pushed": "Pushed: {{count}}", + "pushed": "Pushed: {{count}}", "select_all": "Select all", "selected": "Selected", "selected_some": "Selected: {{count}}", @@ -125,14 +126,16 @@ }, "video": { "delete_confirm_title": "Are you sure you want to delete this video?", - "delete_confirm": "These videos will be deleted.
They can be recovered from the “news” page. ", - "delete_description": "Are you sure you want to delete these {{count}} videos?", + "delete_confirm": "The video will be deleted.
It can be recovered from the \"News\" page. ", + "delete_confirm_count": "These videos will be deleted.
They can be recovered from the \"News\" page. ", + "delete_description": "Are you sure you want to delete the video?", + "delete_description_count": "Are you sure you want to delete these {{count}} videos?", "delete_empty": "Select the video you want to delete", "download": "Download", "push_confirm": "Are you sure you want to streaming these video?", "push_empty": "Select the video you want to streaming", - "push_failed": "some video streaming failed!", - "push_success": "Streaming success,please goto Streaming!", + "push_failed": "some video streaming failed!", + "push_success": "Streaming success,please goto \"Streaming\"!", "push_to_live": "Streaming", "sort_modify_confirm": "Are you change video sequence?", "sort_modify_failed": "Video sequence change failed", diff --git a/src/i18n/translations/zh-CN.json b/src/i18n/translations/zh-CN.json index ddbe421..f760686 100644 --- a/src/i18n/translations/zh-CN.json +++ b/src/i18n/translations/zh-CN.json @@ -49,6 +49,7 @@ "delete_confirm": "你确定要删除吗?", "delete_confirm_count": "你确定要删除选择的 {{count}} 条新闻吗?", "delete_description": "删除后需从新闻素材中重新选择", + "delete_description_count": "删除后需从新闻素材中重新选择", "delete_empty": "请选择要删除的新闻", "download_empty": "请选择要下载的新闻", "download_failed": "下载新闻失败,请重试!", @@ -126,7 +127,9 @@ "video": { "delete_confirm_title": "你确定要删除此视频吗 ", "delete_confirm": "删除后需重新生成视频", + "delete_confirm_count": "删除后需重新生成视频", "delete_description": "已选择{{count}}条,确定要全部删除吗?", + "delete_description_count": "已选择{{count}}条,确定要全部删除吗?", "delete_empty": "请选择要删除的视频", "download": "下载视频", "push_confirm": "是否确定一键推流选中新闻视频?", diff --git a/src/pages/library/index.tsx b/src/pages/library/index.tsx index 230ba80..6fd896f 100644 --- a/src/pages/library/index.tsx +++ b/src/pages/library/index.tsx @@ -159,9 +159,17 @@ export default function LibraryIndex() { onSuccess={refresh} className='bg-gray-300 hover:bg-gray-400 text-white' icon={} - title={t('video.delete_description',{count:checkedIdArray.length})} + title={ + checkedIdArray.length == 1 + ? t('video.delete_description',{count:checkedIdArray.length}) + : t('video.delete_description_count',{count:checkedIdArray.length}) + } emptyMessage={t('video.delete_empty')} - confirmMessage={} + confirmMessage={} onProcess={deleteHistories} >{t('delete_batch')}} {checkedIdArray?.length > 0 && 1? + t('video.delete_description_count',{count:checkedIdArray.length}) + : + t('video.delete_description',{count:checkedIdArray.length})} onSuccess={loadList} onProcess={processDeleteVideo} > diff --git a/src/pages/news/components/button-delete-batch.tsx b/src/pages/news/components/button-delete-batch.tsx index cb2aa14..6437072 100644 --- a/src/pages/news/components/button-delete-batch.tsx +++ b/src/pages/news/components/button-delete-batch.tsx @@ -30,8 +30,8 @@ export default function ButtonDeleteBatch(props: { ids: Id[];onSuccess?: () => v modal.confirm({ wrapClassName:'root-modal-confirm', icon: , - title: t('news.delete_confirm_count',{count:props.ids.length}), - content: , + title: t(props.ids.length == 1 ?'news.delete_confirm':'news.delete_confirm_count',{count:props.ids.length}), + content: , onOk: handlePush, centered: true }) diff --git a/src/pages/video/index.tsx b/src/pages/video/index.tsx index 476b54a..722414b 100644 --- a/src/pages/video/index.tsx +++ b/src/pages/video/index.tsx @@ -261,9 +261,16 @@ export default function VideoIndex() { onProcess={deleteFromList} selected={checkedIdArray} emptyMessage={t('video.delete_empty')} - title={t('video.delete_description',{count:checkedIdArray.length})} + title={ + checkedIdArray.length == 1 ? t('video.delete_description',{count:checkedIdArray.length}): + t('video.delete_description_count',{count:checkedIdArray.length}) + } className='bg-gray-300 hover:bg-gray-400 text-white' - confirmMessage={t('video.delete_confirm')} + confirmMessage={} onSuccess={() => { showToast(t('delete_success'), 'success') loadList() diff --git a/vite.config.ts b/vite.config.ts index 5510978..c661fe5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -11,7 +11,7 @@ const DevServerList:{ 'development':'http://192.168.0.231:9999', 'lang-en':'https://mh.starbitech.com' } -console.log('build-lang',process.env.APP_LANGUAGE) + // https://vitejs.dev/config/ export default defineConfig(({mode}) => { const devServerHost = DevServerList[mode] || 'http://192.168.0.231:9999'