okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix lyrics translation & allow other lang

Browse source
This commit is contained in:
maikirakiwi 2022-07-08 18:05:31 -07:00
parent 11d2493083
commit 2008fab842
2 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/renderer/main/vueapp.js
View file

@ -3079,12 +3079,13 @@ const app = new Vue({
let status1 = jsonResponse["message"]["header"]["status_code"];
if (status1 == 200) {
let id = '';
let id, songLang = '';
try {
if (jsonResponse["message"]["body"]["macro_calls"]["matcher.track.get"]["message"]["header"]["status_code"] == 200 && jsonResponse["message"]["body"]["macro_calls"]["track.subtitles.get"]["message"]["header"]["status_code"] == 200) {
id = jsonResponse["message"]["body"]["macro_calls"]["matcher.track.get"]["message"]["body"]["track"]["track_id"] ?? '';
lrcfile = jsonResponse["message"]["body"]["macro_calls"]["track.subtitles.get"]["message"]["body"]["subtitle_list"][0]["subtitle"]["subtitle_body"];
vanity_id = jsonResponse["message"]["body"]["macro_calls"]["matcher.track.get"]["message"]["body"]["track"]["commontrack_vanity_id"];
songLang = jsonResponse["message"]["body"]["macro_calls"]["track.lyrics.get"]["message"]["body"]["lyrics"]["lyrics_language_description"];
try {
let lrcrich = jsonResponse["message"]["body"]["macro_calls"]["track.richsync.get"]["message"]["body"]["richsync"]["richsync_body"];
@ -3142,7 +3143,9 @@ const app = new Vue({
}
// Load translation
getMXMTrans(lang, vanity_id);
if (songLang.toLowerCase() !== lang){
getMXMTrans(lang, vanity_id);
}
}
} catch (e) {
@ -3169,7 +3172,6 @@ const app = new Vue({
function getMXMTrans(lang, vanity_id) {
try {
if (lang != "disabled" && vanity_id != '') { // Mode 2 -> Trans
lang = "english"
fetch('https://www.musixmatch.com/lyrics/' + vanity_id +'/translation/' + lang, {
method: 'GET',
headers: {

120
src/renderer/views/pages/settings.ejs
View file

@ -644,67 +644,65 @@
<label>
<select class="md-select" v-model="app.cfg.lyrics.mxm_language">
<option value='disabled'>Disabled</option>
<option value='af'>Afrikaans</option>
<option value='sq'>Albanian</option>
<option value='ar'>Arabic</option>
<option value='hy'>Armenian</option>
<option value='az'>Azerbaijani</option>
<option value='bn'>Bengali</option>
<option value='bs'>Bosnian</option>
<option value='bg'>Bulgarian</option>
<option value='zh'>Chinese (simplified)</option>
<option value='z1'>Chinese (traditional)</option>
<option value='hr'>Croatian</option>
<option value='cs'>Czech</option>
<option value='da'>Danish</option>
<option value='et'>Estonian</option>
<option value='ee'>English</option>
<option value='fo'>Farsi</option>
<option value='f1'>Filipino</option>
<option value='fr'>French</option>
<option value='ka'>Georgian</option>
<option value='de'>German</option>
<option value='n2'>German, low</option>
<option value='el'>Greek</option>
<option value='gu'>Gujarati</option>
<option value='ht'>Haitian creole</option>
<option value='he'>Hebrew</option>
<option value='hi'>Hindi</option>
<option value='hu'>Hungarian</option>
<option value='is'>Icelandic</option>
<option value='it'>Italian</option>
<option value='ja'>Japanese</option>
<option value='rj'>Japanese-romaji</option>
<option value='kn'>Kannada</option>
<option value='kk'>Kazakh</option>
<option value='rk'>Korean-romaji</option>
<option value='lo'>Lao</option>
<option value='lv'>Latvian</option>
<option value='lt'>Lithuanian</option>
<option value='mk'>Macedonian</option>
<option value='ms'>Malay</option>
<option value='ml'>Malayalam</option>
<option value='mn'>Mongolian</option>
<option value='ne'>Nepali</option>
<option value='no'>Norwegian</option>
<option value='pa'>Panjabi</option>
<option value='pl'>Polish</option>
<option value='pt'>Portuguese</option>
<option value='ro'>Romanian</option>
<option value='ru'>Russian</option>
<option value='sr'>Serbian</option>
<option value='sk'>Slovak</option>
<option value='sl'>Slovenian</option>
<option value='es'>Spanish</option>
<option value='su'>Suomi</option>
<option value='sv'>Swedish</option>
<option value='ta'>Tamil</option>
<option value='te'>Telugu</option>
<option value='tr'>Turkish</option>
<option value='uk'>Ukrainian</option>
<option value='ur'>Urdu</option>
<option value='uz'>Uzbek</option>
<option value='vi'>Vietnamese</option>
<option value='afrikaans'>Afrikaans</option>
<option value='albanian'>Albanian</option>
<option value='arab'>Arabic</option>
<option value='armenian'>Armenian</option>
<option value='azerbaijani'>Azerbaijani</option>
<option value='bengali'>Bengali</option>
<option value='bosnian'>Bosnian</option>
<option value='bulgarian'>Bulgarian</option>
<option value='simplified chinese'>Chinese (Simplified)</option>
<option value='traditional chinese'>Chinese (Traditional)</option>
<option value='croatian'>Croatian</option>
<option value='czech'>Czech</option>
<option value='danish'>Danish</option>
<option value='estonian'>Estonian</option>
<option value='english'>English</option>
<option value='farsi'>Farsi</option>
<option value='filipino'>Filipino</option>
<option value='french'>French</option>
<option value='georgian'>Georgian</option>
<option value='german'>German</option>
<option value='greek'>Greek</option>
<option value='gujarati'>Gujarati</option>
<option value='haitian-creole'>Haitian-Creole</option>
<option value='hebrew'>Hebrew</option>
<option value='hindi'>Hindi</option>
<option value='hungarian'>Hungarian</option>
<option value='icelandic'>Icelandic</option>
<option value='italian'>Italian</option>
<option value='japanese'>Japanese</option>
<option value='kannada'>Kannada</option>
<option value='kazakh'>Kazakh</option>
<option value='romanized korean'>Romanized Korean</option>
<option value='lao'>Lao</option>
<option value='latvian'>Latvian</option>
<option value='lithuanian'>Lithuanian</option>
<option value='macedonian'>Macedonian</option>
<option value='malay'>Malay</option>
<option value='malayalam'>Malayalam</option>
<option value='mongolian'>Mongolian</option>
<option value='nepali'>Nepali</option>
<option value='norwegian'>Norwegian</option>
<option value='panjabi'>Panjabi</option>
<option value='polish'>Polish</option>
<option value='portuguese'>Portuguese</option>
<option value='romanian'>Romanian</option>
<option value='russian'>Russian</option>
<option value='serbian'>Serbian</option>
<option value='slovak'>Slovak</option>
<option value='slovenian'>Slovenian</option>
<option value='spanish'>Spanish</option>
<option value='suomi'>Suomi</option>
<option value='swedish'>Swedish</option>
<option value='tamil'>Tamil</option>
<option value='telugu'>Telugu</option>
<option value='turkish'>Turkish</option>
<option value='ukrainian'>Ukrainian</option>
<option value='urdu'>Urdu</option>
<option value='uzbek'>Uzbek</option>
<option value='vietnamese'>Vietnamese</option>
</select>
</label>
</div>