'+his[0].uses+'toots #' + tag.name + ' '+his[0].accounts+lang_src_people[lang];
+ '\',\'add\')" class="pointer">#' + tag.name + ' '+his[0].accounts+lang.lang_src_people;
}
return tags;
diff --git a/app/js/tl/tag.js b/app/js/tl/tag.js
index 9d54ac17..8670c77b 100644
--- a/app/js/tl/tag.js
+++ b/app/js/tl/tag.js
@@ -56,8 +56,8 @@ function favTag(){
var tags="";
Object.keys(obj).forEach(function(key) {
var tag = obj[key];
- tags = tags + '#' + tag + 'TLToot '+
- ''+lang_tags_realtime[lang]+''+lang_del[lang]+' ';
+ tags = tags + '#' + tag + 'TLToot '+
+ ''+lang.lang_tags_realtime+''+lang.lang_del+' ';
});
if(obj.length>0){
$("#taglist").append("My Tags:" + tags);
@@ -107,5 +107,5 @@ function tagTL(a,b,c,d){
}
function autoToot(tag){
localStorage.setItem("stable",tag);
- Materialize.toast(lang_tags_tagwarn[lang].replace("{{tag}}" ,tag).replace("{{tag}}" ,tag),3000);
+ Materialize.toast(lang.lang_tags_tagwarn +replace("{{tag}}" ,tag).replace("{{tag}}" ,tag),3000);
}
\ No newline at end of file
diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js
index 429029cb..6e2d2b6c 100644
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -47,7 +47,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
return;
}else if (type == "notf") {
//通知なら飛ばす
- //notf(acct_id, tlid, 'direct');
+ notf(acct_id, tlid, 'direct');
$("#notice_" + tlid).text(cap(type, data, acct_id) + "(" + localStorage.getItem(
"user_" + acct_id) + "@" + domain + ")");
$("#notice_icon_" + tlid).text("notifications");
@@ -508,7 +508,7 @@ function cap(type, data, acct_id) {
}
} else if (type == "local-media") {
if(localStorage.getItem("local_" + acct_id) && !locale){
- var response=localStorage.getItem("local_" + acct_id)+"("+lang_tl_media[lang]+")";
+ var response=localStorage.getItem("local_" + acct_id)+"("+lang.lang_tl_media +")";
}else{
var response="Local TL(Media)";
}
@@ -520,7 +520,7 @@ function cap(type, data, acct_id) {
}
} else if (type == "pub-media") {
if(localStorage.getItem("public_" + acct_id) && !locale){
- var response=localStorage.getItem("public_" + acct_id)+"("+lang_tl_media[lang]+")";
+ var response=localStorage.getItem("public_" + acct_id)+"("+lang.lang_tl_media +")";
}else{
var response="Federated TL(Media)";
}
@@ -670,7 +670,7 @@ function reconnector(tlid,type,acct_id,data,mode){
}
reload(type, '', acct_id, tlid, data, mute, "",voice,mode);
}
- Materialize.toast(lang_tl_reconnect[lang], 2000);
+ Materialize.toast(lang.lang_tl_reconnect, 2000);
}
strAliveInt()
\ No newline at end of file
diff --git a/app/js/ui/img.js b/app/js/ui/img.js
index 84062f74..d32c0b36 100644
--- a/app/js/ui/img.js
+++ b/app/js/ui/img.js
@@ -134,6 +134,7 @@ function imgCont(type) {
if (type == "image") {
xhr = new XMLHttpRequest;
xhr.open('GET', murl, true);
+ xhr.responseType = "arraybuffer";
xhr.addEventListener('progress', function (event) {
if (event.lengthComputable) {
var total=event.total;
diff --git a/app/js/ui/settings.js b/app/js/ui/settings.js
index 4fad3b5a..152dd06c 100644
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -4,14 +4,14 @@ function settings() {
var dd = $("[name=time]:checked").val();
var dt = $("[for="+dd+"]").text();
if (dd != localStorage.getItem("datetype")) {
- Materialize.toast(lang_setting_time[lang].replace("{{set}}" ,dt), 3000);
+ Materialize.toast(lang.lang_setting_time.replace("{{set}}" ,dt), 3000);
}
localStorage.setItem("datetype", dd);
var cd = $("[name=theme]:checked").val();
var ct = $("[for="+cd+"]").html();
if (cd != localStorage.getItem("theme")) {
- Materialize.toast(lang_setting_theme[lang].replace("{{set}}" ,ct), 3000);
+ Materialize.toast(lang.lang_setting_theme.replace("{{set}}" ,ct), 3000);
}
//テーマはこの場で設定
themes(cd);
@@ -20,63 +20,63 @@ function settings() {
var nd = $("[name=nsfw]:checked").val();
var nt = $("[for=n_"+nd+"]").text();
if (nd != localStorage.getItem("nsfw")) {
- Materialize.toast(lang_setting_nsfw[lang].replace("{{set}}" ,nt), 3000);
+ Materialize.toast(lang.lang_setting_nsfw.replace("{{set}}" ,nt), 3000);
}
localStorage.setItem("nsfw", nd);
var cwd = $("[name=cw]:checked").val();
var cwt = $("[for=c_"+cwd+"]").text();
if (cwd != localStorage.getItem("cw")) {
- Materialize.toast(lang_setting_cw[lang].replace("{{set}}" ,cwt), 3000);
+ Materialize.toast(lang.lang_setting_cw.replace("{{set}}" ,cwt), 3000);
}
localStorage.setItem("cw", cwd);
var cwtd = $("#cw-text").val();
if (cwtd != localStorage.getItem("cw-text")) {
- Materialize.toast(lang_setting_cwtext[lang].replace("{{set}}" ,cwtd), 3000);
+ Materialize.toast(lang.lang_setting_cwtext.replace("{{set}}" ,cwtd), 3000);
}
localStorage.setItem("cw-text", cwtd);
var cwsd = $("[name=cws]:checked").val();
var cwst = $("[for=cws_"+cwsd+"]").text();
if (cwsd != localStorage.getItem("always-cw")) {
- Materialize.toast(lang_setting_cws[lang].replace("{{set}}" ,cwst), 3000);
+ Materialize.toast(lang.lang_setting_cws.replace("{{set}}" ,cwst), 3000);
}
localStorage.setItem("always-cw", cwsd);
var rpd = $("[name=rp]:checked").val();
var rpt = $("[for=c_"+cwd+"]").text();
if (rpd != localStorage.getItem("replyct")) {
- Materialize.toast(lang_setting_rp[lang].replace("{{set}}" ,rpt), 3000);
+ Materialize.toast(lang.lang_setting_rp.replace("{{set}}" ,rpt), 3000);
}
localStorage.setItem("replyct", rpd);
var visd = $("[name=vis]:checked").val();
var vist = $("[for="+visd+"]").text();
if (visd != localStorage.getItem("vis")) {
- Materialize.toast(lang_setting_vis[lang].replace("{{set}}" ,vist), 3000);
+ Materialize.toast(lang.lang_setting_vis.replace("{{set}}" ,vist), 3000);
}
localStorage.setItem("vis", visd);
var popd = $("#popup").val();
if (popd > 0 && popd != localStorage.getItem("popup")) {
- Materialize.toast(lang_setting_popup[lang].replace("{{set}}" ,popd+lang_setting_s[lang]), 3000);
+ Materialize.toast(lang.lang_setting_popup.replace("{{set}}" ,popd+lang.lang_setting_s), 3000);
} else if (popd != localStorage.getItem("popup")) {
- Materialize.toast(lang_setting_popup[lang].replace("{{set}}" ,lang_setting_off[lang]), 3000);
+ Materialize.toast(lang.lang_setting_popup.replace("{{set}}" ,lang.lang_setting_off), 3000);
}
localStorage.setItem("popup", popd);
var gifd = $("[name=gif]:checked").val();
var gift = $("[for=g_"+gifd+"]").text();
if (gifd != localStorage.getItem("gif")) {
- Materialize.toast(lang_setting_gif[lang].replace("{{set}}" ,gift), 3000);
+ Materialize.toast(lang.lang_setting_gif.replace("{{set}}" ,gift), 3000);
}
localStorage.setItem("gif", gifd);
var sentd = $("#sentence").val();
var ltrd = $("#letters").val();
if (sentd != localStorage.getItem("sentence") || ltrd != localStorage.getItem("letters")) {
- Materialize.toast(lang_setting_selt[lang].replace("{{set1}}" ,sentd).replace("{{set2}}" ,ltrd), 3000);
+ Materialize.toast(lang.lang_setting_selt.replace("{{set1}}" ,sentd).replace("{{set2}}" ,ltrd), 3000);
}
localStorage.setItem("sentence", sentd);
localStorage.setItem("letters", ltrd);
@@ -84,35 +84,35 @@ function settings() {
var csentd = $("#cw_sentence").val();
var cltrd = $("#cw_letters").val();
if (csentd != localStorage.getItem("cw_sentence") || cltrd != localStorage.getItem("cw_letters")) {
- Materialize.toast(lang_setting_autocw[lang].replace("{{set1}}" ,csentd).replace("{{set2}}" ,cltrd), 3000);
+ Materialize.toast(lang.lang_setting_autocw.replace("{{set1}}" ,csentd).replace("{{set2}}" ,cltrd), 3000);
}
localStorage.setItem("cw_sentence", csentd);
localStorage.setItem("cw_letters", cltrd);
var widthd = $("#width").val();
if (widthd != localStorage.getItem("width")) {
- Materialize.toast(lang_setting_width[lang].replace("{{set}}" ,widthd), 3000);
+ Materialize.toast(lang.lang_setting_width.replace("{{set}}" ,widthd), 3000);
}
localStorage.setItem("width", widthd);
var imgd = $("[name=img]:checked").val();
var imgt = $("[for=i_"+imgd+"]").text();
if (imgd != localStorage.getItem("img")) {
- Materialize.toast(lang_setting_img[lang].replace("{{set}}" ,imgt), 3000);
+ Materialize.toast(lang.lang_setting_img.replace("{{set}}" ,imgt), 3000);
}
localStorage.setItem("img", imgd);
var fontd = $("#font").val();
if(fontd){
if (fontd != localStorage.getItem("font")) {
- Materialize.toast(lang_setting_font[lang].replace("{{set}}" ,fontd), 3000);
+ Materialize.toast(lang.lang_setting_font.replace("{{set}}" ,fontd), 3000);
}
localStorage.setItem("font", fontd);
themes();
}else{
if(localStorage.getItem("font")){
localStorage.removeItem("font");
- Materialize.toast(lang_setting_font[lang].replace("{{set}}" ,lang_setting_default[lang]), 3000);
+ Materialize.toast(lang.lang_setting_font.replace("{{set}}" ,lang.lang_setting_default), 3000);
themes();
}
}
@@ -120,90 +120,90 @@ function settings() {
var sized = $("#size").val();
if (sized != localStorage.getItem("size")) {
- Materialize.toast(lang_setting_size[lang].replace("{{set}}" ,sized), 3000);
+ Materialize.toast(lang.lang_setting_size.replace("{{set}}" ,sized), 3000);
}
localStorage.setItem("size", sized);
var heid = $("#img-height").val();
if (heid != localStorage.getItem("img-height")) {
- Materialize.toast(lang_setting_imgheight[lang].replace("{{set}}" ,heid), 3000);
+ Materialize.toast(lang.lang_setting_imgheight.replace("{{set}}" ,heid), 3000);
}
localStorage.setItem("img-height", heid);
var tckrd = $("[name=ticker]:checked").val();
var tckrt = $("[for=ticker_"+tckrd+"]").text();
if (tckrd != localStorage.getItem("ticker_ok")) {
- Materialize.toast(lang_setting_ticker[lang].replace("{{set}}" ,tckrt), 3000);
+ Materialize.toast(lang.lang_setting_ticker.replace("{{set}}" ,tckrt), 3000);
}
localStorage.setItem("ticker_ok", tckrd);
var boxd = $("[name=box]:checked").val();
var boxt = $("[for=bx_"+boxd+"]").text();
if (boxd != localStorage.getItem("box")) {
- Materialize.toast(lang_setting_box[lang].replace("{{set}}" ,boxt), 3000);
+ Materialize.toast(lang.lang_setting_boxConfirm.replace("{{set}}" ,boxt), 3000);
}
localStorage.setItem("box", boxd);
var tagd = $("[name=tag]:checked").val();
var tagt = $("[for=t_"+tagd+"]").text();
if (tagd != localStorage.getItem("tag-range")) {
- Materialize.toast(lang_setting_tag[lang].replace("{{set}}" ,tagt), 3000);
+ Materialize.toast(lang.lang_setting_tag.replace("{{set}}" ,tagt), 3000);
}
localStorage.setItem("tag-range", tagd);
var uld = $("[name=ul]:checked").val();
var ult = $("[for=ul_"+uld+"]").text();
if (uld != localStorage.getItem("locale")) {
- Materialize.toast(lang_setting_ul[lang].replace("{{set}}" ,ult), 3000);
+ Materialize.toast(lang.lang_setting_ul.replace("{{set}}" ,ult), 3000);
}
localStorage.setItem("locale", uld);
var ntd = $("[name=notf]:checked").val();
var ntt = $("[for=ntf_"+ntd+"]").text();
if (ntd != localStorage.getItem("nativenotf")) {
- Materialize.toast(lang_setting_notf[lang].replace("{{set}}" ,ntt), 3000);
+ Materialize.toast(lang.lang_setting_notf.replace("{{set}}" ,ntt), 3000);
}
localStorage.setItem("nativenotf", ntd);
var qtd = $("[name=quote]:checked").val();
var qtt = $("[for=q_"+qtd+"]").text();
if (qtd != localStorage.getItem("quote")) {
- Materialize.toast(lang_setting_quote[lang].replace("{{set}}" ,qtt), 3000);
+ Materialize.toast(lang.lang_setting_quote.replace("{{set}}" ,qtt), 3000);
}
localStorage.setItem("quote", qtd);
var viad = $("[name=via]:checked").val();
var viat = $("[for=via_"+viad+"]").text();
if (viad != localStorage.getItem("viashow")) {
- Materialize.toast(lang_setting_via[lang].replace("{{set}}" ,viat), 3000);
+ Materialize.toast(lang.lang_setting_via.replace("{{set}}" ,viat), 3000);
}
localStorage.setItem("viashow", viad);
var notfmd = $("[name=notfm]:checked").val();
var notfmt = $("[for=notfm_"+notfmd+"]").text();
if (notfmd != localStorage.getItem("setasread")) {
- Materialize.toast(lang_setting_setasread[lang].replace("{{set}}" ,notfmt), 3000);
+ Materialize.toast(lang.lang_setting_setasread.replace("{{set}}" ,notfmt), 3000);
}
localStorage.setItem("setasread", notfmd);
var movd = $("[name=mov]:checked").val();
var movt = $("[for=mov_"+movd+"]").text();
if (movd != localStorage.getItem("mouseover")) {
- Materialize.toast(lang_setting_mov[lang].replace("{{set}}" ,movt), 3000);
+ Materialize.toast(lang.lang_setting_mov.replace("{{set}}" ,movt), 3000);
}
localStorage.setItem("mouseover", movd);
var maind = $("[name=main]:checked").val();
var maint = $("[for=mn_"+maind+"]").text();
if (maind != localStorage.getItem("mainuse")) {
- Materialize.toast(lang_setting_main[lang].replace("{{set}}" ,maint), 3000);
+ Materialize.toast(lang.lang_setting_main.replace("{{set}}" ,maint), 3000);
}
localStorage.setItem("mainuse", maind);
var secd = $("[name=sec]:checked").val();
var sect = $("[for=sec-"+secd+"]").text();
if (secd != localStorage.getItem("sec")) {
- Materialize.toast(lang_setting_sec[lang].replace("{{set}}" ,sect), 3000);
+ Materialize.toast(lang.lang_setting_sec.replace("{{set}}" ,sect), 3000);
}
localStorage.setItem("sec", secd);
}
@@ -424,10 +424,10 @@ function climute(){
var cli = localStorage.getItem("client_mute");
var obj = JSON.parse(cli);
if(!obj){
- $("#mute-cli").html(lang_setting_nomuting[lang]);
+ $("#mute-cli").html(lang.lang_setting_nomuting);
}else{
if(!obj[0]){
- $("#mute-cli").html(lang_setting_nomuting[lang]);
+ $("#mute-cli").html(lang.lang_setting_nomuting);
return;
}
var templete;
@@ -437,7 +437,7 @@ function climute(){
templete = '
' + list +
'.' +
cli + '
';
+ key + ')">'+lang.lang_del+' ';
$("#mute-cli").append(templete);
});
}
@@ -481,20 +481,20 @@ function notftest(){
var ipc = electron.ipcRenderer;
var os = electron.remote.process.platform;
var options = {
- body: lang_setting_notftest[lang]+'('+lang_setting_notftestprof[lang]+')',
+ body: lang.lang_setting_notftest+'('+lang.lang_setting_notftestprof+')',
icon: localStorage.getItem("prof_0")
};
if(os=="darwin"){
- var n = new Notification('TheDesk'+lang_setting_notftest[lang], options);
+ var n = new Notification('TheDesk'+lang.lang_setting_notftest, options);
}else{
- ipc.send('native-notf', ['TheDesk'+lang_setting_notftest[lang],lang_setting_notftest[lang]+'('+lang_setting_notftestprof[lang]+')',localStorage.getItem('prof_0'),"",""]);
+ ipc.send('native-notf', ['TheDesk'+lang.lang_setting_notftest,lang.lang_setting_notftest+'('+lang.lang_setting_notftestprof+')',localStorage.getItem('prof_0'),"",""]);
}
}
function oks(no){
var txt=$("#oks-"+no).val();
localStorage.setItem("oks-"+no, txt);
- Materialize.toast(lang_setting_ksref[lang], 3000);
+ Materialize.toast(lang.lang_setting_ksref, 3000);
}
function oksload(){
if(localStorage.getItem("oks-1")){$("#oks-1").val(localStorage.getItem("oks-1"))}
@@ -510,7 +510,7 @@ function changelang(lang){
});
}
function exportSettings(){
- if(!confirm(lang_setting_exportwarn[lang])){
+ if(!confirm(lang.lang_setting_exportwarn)){
return false;
}
var electron = require("electron");
@@ -584,7 +584,7 @@ function exportSettings(){
});
}
function importSettings(){
- if(!confirm(lang_setting_importwarn[lang])){
+ if(!confirm(lang.lang_setting_importwarn)){
return false;
}
var electron = require("electron");
diff --git a/app/js/ui/spotify.js b/app/js/ui/spotify.js
index e7460eee..dd70b14f 100644
--- a/app/js/ui/spotify.js
+++ b/app/js/ui/spotify.js
@@ -57,10 +57,10 @@ function spotifyFlagSave(){
var awk = $("[name=awk]:checked").val();
if(awk=="yes"){
localStorage.setItem("artwork","yes");
- Materialize.toast(lang_spotify_img[lang], 3000);
+ Materialize.toast(lang.lang_spotify_img, 3000);
}else{
localStorage.removeItem("artwork");
- Materialize.toast(lang_spotify_imgno[lang], 3000);
+ Materialize.toast(lang.lang_spotify_imgno, 3000);
}
}
function nowplaying(mode){
@@ -118,7 +118,7 @@ function nowplaying(mode){
$("#textarea").val(content);
});
}else{
- alert(lang_spotify_acct[lang]);
+ alert(lang.lang_spotify_acct);
}
}else if(mode=="itunes"){
var electron = require("electron");
@@ -158,7 +158,7 @@ function nowplaying(mode){
function spotifySave(){
var temp=$("#np-temp").val();
localStorage.setItem("np-temp", temp);
- Materialize.toast(lang_spotify_np[lang], 3000);
+ Materialize.toast(lang.lang_spotify_np, 3000);
}
if(location.search){
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
diff --git a/app/js/ui/tips.js b/app/js/ui/tips.js
index f960e1ba..a1d735be 100644
--- a/app/js/ui/tips.js
+++ b/app/js/ui/tips.js
@@ -142,7 +142,7 @@ function spotifytips(){
spotint=setInterval(spotStart, 1000);
});
}else{
- alert(lang_spotify_acct[lang]);
+ alert(lang.lang_spotify_acct);
}
}
function spotStart(){
diff --git a/app/js/userdata/his-data.js b/app/js/userdata/his-data.js
index 356ff7ac..67ddfe04 100644
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@@ -53,7 +53,7 @@ function utl(user, more, acct_id) {
var templete = parse(json, '', acct_id, 'user');
}
if(!json[0]){
- templete=lang_details_nodata[lang]+" ";
+ templete=lang.lang_details_nodata+" ";
}
if (more) {
$("#his-tl-contents").append(templete);
@@ -155,7 +155,7 @@ function flw(user, more, acct_id) {
var templete = userparse(json,'',acct_id);
}
if(templete==""){
- templete=lang_details_nodata[lang]+" ";
+ templete=lang.lang_details_nodata+" ";
}
if (more) {
$("#his-follow-list-contents").append(templete);
@@ -221,7 +221,7 @@ function fer(user, more, acct_id) {
var templete = userparse(json,'',acct_id);
}
if(templete==""){
- templete=lang_details_nodata[lang]+" ";
+ templete=lang.lang_details_nodata+" ";
}
if (more) {
$("#his-follower-list-contents").append(templete);
@@ -283,7 +283,7 @@ function showFav(more, acct_id) {
var templete = misskeyParse(json, '', acct_id,'user');
}
if(!json[0]){
- templete=lang_details_nodata[lang]+" ";
+ templete=lang.lang_details_nodata+" ";
}
if (more) {
$("#his-fav-list-contents").append(templete);
@@ -339,7 +339,7 @@ function showMut(more, acct_id) {
console.error(error);
}).then(function(json) {
if(!json[0]){
- templete=lang_details_nodata[lang]+" ";
+ templete=lang.lang_details_nodata+" ";
}
var templete = userparse(json,'',acct_id);
if (more) {
@@ -358,7 +358,7 @@ function showBlo(more, acct_id) {
}
var domain = localStorage.getItem("domain_" + acct_id);
if(localStorage.getItem("mode_" + domain)=="misskey"){
- $("#his-blocking-list-contents").html(lang_hisdata_notonmisskey[lang]+" ");
+ $("#his-blocking-list-contents").html(lang.lang_hisdata_notonmisskey+" ");
return false;
}
var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -382,7 +382,7 @@ function showBlo(more, acct_id) {
console.error(error);
}).then(function(json) {
if(!json[0]){
- templete=lang_details_nodata[lang]+" ";
+ templete=lang.lang_details_nodata+" ";
}
var templete = userparse(json,'',acct_id);
if (more) {
@@ -445,7 +445,7 @@ function showReq(more, acct_id) {
}
if(!json[0]){
- templete=lang_details_nodata[lang]+" ";
+ templete=lang.lang_details_nodata+" ";
}
if (more) {
$("#his-request-list-contents").append(templete);
@@ -463,7 +463,7 @@ function showDom(more, acct_id) {
}
var domain = localStorage.getItem("domain_" + acct_id);
if(localStorage.getItem("mode_" + domain)=="misskey"){
- $("#his-domain-list-contents").html(lang_hisdata_notonmisskey[lang]+" ");
+ $("#his-domain-list-contents").html(lang.lang_hisdata_notonmisskey+" ");
return false;
}
var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -489,7 +489,7 @@ function showDom(more, acct_id) {
}).then(function(json) {
var templete = "";
if(!json[0]){
- templete=lang_details_nodata[lang]+" ";
+ templete=lang.lang_details_nodata+" ";
}
Object.keys(json).forEach(function(key) {
var domain = json[key];
@@ -514,7 +514,7 @@ function showFrl(more, acct_id) {
}
var domain = localStorage.getItem("domain_" + acct_id);
if(localStorage.getItem("mode_" + domain)=="misskey"){
- $("#his-follow-recom-contents").html(lang_hisdata_notonmisskey[lang]+" ");
+ $("#his-follow-recom-contents").html(lang.lang_hisdata_notonmisskey+" ");
return false;
}
var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -534,13 +534,13 @@ function showFrl(more, acct_id) {
}).then(function(response) {
return response.json();
}).catch(function(error) {
- $("#his-follow-recom-contents").html(lang_details_nodata[lang]+"("+lang_hisdata_frcreq[lang]+") ");
+ $("#his-follow-recom-contents").html(lang.lang_details_nodata+"("+lang.lang_hisdata_frcreq+") ");
console.error(error);
}).then(function(json) {
console.log(json);
if(!json[0]){
console.log("No data");
- templete=lang_details_nodata[lang]+"("+lang_hisdata_frcwarn[lang]+") ";
+ templete=lang.lang_details_nodata+"("+lang.lang_hisdata_frcwarn+") ";
}else{
var templete = userparse(json,'',acct_id);
}
@@ -557,7 +557,7 @@ function showFrl(more, acct_id) {
//ユーザーマッチングリスト
function showMat() {
- $("#his-matching-list-contents").html(lang_hisdata_taketime[lang]);
+ $("#his-matching-list-contents").html(lang.lang_hisdata_taketime);
var full=$("#his-acct").attr("fullname");
var acct_id=$("#his-data").attr("use-acct");
full=full.split("@");
diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js
index d4044a47..e073b679 100644
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -86,8 +86,8 @@ function udg(user, acct_id) {
//moved設定時
if (json.moved) {
Materialize.toast(
- lang_showontl_movetxt[lang]+'', 4000)
+ lang.lang_showontl_movetxt+'', 4000)
}
$('#his-data').modal('open');
$('#his-data').attr("user-id", user);
@@ -151,7 +151,7 @@ function udg(user, acct_id) {
$("#his-des").html(twemoji.parse(note));
}
if(json.bot){
- $("#his-bot").html(lang_showontl_botacct[lang]);
+ $("#his-bot").html(lang.lang_showontl_botacct);
}
$('#his-data').css('background-size', 'cover');
$("#his-data .tab-content").css("height",$("#his-float-timeline").height()-70+"px")
@@ -288,21 +288,21 @@ function misskeyUdg(user, acct_id) {
if (json.isFollowing) {
//自分がフォローしている
$("#his-data").addClass("following");
- $("#his-follow-btn").text(lang_status_unfollow[lang]);
+ $("#his-follow-btn").text(lang.lang_status_unfollow);
hisList(user,acct_id);
}else{
- $("#his-follow-btn").text(lang_status_follow[lang]);
+ $("#his-follow-btn").text(lang.lang_status_follow);
}
if (json.isFollowed) {
//フォローされてる
- $("#his-relation").text(lang_showontl_followed[lang]);
+ $("#his-relation").text(lang.lang_showontl_followed);
}
$("#his-block-btn").hide();
if (json.isMuted) {
$("#his-data").addClass("muting");
- $("#his-mute-btn").text(lang_status_unmute[lang]);
+ $("#his-mute-btn").text(lang.lang_status_unmute);
}else{
- $("#his-mute-btn").text(lang_status_mute[lang]);
+ $("#his-mute-btn").text(lang.lang_status_mute);
}
$(".only-my-data").hide();
$(".only-his-data").show();
@@ -347,46 +347,46 @@ function relations(user, acct_id) {
if (json.following) {
//自分がフォローしている
$("#his-data").addClass("following");
- $("#his-follow-btn").text(lang_status_unfollow[lang]);
+ $("#his-follow-btn").text(lang.lang_status_unfollow);
hisList(user,acct_id);
}else{
- $("#his-follow-btn").text(lang_status_follow[lang]);
+ $("#his-follow-btn").text(lang.lang_status_follow);
}
if (json.followed_by) {
//フォローされてる
- $("#his-relation").text(lang_showontl_followed[lang]);
+ $("#his-relation").text(lang.lang_showontl_followed);
}
if (json.blocking) {
$("#his-data").addClass("blocking");
- $("#his-block-btn").text(lang_status_unblock[lang]);
+ $("#his-block-btn").text(lang.lang_status_unblock);
}else{
- $("#his-block-btn").text(lang_status_block[lang]);
+ $("#his-block-btn").text(lang.lang_status_block);
}
if (json.muting) {
$("#his-data").addClass("muting");
- $("#his-mute-btn").text(lang_status_unmute[lang]);
+ $("#his-mute-btn").text(lang.lang_status_unmute);
}else{
- $("#his-mute-btn").text(lang_status_mute[lang]);
+ $("#his-mute-btn").text(lang.lang_status_mute);
}
if (json.muting_notifications) {
$("#his-data").addClass("mutingNotf");
- $("#his-notf-btn").text(lang_showontl_notf[lang]+lang_status_unmute[lang]);
+ $("#his-notf-btn").text(lang.lang_showontl_notf+lang.lang_status_unmute);
}else{
- $("#his-notf-btn").text(lang_showontl_notf[lang]+lang_status_mute[lang]);
+ $("#his-notf-btn").text(lang.lang_showontl_notf+lang.lang_status_mute);
}
if (json.domain_blocking) {
$("#his-data").addClass("blockingDom");
- $("#his-domain-btn").text(lang_showontl_domain[lang]+lang_status_unblock[lang]);
+ $("#his-domain-btn").text(lang.lang_showontl_domain+lang.lang_status_unblock);
}else{
- $("#his-domain-btn").text(lang_showontl_domain[lang]+lang_status_block[lang]);
+ $("#his-domain-btn").text(lang.lang_showontl_domain+lang.lang_status_block);
}
//Endorsed
if(json.endorsed){
$("#his-end-btn").addClass("endorsed");
- $("#his-end-btn").text(lang_status_unendorse[lang])
+ $("#his-end-btn").text(lang.lang_status_unendorse)
}else{
$("#his-end-btn").removeClass("endorsed");
- $("#his-end-btn").text(lang_status_endorse[lang])
+ $("#his-end-btn").text(lang.lang_status_endorse)
}
});
@@ -431,15 +431,15 @@ function reset(){
$("#his-notf-btn").show();
$("#his-domain-btn").show();
$("#his-emp-btn").show();
- $("#his-follow-btn").text(lang_status_follow[lang]);
- $("#his-mute-btn").text(lang_status_mute[lang]);
- $("#his-block-btn").text(lang_status_block[lang]);
- $("#his-notf-btn").text(lang_showontl_notf[lang]+lang_status_mute[lang]);
- $("#his-domain-btn").text(lang_showontl_domain[lang]+lang_status_block[lang]);
+ $("#his-follow-btn").text(lang.lang_status_follow);
+ $("#his-mute-btn").text(lang.lang_status_mute);
+ $("#his-block-btn").text(lang.lang_status_block);
+ $("#his-notf-btn").text(lang.lang_showontl_notf+lang.lang_status_mute);
+ $("#his-domain-btn").text(lang.lang_showontl_domain+lang.lang_status_block);
$("#his-relation").text("");
$(".cont-series").html("");
$("#domainblock").val("");
- $("#his-lists-a").html(lang_showontl_listwarn[lang]);
+ $("#his-lists-a").html(lang.lang_showontl_listwarn);
$("#his-lists-b").html('');
$("#his-name-val").val("");
$("#his-des-val").val("");
diff --git a/app/view/en/acct.html b/app/view/en/acct.html
index f968b539..e600b118 100644
--- a/app/view/en/acct.html
+++ b/app/view/en/acct.html
@@ -25,9 +25,8 @@ body,html{overflow-y: scroll;}
-
+
diff --git a/app/view/en/index.html b/app/view/en/index.html
index 0c9bb711..003c43c7 100644
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -18,15 +18,14 @@
-
-
+
@@ -836,4 +834,4 @@ var lang="en";
-
+
\ No newline at end of file
diff --git a/app/view/en/setting.html b/app/view/en/setting.html
index 74aee191..1f769877 100644
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@@ -14,8 +14,7 @@
-
-
+
Preferences
@@ -91,7 +90,7 @@
-
+
@@ -158,8 +157,8 @@
Auto folding
TheDesk does not collapse totes of 5 characters or less. Also, when collapsing, newlines are not shown. TheDesk count only newlines as the number of lines.
- linesaboveor
- lettersabove
+ lines above or
+ letters above
Height of images
@@ -188,8 +187,8 @@
Alert before posting a long toot.
Show dialog whether you make too-long text hidden.
- linesaboveor
- lettersabove
+ lines above or
+ letters above