Skip to content

Commit

Permalink
2.13.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Dooy committed Jan 1, 2024
1 parent 305aa5c commit 9e1c6f8
Show file tree
Hide file tree
Showing 7 changed files with 138 additions and 35 deletions.
19 changes: 18 additions & 1 deletion src/locales/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,24 @@ export default {
"setUploader": "Upload Related",
"setUploaderUrl": "Upload Address:",
"setBtSave": "Save",
"setBtBack": "Restore Default"
"setBtBack": "Restore Default",

"redraw": "Redraw",
"fail1": "Please be patient, it's loading.",
"success1": "Image refreshed successfully!",
"high_variation": "Strong Variation",
"low_variation": "Weak Variation",
"p15": "Zoom 1.5x",
"p20": "Zoom 2x",
"p100": "Normal",
"retry": "Retry",
"pan_left": "Left",
"pan_right": "Right",
"pan_up": "Up",
"pan_down": "Down",
"up2": "HD 2x",
"up4": "HD 4x"

},
"mjset": {
"server": "Server",
Expand Down
17 changes: 16 additions & 1 deletion src/locales/ko-KR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,22 @@ export default {
,"setUploader": "업로드 관련"
,"setUploaderUrl": "업로드 주소:"
,"setBtSave": "저장"
,"setBtBack": "기본으로 복원"
,"setBtBack": "기본으로 복원",
"redraw": "부분 재그림",
"fail1": "고객님은 너무 급해하지 마세요. 로딩 중입니다.",
"success1": "이미지가 성공적으로 새로고쳐졌습니다!",
"high_variation": "강한 변화",
"low_variation": "약한 변화",
"p15": "확대 1.5배",
"p20": "확대 2배",
"p100": "표준",
"retry": "분석 다시 시도",
"pan_left": "왼쪽으로 다시 분석",
"pan_right": "오른쪽으로 다시 분석",
"pan_up": "위로 다시 분석",
"pan_down": "아래로 다시 분석",
"up2": "고화질 2배",
"up4": "고화질 4배"
},
"mjset": {
"server": "서버"
Expand Down
21 changes: 20 additions & 1 deletion src/locales/ru-RU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,26 @@ export default {
"setUploader": "Связанный с загрузкой",
"setUploaderUrl": "Адрес загрузки:",
"setBtSave": "Сохранить",
"setBtBack": "Восстановить по умолчанию"
"setBtBack": "Восстановить по умолчанию",


"redraw": "Частичная Перерисовка",
"fail1": "Пожалуйста, будьте терпеливы, идет загрузка.",
"success1": "Изображение успешно обновлено!",
"high_variation": "Сильные Изменения",
"low_variation": "Слабые Изменения",
"p15": "Увеличение 1.5x",
"p20": "Увеличение 2x",
"p100": "Обычное",
"retry": "Повторный Анализ",
"pan_left": "Переанализировать влево",
"pan_right": "Переанализировать вправо",
"pan_up": "Переанализировать вверх",
"pan_down": "Переанализировать вниз",
"up2": "Высокое Разрешение 2x",
"up4": "Высокое Разрешение 4x"


},
"mjset": {
"server": "Сервер",
Expand Down
18 changes: 17 additions & 1 deletion src/locales/vi-VN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,23 @@ export default {
"setUploader": "Tải lên liên quan",
"setUploaderUrl": "Địa chỉ tải lên:",
"setBtSave": "Lưu",
"setBtBack": "Khôi phục mặc định"
"setBtBack": "Khôi phục mặc định",

"redraw": "Vẽ Lại Phần",
"fail1": "Anh/chị đừng vội, đang tải đó.",
"success1": "Ảnh đã làm mới thành công!",
"high_variation": "Biến Động Mạnh",
"low_variation": "Biến Động Nhẹ",
"p15": "Thu Phóng 1.5 lần",
"p20": "Thu Phóng 2 lần",
"p100": "Bình thường",
"retry": "Thử Lại Phân Tích",
"pan_left": "Phân Tích Lại Bên Trái",
"pan_right": "Phân Tích Lại Bên Phải",
"pan_up": "Phân Tích Lại Lên",
"pan_down": "Phân Tích Lại Xuống",
"up2": "Độ Phân Giải Cao 2 lần",
"up4": "Độ Phân Giải Cao 4 lần"
},
"mjset": {
"server": "Máy chủ",
Expand Down
44 changes: 31 additions & 13 deletions src/locales/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,7 @@ export default {
downloadError: '请检查网络状态与 JSON 文件有效性',
},

mj:{
setOpen:'OpenAI 相关',
setOpenPlaceholder:'必须包含 http(s)://'
,setOpenUrl:'OpenAI接口地址'
,setOpenKeyPlaceholder:'使用自定义 OpenAI Key 绕过密码访问限制'
,setMj:'Midjourney 相关'
,setMjUrl:'Midjourney接口地址:'
,setMjKeyPlaceholder:'使用自定义 Api Secret 绕过密码访问限制'
,setUploader:'上传相关'
,setUploaderUrl:'上传地址:'
,setBtSave:'保存'
,setBtBack:'恢复默认'
},

mjset:{
server:'服务端'
,about:'关于'
Expand Down Expand Up @@ -195,5 +183,35 @@ export default {
,add2more:'请添加两张以上图片'
,no1m:'图片大小不能超过1M'
,imgExt:'图片仅支持jpg,gif,png,jpeg格式'
},
mj:{
setOpen:'OpenAI 相关',
setOpenPlaceholder:'必须包含 http(s)://'
,setOpenUrl:'OpenAI接口地址'
,setOpenKeyPlaceholder:'使用自定义 OpenAI Key 绕过密码访问限制'
,setMj:'Midjourney 相关'
,setMjUrl:'Midjourney接口地址:'
,setMjKeyPlaceholder:'使用自定义 Api Secret 绕过密码访问限制'
,setUploader:'上传相关'
,setUploaderUrl:'上传地址:'
,setBtSave:'保存'
,setBtBack:'恢复默认'

,
redraw:'局部重绘'
,fail1:'客官不要太急嘛,正在加载呢'
,success1:'图片刷新成功!'
,high_variation:'强变化'
,low_variation:'弱变化'
,p15:'变焦1.5倍'
,p20:'变焦2倍'
,p100:'方正'
,retry:'重分析'
,pan_left:'重分向左析'
,pan_right:'向右'
,pan_up:'向上'
,pan_down:'向下'
,up2:'高清2倍'
,up4:'高清4倍'
}
}
19 changes: 18 additions & 1 deletion src/locales/zh-TW.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,24 @@ export default {
"setUploader": "上傳相關",
"setUploaderUrl": "上傳地址:",
"setBtSave": "保存",
"setBtBack": "恢復默認"
"setBtBack": "恢復默認",
"redraw": "局部重繪",
"fail1": "客官不要太急嘛,正在加載呢",
"success1": "圖片刷新成功!",
"high_variation": "強變化",
"low_variation": "弱變化",
"p15": "變焦1.5倍",
"p20": "變焦2倍",
"p100": "方正",
"retry": "重分析",
"pan_left": "重分向左析",
"pan_right": "向右",
"pan_up": "向上",
"pan_down": "向下",
"up2": "高清2倍",
"up4": "高清4倍"


},
"mjset": {
"server": "服務端",
Expand Down
35 changes: 18 additions & 17 deletions src/views/mj/mjText.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {flechTask ,localGet,mlog, url2base64 } from '@/api'
import { homeStore } from '@/store'
import aiCanvas from './aiCanvas.vue'
import MarkdownIt from 'markdown-it'
import {t} from "@/locales"
interface Props {
chat:Chat.Chat
Expand Down Expand Up @@ -71,7 +72,7 @@ const maskOk=(d:any)=>{
if(chat.value.opt?.buttons ==undefined ) return;
mlog('maskOk',d );
let i = getIndex( chat.value.opt?.buttons, {k:':Inpaint::1',n:'局部重绘'} );
let i = getIndex( chat.value.opt?.buttons, {k:':Inpaint::1',n: t('mj.redraw') } );
let obj={
action:'mask',
version:1,
Expand All @@ -96,18 +97,18 @@ const bt= [
,{k:':upsample::2',n:'U2'}
,{k:':upsample::3',n:'U3'}
,{k:':upsample::4',n:'U4'}
,{k:'high_variation',n:'强变化'},
{k:'low_variation',n:'弱变化'},
{k:':Inpaint::1',n:'局部重绘'},
{k:'Outpaint::50',n:'变焦1.5倍'},
{k:'Outpaint::75',n:'变焦2倍'},
{k:'Outpaint::100',n:'方正'}
,{k:'high_variation',n: t('mj.high_variation')},
{k:'low_variation',n:t('mj.low_variation')},
{k:':Inpaint::1',n:t('mj.redraw')},
{k:'Outpaint::50',n: t('mj.p15')},
{k:'Outpaint::75',n: t('mj.p20')},
{k:'Outpaint::100',n: t('mj.p100')}
,{k:'Job::PicReader::1',n:'T1'}
,{k:'Job::PicReader::2',n:'T2'}
,{k:'Job::PicReader::3',n:'T3'}
,{k:'Job::PicReader::4',n:'T4'}
,{k:'Picread::Retry',n:'重分析'}
,{k:'Picread::Retry',n: t('mj.retry')}
,{k:'PromptAnalyzer::1',n:'T1'}
,{k:'PromptAnalyzer::2',n:'T2'}
Expand All @@ -123,13 +124,13 @@ const bt= [
,{k:':variation::2',n:'V2'}
,{k:':variation::3',n:'V3'}
,{k:':variation::4',n:'V4'}
,{k:'pan_left',n:'向左'}
,{k:'pan_right',n:'向右'}
,{k:'pan_up',n:'向上'}
,{k:'pan_down',n:'向下'}
,{k:'reroll::0',n:'重绘'}
,{k:'upsample_v5_2x',n:'高清2倍'}
,{k:'upsample_v5_4x',n:'高清4倍'}
,{k:'pan_left',n: t('mj.pan_left')}
,{k:'pan_right',n:t('mj.pan_right') }
,{k:'pan_up',n:t('mj.pan_up')}
,{k:'pan_down',n:t('mj.pan_down')}
,{k:'reroll::0',n: t('mjchat.reroll')}
,{k:'upsample_v5_2x',n:t('mj.up2')}
,{k:'upsample_v5_4x',n:t('mj.up4')}
]
]
Expand Down Expand Up @@ -167,12 +168,12 @@ watch(()=>homeStore.myData.act,(n)=>{
if(n=='mjReload' && actData.mjID== chat.value.mjID ){ //&& actData.mjID==chat.value.mjID
mlog('mjReload', actData.mjID, chat.value.mjID , chat.value.opt?.imageUrl);
if( !st.value.isLoadImg){
ms.success('客官不要太急嘛,正在加载呢');
ms.success( t('mj.fail1'));
return ;
}
st.value.isLoadImg=false;
load();
if( !actData.noShow ) ms.success('图片刷新成功!');
if( !actData.noShow ) ms.success( t('mj.success1'));
}
})
load();
Expand Down

0 comments on commit 9e1c6f8

Please sign in to comment.