Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix en not showing settings menu

Browse Source
This commit is contained in:
cutls 2019-10-11 22:04:28 +09:00
parent 2971144d7f
commit f74e2262dc
4 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/view/make/language/en/setting.json
View File

@ -152,11 +152,11 @@
"linkwarn": "TheDesk save your data on thedesk.top server.",
"connect": "Connect",
"disconnect": "Disconnect",
"templeteedit": "Edit a template",
"templeteeditwarn": "",
"templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"templete3": "",
"templateedit": "Edit a template",
"templateeditwarn": "",
"template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"template3": "",
"postartwork": "Attach an Artwork of Spotify",
"tts": "TTS(text to speech) Preferences",
"bouyomi": "BouyomiChan connect",

3
app/view/make/language/ja/update.json
View File

@ -3,6 +3,9 @@
"download":"開始",
"portable":"ポータブル版",
"installer":"インストーラー版(推奨)",
"linux":"zip版",
"linuxdeb":"deb版(対応の場合推奨)",
"linuxsnap":"snap版",
"snap":"snap版はSnapcraft等よりDLしてください。",
"sureupd":"アップデートは必ず行ってください",
"skipupd":"アップデートをスキップする",

7
app/view/make/make.js
View File

@ -1,5 +1,5 @@
const fs = require("fs")
let ver = "Usamin (18.11.1)"
let ver = "Usamin (18.11.2)"
const execSync = require('child_process').execSync;
let gitHash = execSync("git rev-parse HEAD").toString().trim()
fs.writeFileSync("../../git", gitHash)
@ -52,6 +52,11 @@ for (let i = 0; i < samples.length; i++) {
} else {
var str = englishRefer[tarKey]
}
if(pages[i]=="setting.vue.js"){
if(str){
str = str.replace(/"/g, '\\"')
}
}
var regExp = new RegExp("@@" + tarKey + "@@", "g")
source = source.replace(regExp, str)
}

24
app/view/make/update.sample.html
View File

@ -92,7 +92,11 @@
<button class="waves-effect btn windows hide" onclick="update('portable')"
style="margin-left:15px;">@@portable@@</button>
<button class="waves-effect btn linux hide" onclick="update('linux')"
style="margin-left:15px;">@@download@@</button>
style="margin-left:15px;">@@linux@@</button>
<button class="waves-effect btn linux hide" onclick="update('linuxdeb')"
style="margin-left:15px;">@@linuxdeb@@</button>
<button class="waves-effect btn linux hide" onclick="update('linuxsnap')"
style="margin-left:15px;">@@linuxsnap@@</button>
<button class="waves-effect btn mac hide" onclick="update('mac')"
style="margin-left:15px;">@@download@@</button>
<br>
@ -169,13 +173,17 @@
var file = "TheDesk-ia32.exe";
}
} else if (sel == "linux") {
if (bit == "x64") {
var url = json["linuxx64"];
var file = "TheDesk-linux-x64.zip";
} else if (bit == "ia32") {
var url = json["linuxia64"];
var file = "TheDesk-linux-ia32.zip";
}
var url = json["linuxx64"];
var file = "thedesk.zip";
} else if (sel == "linuxdeb") {
var url = json["linuxdeb"];
var url = json["mac"];
postMessage(["openUrl", url], "*")
return false;
} else if (sel == "linuxsnap") {
var url = json["linuxsnap"];
postMessage(["openUrl", url], "*")
return false;
} else if (sel == "mac") {
var url = json["mac"];
postMessage(["openUrl", url], "*")