Physton/sd-webui-prompt-all-in-one
1
0
Fork 0
mirror of https://github.com/Physton/sd-webui-prompt-all-in-one.git synced 2026-05-01 03:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: #226 不應該將 slugify 的內容當作翻譯內容

Browse Source 
https://github.com/Physton/sd-webui-prompt-all-in-one/issues/226
This commit is contained in:
bluelovers
2023-09-09 13:39:56 +08:00
parent d03082b696
commit cd80cc79d8
2 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/src/components/phystonPrompt.vue
View File

@@ -1202,10 +1202,10 @@ export default {
if (tag.toLocal) {
tag.localValue = translateText
} else {
tag.localValue = tag.value
tag.localValue = this._slugifyToLocal(tag.value, translateText)
tag.value = translateText
}
this._setTagById(tag.id, tag.value, tag.localValue)
return this._setTagById(tag.id, tag.value, tag.localValue)
}
let getTranslateText = (tag) => {
@@ -1425,7 +1425,7 @@ export default {
needs.push(tag)
} else {
if (tag.splits) {
result = tag.splits.left + result.value + tag.splits.right
result.value = tag.splits.left + result.value + tag.splits.right
}
setLoading(tag, false)
setTag(tag, result.value)

45
src/src/mixins/languageMixin.js
View File

@@ -71,13 +71,17 @@ export default {
replaceGlobals(text) {
return common.replaceGlobals(text, this.languageCode)
},
getTagCompleteFileCache(tagCompleteFile = null) {
return window.tagCompleteFileCache[tagCompleteFile || this.tagCompleteFile]
},
getCSV(tagCompleteFile = null, reload = false) {
window.tagCompleteFileCache = window.tagCompleteFileCache || {}
window.tagCompleteFileLoading = window.tagCompleteFileLoading || {}
window.tagCompleteFileCache ||= {}
window.tagCompleteFileLoading ||= {}
return new Promise((resolve, reject) => {
tagCompleteFile = tagCompleteFile || this.tagCompleteFile
if (!reload && window.tagCompleteFileCache[tagCompleteFile]) {
resolve(window.tagCompleteFileCache[tagCompleteFile])
tagCompleteFile ||= this.tagCompleteFile
let res = this.getTagCompleteFileCache(tagCompleteFile)
if (!reload && res) {
resolve(res)
return
}
@@ -86,7 +90,7 @@ export default {
const timer = setInterval(() => {
if (!window.tagCompleteFileLoading[tagCompleteFile]) {
clearInterval(timer)
resolve(window.tagCompleteFileCache[tagCompleteFile])
resolve(this.getTagCompleteFileCache(tagCompleteFile))
}
}, 100)
return
@@ -189,6 +193,9 @@ export default {
})
})
},
/**
* @returns {string}
*/
_translateToLocalBy(text, toLocal, useNetwork = false) {
text = text.trim().toLowerCase()
let _localToString = value => (value.join?.(' / ') ?? value)
@@ -234,5 +241,31 @@ export default {
}
return ''
},
/**
* @returns {string}
*/
_slugifyToLocal(text, en, tagCompleteFile = null) {
const res = this.getTagCompleteFileCache(tagCompleteFile)
if (res) {
en ??= this._toEn(text, res.toEn)
let value
if (en.length) {
value = this._translateToLocalBy(en, res.toLocal)
console.log('slugifyToLocal', { text, en, value })
return this._iifText(value, text)
}
console.log('slugifyToLocal', { text, en })
}
return text
},
/**
* @param newValue string
* @param oldValue string
* @returns {string}
* @private
*/
_iifText(newValue, oldValue) {
return newValue?.length ? newValue : oldValue
}
}
}