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

Merge branch 'WIP-(before-CI)' of https://github.com/cutls/TheDesk into WIP-(before-CI)

Browse Source
This commit is contained in:
Cutls 2019-04-22 01:51:42 +09:00
commit 4fb37525d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/js/lang/lang.en.js
View File

@ -189,7 +189,7 @@ var lang={
"lang_parse_clientmute":"muted", "lang_parse_clientmute":"muted",
"lang_parse_mute":" will be muted. You can remove on preferences.", "lang_parse_mute":" will be muted. You can remove on preferences.",
"lang_parse_voted":"Voted", "lang_parse_voted":"Voted",
"lang_parse_vote":"Voted", "lang_parse_vote":"Vote",
"lang_parse_unvoted":"Show the result without voting", "lang_parse_unvoted":"Show the result without voting",
"lang_parse_endedvote":"Expired", "lang_parse_endedvote":"Expired",
"lang_parse_thread":"Show thread", "lang_parse_thread":"Show thread",

6
app/js/tl/parse.js
View File

@ -489,7 +489,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
var myvote=lang.lang_parse_voted; var myvote=lang.lang_parse_voted;
var result_hide=""; var result_hide="";
}else{ }else{
myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>'; var myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>';
if(choices[0].votes_count===0 || choices[0].votes_count>0){ if(choices[0].votes_count===0 || choices[0].votes_count>0){
myvote=myvote+'<a onclick="showResult(\''+acct_id+'\',\''+toot.poll.id+'\')" class="pointer">'+lang.lang_parse_unvoted+"</a>"; myvote=myvote+'<a onclick="showResult(\''+acct_id+'\',\''+toot.poll.id+'\')" class="pointer">'+lang.lang_parse_unvoted+"</a>";
} }
@ -798,8 +798,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
'</div></div>' + '</div></div>' +
'<div class="area-toot">'+tickerdom+'<span class="' + '<div class="area-toot">'+tickerdom+'<span class="' +
api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show + api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show +
'</span><span class="toot ' + spoiler + '">' + content +poll+ '</span><span class="toot ' + spoiler + '">' + content +
'</span>' + '</span>' + poll +
'' + viewer + '' + '' + viewer + '' +
'</div><div class="area-additional"><span class="additional">' + analyze + '</div><div class="area-additional"><span class="additional">' + analyze +
'</span>' + '</span>' +