From 2216777710177812243826b29cfd03d819c5f94e Mon Sep 17 00:00:00 2001 From: Cutls Date: Fri, 8 Mar 2019 05:18:49 +0900 Subject: [PATCH] fix bug:themes --- app/js/lang/lang.ps.js | 206 +++++++++++++++++++++++++ app/js/platform/first.js | 4 +- app/js/ui/settings.js | 90 +++++++++-- app/main.js | 22 ++- app/package-lock.json | 2 +- app/view/en/setting.html | 13 +- app/view/ja/setting.html | 9 +- app/view/make/language/index.ps.json | 11 +- app/view/make/language/main.json | 199 ------------------------ app/view/make/language/setting.en.json | 4 +- app/view/make/language/setting.ja.json | 1 + app/view/make/language/setting.ps.json | 24 ++- app/view/make/language/update.ps.json | 3 +- app/view/make/setting.sample.html | 9 +- app/view/ps/index.html | 20 +-- app/view/ps/setting.html | 51 +++--- app/view/ps/update.html | 4 +- 17 files changed, 394 insertions(+), 278 deletions(-) create mode 100644 app/js/lang/lang.ps.js delete mode 100644 app/view/make/language/main.json diff --git a/app/js/lang/lang.ps.js b/app/js/lang/lang.ps.js new file mode 100644 index 00000000..1b046e44 --- /dev/null +++ b/app/js/lang/lang.ps.js @@ -0,0 +1,206 @@ +var lang={ + "language": "crwdns1960:0crwdne1960:0", + "lang_toot": "crwdns1962:0crwdne1962:0", + "lang_there": "crwdns1964:0crwdne1964:0", + "lang_nothing": "crwdns1966:0crwdne1966:0", + "lang_yesno": "crwdns1968:0crwdne1968:0", + "lang_no": "crwdns1970:0crwdne1970:0", + "lang_progress": "crwdns1972:0crwdne1972:0", + "lang_edit": "crwdns1974:0crwdne1974:0", + "lang_del": "crwdns1976:0crwdne1976:0", + "lang_add": "crwdns1978:0crwdne1978:0", + "lang_fatalerroroccured": "crwdns1980:0crwdne1980:0", + "lang_speech": "crwdns1982:0crwdne1982:0", + "lang_lang": "crwdns1984:0crwdne1984:0", + "lang_langlocale": "crwdns1986:0crwdne1986:0", + "lang_back": "crwdns1988:0crwdne1988:0", + "lang_set": "crwdns1990:0crwdne1990:0", + "lang_langadd": "crwdns2364:0crwdne2364:0", + "lang_version_usever": "crwdns1994:0{{ver}}crwdne1994:0", + "lang_version_skipver": "crwdns1996:0crwdne1996:0", + "lang_login_noauth": "crwdns1998:0crwdne1998:0", + "lang_manager_info": "crwdns2000:0crwdne2000:0", + "lang_manager_refresh": "crwdns2002:0crwdne2002:0", + "lang_manager_delete": "crwdns2004:0crwdne2004:0", + "lang_manager_color": "crwdns2006:0crwdne2006:0", + "lang_manager_confirm": "crwdns2008:0crwdne2008:0", + "lang_manager_mainAcct": "crwdns2010:0crwdne2010:0", + "lang_manager_def": "crwdns2012:0crwdne2012:0", + "lang_manager_none": "crwdns2014:0crwdne2014:0", + "lang_manager_godev": "crwdns2016:0crwdne2016:0", + "lang_bbmd_misskey": "crwdns2018:0crwdne2018:0", + "lang_emoji_get": "crwdns2020:0crwdne2020:0", + "lang_emoji_custom": "crwdns2022:0crwdne2022:0", + "lang_defaultemojis_text": "crwdns2388:0{{cat}}crwdne2388:0", + "lang_postimg_previewdis": "crwdns2024:0crwdne2024:0", + "lang_postimg_aftupload": "crwdns2026:0crwdne2026:0", + "lang_post_tagTL": "crwdns2028:0crwdne2028:0", + "lang_post_tagVis": "crwdns2030:0crwdne2030:0", + "lang_post_cwtitle": "crwdns2032:0crwdne2032:0", + "lang_post_cwtxt": "crwdns2034:0crwdne2034:0", + "lang_post_btn1": "crwdns2036:0crwdne2036:0", + "lang_post_btn2": "crwdns2038:0crwdne2038:0", + "lang_post_btn3": "crwdns2040:0crwdne2040:0", + "lang_status_favWarn": "crwdns2042:0crwdne2042:0", + "lang_status_btWarn": "crwdns2044:0crwdne2044:0", + "lang_status_follow": "crwdns2046:0crwdne2046:0", + "lang_status_unfollow": "crwdns2048:0crwdne2048:0", + "lang_status_block": "crwdns2050:0crwdne2050:0", + "lang_status_unblock": "crwdns2052:0crwdne2052:0", + "lang_status_mute": "crwdns2054:0crwdne2054:0", + "lang_status_unmute": "crwdns2056:0crwdne2056:0", + "lang_status_redraft": "crwdns2058:0crwdne2058:0", + "lang_status_emphas": "crwdns2060:0crwdne2060:0", + "lang_status_unemphas": "crwdns2062:0crwdne2062:0", + "lang_status_unendorse": "crwdns2064:0crwdne2064:0", + "lang_status_endorse": "crwdns2066:0crwdne2066:0", + "lang_suggest_nodata": "crwdns2068:0crwdne2068:0", + "lang_usetxtbox_reply": "crwdns2070:0crwdne2070:0", + "lang_cards_check": "crwdns2072:0crwdne2072:0", + "lang_cards_pip": "crwdns2074:0crwdne2074:0", + "lang_details_nodata": "crwdns2076:0crwdne2076:0", + "lang_details_filtered": "crwdns2078:0crwdne2078:0", + "lang_details_embed": "crwdns2080:0crwdne2080:0", + "lang_details_url": "crwdns2082:0crwdne2082:0", + "lang_details_txt": "crwdns2084:0crwdne2084:0", + "lang_filter_nodata": "crwdns2086:0crwdne2086:0", + "lang_filter_errordegree": "crwdns2088:0crwdne2088:0", + "lang_list_nodata": "crwdns2090:0crwdne2090:0", + "lang_list_show": "crwdns2092:0crwdne2092:0", + "lang_list_users": "crwdns2094:0crwdne2094:0", + "lang_list_nouser": "crwdns2096:0crwdne2096:0", + "lang_list_add": "crwdns2098:0crwdne2098:0", + "lang_list_remove": "crwdns2100:0crwdne2100:0", + "lang_notf_new": "crwdns2102:0crwdne2102:0", + "lang_speech_refresh": "crwdns2348:0crwdne2348:0", + "lang_src_ts": "crwdns2106:0crwdne2106:0", + "lang_src_people": "crwdns2108:0crwdne2108:0", + "lang_tags_always": "crwdns2110:0crwdne2110:0", + "lang_tags_realtime": "crwdns2112:0crwdne2112:0", + "lang_tags_tagunpin": "crwdns2114:0{{tag}}crwdne2114:0", + "lang_tags_tagwarn": "crwdns2116:0{{tag}}crwdne2116:0", + "lang_tl_media": "crwdns2118:0crwdne2118:0", + "lang_tl_reconnect": "crwdns2120:0crwdne2120:0", + "lang_layout_gotop": "crwdns2122:0crwdne2122:0", + "lang_layout_thisacct": "crwdns2124:0{{notf}}crwdne2124:0", + "lang_layout_delthis": "crwdns2126:0crwdne2126:0", + "lang_layout_setthis": "crwdns2128:0crwdne2128:0", + "lang_layout_mediafil": "crwdns2130:0crwdne2130:0", + "lang_layout_linkana": "crwdns2132:0crwdne2132:0", + "lang_layout_linkanades": "crwdns2134:0crwdne2134:0", + "lang_layout_tts": "crwdns2136:0crwdne2136:0", + "lang_layout_reconnect": "crwdns2138:0crwdne2138:0", + "lang_layout_headercolor": "crwdns2140:0crwdne2140:0", + "lang_layout_nodata": "crwdns2142:0crwdne2142:0", + "lang_layout_dm": "crwdns2144:0crwdne2144:0", + "lang_layout_webviewmode": "crwdns2146:0crwdne2146:0", + "lang_excluded": "crwdns2368:0crwdne2368:0", + "lang_layout_excludingbt": "crwdns2390:0crwdne2390:0", + "lang_spotify_img": "crwdns2148:0crwdne2148:0", + "lang_spotify_imgno": "crwdns2150:0crwdne2150:0", + "lang_spotify_acct": "crwdns2152:0crwdne2152:0", + "lang_spotify_np": "crwdns2154:0crwdne2154:0", + "lang_setting_npprovide": "crwdns2370:0{{set}}crwdne2370:0", + "lang_hisdata_frcreq": "crwdns2156:0crwdne2156:0", + "lang_hisdata_frcwarn": "crwdns2158:0crwdne2158:0", + "lang_hisdata_taketime": "crwdns2160:0crwdne2160:0", + "lang_hisdata_notonmisskey": "crwdns2162:0crwdne2162:0", + "lang_showontl_movetxt": "crwdns2164:0crwdne2164:0", + "lang_showontl_movebtn": "crwdns2166:0crwdne2166:0", + "lang_showontl_botacct": "crwdns2168:0[bot]crwdne2168:0", + "lang_showontl_followed": "crwdns2170:0crwdne2170:0", + "lang_showontl_notf": "crwdns2172:0crwdne2172:0", + "lang_showontl_domain": "crwdns2174:0crwdne2174:0", + "lang_showontl_listwarn": "crwdns2176:0crwdne2176:0", + "lang_parse_mentioned": "crwdns2178:0crwdne2178:0", + "lang_parse_faved": "crwdns2180:0crwdne2180:0", + "lang_parse_bted": "crwdns2182:0crwdne2182:0", + "lang_parse_btedsimple": "crwdns2184:0crwdne2184:0", + "lang_parse_notftime": "crwdns2186:0crwdne2186:0", + "lang_parse_cwshow": "crwdns2188:0crwdne2188:0", + "lang_parse_fulltext": "crwdns2190:0crwdne2190:0", + "lang_parse_autofold": "crwdns2192:0crwdne2192:0", + "lang_parse_more": "crwdns2194:0crwdne2194:0", + "lang_parse_url": "crwdns2196:0crwdne2196:0", + "lang_parse_tagTL": "crwdns2198:0{{tag}}crwdne2198:0", + "lang_parse_tagtoot": "crwdns2200:0{{tag}}crwdne2200:0", + "lang_parse_tagpin": "crwdns2202:0{{tag}}crwdne2202:0", + "lang_parse_public": "crwdns2204:0crwdne2204:0", + "lang_parse_unlisted": "crwdns2206:0crwdne2206:0", + "lang_parse_private": "crwdns2208:0crwdne2208:0", + "lang_parse_direct": "crwdns2210:0crwdne2210:0", + "lang_parse_clickcopy": "crwdns2212:0crwdne2212:0", + "lang_parse_clickcopyurl": "crwdns2214:0crwdne2214:0", + "lang_parse_trans": "crwdns2216:0crwdne2216:0", + "lang_parse_replyto": "crwdns2218:0crwdne2218:0", + "lang_parse_bt": "crwdns2220:0crwdne2220:0", + "lang_parse_fav": "crwdns2222:0crwdne2222:0", + "lang_parse_quote": "crwdns2224:0crwdne2224:0", + "lang_parse_del": "crwdns2226:0crwdne2226:0", + "lang_parse_pin": "crwdns2228:0crwdne2228:0", + "lang_parse_det": "crwdns2230:0crwdne2230:0", + "lang_parse_redraft": "crwdns2232:0crwdne2232:0", + "lang_parse_followed": "crwdns2234:0crwdne2234:0", + "lang_parse_clientop": "crwdns2236:0crwdne2236:0", + "lang_parse_clienttxt": "crwdns2238:0crwdne2238:0", + "lang_parse_clientno": "crwdns2240:0crwdne2240:0", + "lang_parse_clientemp": "crwdns2242:0crwdne2242:0", + "lang_parse_clientmute": "crwdns2244:0crwdne2244:0", + "lang_parse_mute": "crwdns2246:0crwdne2246:0", + "lang_parse_voted": "crwdns2392:0crwdne2392:0", + "lang_parse_vote": "crwdns2394:0crwdne2394:0", + "lang_parse_unvoted": "crwdns2396:0crwdne2396:0", + "lang_parse_endedvote": "crwdns2398:0crwdne2398:0", + "lang_misskeyparse_renote": "crwdns2248:0crwdne2248:0", + "lang_misskeyparse_renoteqt": "crwdns2250:0crwdne2250:0", + "lang_misskeyparse_reaction": "crwdns2252:0crwdne2252:0", + "lang_misskeyparse_tagnostr": "crwdns2254:0crwdne2254:0", + "lang_misskeyparse_listnostr": "crwdns2256:0crwdne2256:0", + "lang_misskeyparse_home": "crwdns2258:0crwdne2258:0", + "lang_misskeyparse_followers": "crwdns2260:0crwdne2260:0", + "lang_misskeyparse_specified": "crwdns2262:0crwdne2262:0", + "lang_misskeyparse_qt": "crwdns2264:0crwdne2264:0", + "lang_misskeyparse_renoted": "crwdns2266:0crwdne2266:0", + "lang_misskeyparse_quoted": "crwdns2268:0crwdne2268:0", + "lang_misskeyparse_reacted": "crwdns2372:0crwdne2372:0", + "lang_setting_time": "crwdns2272:0{{set}}crwdne2272:0", + "lang_setting_theme": "crwdns2274:0{{set}}crwdne2274:0", + "lang_setting_nsfw": "crwdns2276:0{{set}}crwdne2276:0", + "lang_setting_cw": "crwdns2278:0{{set}}crwdne2278:0", + "lang_setting_cwtext": "crwdns2280:0{{set}}crwdne2280:0", + "lang_setting_cws": "crwdns2282:0{{set}}crwdne2282:0", + "lang_setting_rp": "crwdns2284:0{{set}}crwdne2284:0", + "lang_setting_vis": "crwdns2286:0{{set}}crwdne2286:0", + "lang_setting_popup": "crwdns2288:0{{set}}crwdne2288:0", + "lang_setting_off": "crwdns2290:0crwdne2290:0", + "lang_setting_s": "crwdns2292:0crwdne2292:0", + "lang_setting_box": "crwdns2294:0{{set}}crwdne2294:0", + "lang_setting_gif": "crwdns2296:0{{set}}crwdne2296:0", + "lang_setting_selt": "crwdns2298:0{{set1}}crwdnd2298:0{{set2}}crwdne2298:0", + "lang_setting_autocw": "crwdns2300:0{{set1}}crwdnd2300:0{{set2}}crwdne2300:0", + "lang_setting_width": "crwdns2302:0{{set}}crwdne2302:0", + "lang_setting_fixwidth": "crwdns2386:0{{set}}crwdne2386:0", + "lang_setting_img": "crwdns2304:0{{set}}crwdne2304:0", + "lang_setting_font": "crwdns2306:0{{set}}crwdne2306:0", + "lang_setting_default": "crwdns2308:0crwdne2308:0", + "lang_setting_size": "crwdns2310:0{{set}}crwdne2310:0", + "lang_setting_imgheight": "crwdns2312:0{{set}}crwdne2312:0", + "lang_setting_ticker": "crwdns2314:0{{set}}crwdne2314:0", + "lang_setting_animation": "crwdns2400:0{{set}}crwdne2400:0", + "lang_setting_tag": "crwdns2316:0{{set}}crwdne2316:0", + "lang_setting_boxConfirm": "crwdns2318:0{{set}}crwdne2318:0", + "lang_setting_ul": "crwdns2320:0{{set}}crwdne2320:0", + "lang_setting_notf": "crwdns2322:0{{set}}crwdne2322:0", + "lang_setting_quote": "crwdns2324:0{{set}}crwdne2324:0", + "lang_setting_via": "crwdns2326:0{{set}}crwdne2326:0", + "lang_setting_mov": "crwdns2328:0{{set}}crwdne2328:0", + "lang_setting_setasread": "crwdns2330:0{{set}}crwdne2330:0", + "lang_setting_main": "crwdns2332:0{{set}}crwdne2332:0", + "lang_setting_sec": "crwdns2334:0{{set}}crwdne2334:0", + "lang_setting_ksref": "crwdns2336:0crwdne2336:0", + "lang_setting_nomuting": "crwdns2338:0crwdne2338:0", + "lang_setting_notftest": "crwdns2340:0crwdne2340:0", + "lang_setting_notftestprof": "crwdns2342:0crwdne2342:0", + "lang_setting_exportwarn": "crwdns2344:0crwdne2344:0", + "lang_setting_importwarn": "crwdns2346:0crwdne2346:0" +} \ No newline at end of file diff --git a/app/js/platform/first.js b/app/js/platform/first.js index 0b96aec1..255b6cfc 100644 --- a/app/js/platform/first.js +++ b/app/js/platform/first.js @@ -129,7 +129,7 @@ function rgbToHex(color) } // 正規表現 - var regex = color.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/); + var regex = color.match(/^rgb\(([0-9.]+),\s*([0-9.]+),\s*([0-9.]+)\)$/); // 正規表現でマッチしたとき if (regex) @@ -156,5 +156,5 @@ function rgbToHex(color) return hex; } - console.error('第1引数はRGB形式で入力'); + console.error(color+':第1引数はRGB形式で入力'); } \ No newline at end of file diff --git a/app/js/ui/settings.js b/app/js/ui/settings.js index dd4f07e6..026a0f7b 100644 --- a/app/js/ui/settings.js +++ b/app/js/ui/settings.js @@ -739,6 +739,10 @@ function pickerDefine(i,color){ preview: true, // Left side color comparison opacity: false, // Opacity slider hue: true, // Hue slider + interaction: { + rgba: false, // rgba option (red green blue and alpha) + input: true, // input / output element + } }, strings: { save: 'Save', // Default for save button @@ -746,25 +750,28 @@ function pickerDefine(i,color){ } }); pickr.on('change', (...args) => { - var rgb='rgb('+rgs[0].toRGBA()[0]+','+rgs[0].toRGBA()[1]+','+rgs[0].toRGBA()[2]+')'; - $("#color-picker"+i+"_value").val(rgb) - }); + var rgb='rgb('+args[0].toRGBA()[0]+','+args[0].toRGBA()[1]+','+args[0].toRGBA()[2]+')'; + $("#color-picker"+i+"_value").val(rgb) + }); } function customComp(){ var nameC=$("#custom_name").val(); if(!nameC){return false;} var descC=$("#custom_desc").val(); - if(!descC){return false;} var primaryC=$("#color-picker0_value").val(); - if(!primaryC){return false;} + if(!primaryC){primaryC="rgb(255,255,255)"} var secondaryC=$("#color-picker1_value").val(); - if(!secondaryC){return false;} + if(!secondaryC){secondaryC="rgb(255,255,255)"} var textC=$("#color-picker2_value").val(); - if(!textC){return false;} + if(!textC){textC="rgb(255,255,255)"} var accentC=$("#color-picker3_value").val(); - if(!accentC){return false;} + if(!accentC){accentC="rgb(255,255,255)"} var multi = localStorage.getItem("multi"); var my=JSON.parse(multi)[0].name; + var id=$("#custom-edit-sel").val(); + if(id=="add_new"){ + id=makeCID(); + } var json={ "name": nameC, "author": my, @@ -778,9 +785,50 @@ function customComp(){ "props": { "TheDeskAccent": accentC }, - "id": makeCID() + "id": id } $("#custom_json").val(JSON.stringify(json)); + themes(); + $("#custom_name").val(""); + $("#custom_desc").val(""); + $("#dark").prop("checked", true); + $("#custom_json").val(""); + $("#color-picker0-wrap").html('
') + $("#color-picker1-wrap").html('
') + $("#color-picker2-wrap").html('
') + $("#color-picker3-wrap").html('
') + $("#color-picker0_value").val(""); + $("#color-picker1_value").val(""); + $("#color-picker2_value").val(""); + $("#color-picker3_value").val(""); + pickerDefine(0,"fff"); + pickerDefine(1,"fff"); + pickerDefine(2,"fff"); + pickerDefine(3,"fff"); + ipc.send('theme-json-create', JSON.stringify(json)); +} +function deleteIt(){ + var id=$("#custom-sel-sel").val(); + $("#custom_name").val(""); + $("#custom_desc").val(""); + $("#dark").prop("checked", true); + $("#custom_json").val(""); + $("#color-picker0-wrap").html('
') + $("#color-picker1-wrap").html('
') + $("#color-picker2-wrap").html('
') + $("#color-picker3-wrap").html('
') + $("#color-picker0_value").val(""); + $("#color-picker1_value").val(""); + $("#color-picker2_value").val(""); + $("#color-picker3_value").val(""); + pickerDefine(0,"fff"); + pickerDefine(1,"fff"); + pickerDefine(2,"fff"); + pickerDefine(3,"fff"); + ipc.on('theme-json-delete-complete', function (event, args) { + ctLoad() + }); + ipc.send('theme-json-delete', id); } function ctLoad(){ ipc.send('theme-json-list', ""); @@ -791,9 +839,10 @@ function ctLoad(){ var theme = args[key]; var themeid=theme.id templete = templete+''; - - }); + if(args[0]){ + localStorage.setItem("customtheme-id",args[0].id) + } $("#custom-sel-sel").html(templete); templete=''+templete; $("#custom-edit-sel").html(templete); @@ -811,17 +860,35 @@ function custom(){ $("#custom_desc").val(""); $("#dark").prop("checked", true); $("#custom_json").val(""); + $("#color-picker0-wrap").html('
') + $("#color-picker1-wrap").html('
') + $("#color-picker2-wrap").html('
') + $("#color-picker3-wrap").html('
') + $("#color-picker0_value").val(""); + $("#color-picker1_value").val(""); + $("#color-picker2_value").val(""); + $("#color-picker3_value").val(""); + pickerDefine(0,"fff"); + pickerDefine(1,"fff"); + pickerDefine(2,"fff"); + pickerDefine(3,"fff"); + $("#delTheme").addClass("disabled") }else{ + $("#delTheme").removeClass("disabled") ipc.send('theme-json-request', id); ipc.on('theme-json-response', function (event, args) { + console.log(args); $("#custom_name").val(args.name); $("#custom_desc").val(args.desc); $("#"+args.base).prop("checked", true); $("#color-picker0-wrap").html('
') pickerDefine(0,rgbToHex(args.vars.primary)) + $("#color-picker0_value").val(args.vars.primary); $("#color-picker1-wrap").html('
') pickerDefine(1,rgbToHex(args.vars.secondary)) + $("#color-picker1_value").val(args.vars.secondary); $("#color-picker2-wrap").html('
') + $("#color-picker2_value").val(args.vars.text); pickerDefine(2,rgbToHex(args.vars.text)) if(args.props){ if(args.props.TheDeskAccent){ @@ -846,6 +913,7 @@ function customImp(){ alert("Error") } } + ipc.on('theme-json-create-complete', function (event, args) { $("#custom_import").val(""); ctLoad() diff --git a/app/main.js b/app/main.js index 366088fb..d57b72e4 100644 --- a/app/main.js +++ b/app/main.js @@ -185,8 +185,6 @@ ipc.on('custom-css-request', function(e, arg) { mainWindow.webContents.send('custom-css-response', css); }) ipc.on('theme-json-create', function(e, arg) { - console.log(arg); - console.log(JSON5.parse(arg)) var themecss=join(app.getPath("userData"), JSON5.parse(arg)["id"]+".thedesktheme"); fs.writeFileSync(themecss,JSON.stringify(JSON5.parse(arg))); if(JSON5.parse(arg)["id"]){ @@ -195,6 +193,13 @@ ipc.on('theme-json-create', function(e, arg) { mainWindow.webContents.send('theme-json-create-complete', "error"); } }) +ipc.on('theme-json-delete', function(e, arg) { + var themecss=join(app.getPath("userData"), arg+".thedesktheme"); + console.log(themecss); + fs.unlink(themecss, function (err) { + mainWindow.webContents.send('theme-json-delete-complete', ""); + }); +}) ipc.on('theme-json-request', function(e, arg) { var themecss=join(app.getPath("userData"), arg+".thedesktheme"); var json = JSON.parse(fs.readFileSync(themecss, 'utf8')); @@ -222,13 +227,13 @@ ipc.on('theme-css-request', function(e, arg) { var emphasized=secondary; } }else{ - var emphasized=secondary; + var emphasized=primary; } - var css=".customtheme {--bg:"+primary+";--drag:"+drag+";"+ - "--color:"+text+";--beforehover:"+beforehover+";--modal:"+primary+";--subcolor:"+secondary+";--box:"+secondary+";--sidebar:"+secondary+";--shared:"+emphasized+";"+ - "--notfbox:"+primary+";--emphasized:"+secondary+";--his-data:"+primary+ - +"--active:"+secondary+";--postbox:"+secondary+";--modalfooter:"+secondary+";}.blacktheme #imagemodal{background: url(\"../img/pixel.svg\");}"; + var css=".customtheme {--bg:"+secondary+";--drag:"+drag+";"+ + "--color:"+text+";--beforehover:"+beforehover+";--modal:"+secondary+";--subcolor:"+primary+";--box:"+primary+";--sidebar:"+primary+";--shared:"+emphasized+";"+ + "--notfbox:"+secondary+";--emphasized:"+primary+";--his-data:"+secondary+ + +"--active:"+primary+";--postbox:"+primary+";--modalfooter:"+primary+";}.blacktheme #imagemodal{background: url(\"../img/pixel.svg\");}"; mainWindow.webContents.send('theme-css-response', css); } catch (e) { var css=""; @@ -265,7 +270,8 @@ ipc.on('update', function(e, x, y) { height: 400, "transparent": false, // ウィンドウの背景を透過 "frame": false, // 枠の無いウィンドウ - "resizable": false + "resizable": false, + "modal":true }); var lang = fs.readFileSync(lang_path, 'utf8'); updatewin.loadURL('file://' + __dirname + '/view/'+lang+'/update.html'); diff --git a/app/package-lock.json b/app/package-lock.json index eb994e2d..82480ad0 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1048,7 +1048,7 @@ } }, "extend": { - "version": "3.0.1", + "extend": ">=3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" }, diff --git a/app/view/en/setting.html b/app/view/en/setting.html index 781846cd..13ade0a4 100644 --- a/app/view/en/setting.html +++ b/app/view/en/setting.html @@ -17,7 +17,7 @@ - + @@ -34,6 +34,7 @@
Languages
+ To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.
日本語(Japanese)/English/Crowdin web translate/
Import and export of preferences
@@ -118,12 +119,12 @@
-
Primary
Background color +
Primary
Background of components
-
Secondary
Background of components +
Secondary
Background color
@@ -138,11 +139,11 @@
-
+  


- Share this code with other TheDesk and Misskey. + Share this code with other TheDesk. Do not share this code with MiAS.

Import of custom themes

- {{cImpWarn}}
+ Get more themes on MiAS

diff --git a/app/view/ja/setting.html b/app/view/ja/setting.html index a6bc202f..3a7c8f99 100644 --- a/app/view/ja/setting.html +++ b/app/view/ja/setting.html @@ -17,7 +17,7 @@ - + @@ -34,6 +34,7 @@
言語
+ To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.
日本語(Japanese)/English/Crowdin web translate/
設定のインポートとエクスポート
@@ -118,12 +119,12 @@
-
Primary
全体の背景色など +
Primary
補助要素に使われる背景色
-
Secondary
補助要素に使われる背景色 +
Secondary
全体の背景色など
@@ -138,7 +139,7 @@
-
+  


このコードは他のTheDeskなどとシェアできます。このコードをMiASに貼ることはご遠慮ください。

カスタムテーマのインポート

diff --git a/app/view/make/language/index.ps.json b/app/view/make/language/index.ps.json index 60518337..dff24ca6 100644 --- a/app/view/make/language/index.ps.json +++ b/app/view/make/language/index.ps.json @@ -4,13 +4,14 @@ "showSelectProf": "crwdns386:0crwdne386:0", "closethisbox": "crwdns387:0crwdne387:0", "toot": "crwdns388:0crwdne388:0", + "post-new": "crwdns2402:0crwdne2402:0", "nsfwDes": "crwdns389:0crwdne389:0", "cwDes": "crwdns390:0crwdne390:0", "selfile": "crwdns391:0crwdne391:0", "adobephoto": "crwdns392:0crwdne392:0", "insertEmoji": "crwdns393:0crwdne393:0", "NPSpotify": "crwdns1880:0crwdne1880:0", - "NPiTunes": "crwdns1882:0crwdne1882:0", + "NPiTunes": "crwdns2404:0crwdne2404:0", "schedule": "crwdns1884:0crwdne1884:0", "postat": "crwdns1886:0crwdne1886:0", "scheduleWarn": "crwdns1888:0crwdne1888:0", @@ -43,6 +44,13 @@ "thingsEmoji": "crwdns420:0crwdne420:0", "symbolEmoji": "crwdns421:0crwdne421:0", "flagsEmoji": "crwdns422:0crwdne422:0", + "poll": "crwdns2406:0crwdne2406:0", + "pollDdisabled": "crwdns2408:0crwdne2408:0", + "pollProvider": "crwdns2410:0crwdne2410:0", + "polluntil": "crwdns2412:0crwdne2412:0", + "choice": "crwdns2414:0crwdne2414:0", + "pollmulti": "crwdns2416:0crwdne2416:0", + "expires_in": "crwdns2418:0crwdne2418:0", "contextBefore": "crwdns423:0crwdne423:0", "thisToot": "crwdns424:0crwdne424:0", "contextAfter": "crwdns425:0crwdne425:0", @@ -131,6 +139,7 @@ "days": "crwdns507:0crwdne507:0", "hours": "crwdns508:0crwdne508:0", "mins": "crwdns509:0crwdne509:0", + "secs": "crwdns2420:0crwdne2420:0", "warnOnIntegratedTL": "crwdns510:0crwdne510:0", "helloTheDesk": "crwdns511:0crwdne511:0", "addColumn": "crwdns512:0crwdne512:0", diff --git a/app/view/make/language/main.json b/app/view/make/language/main.json deleted file mode 100644 index 3a30eb03..00000000 --- a/app/view/make/language/main.json +++ /dev/null @@ -1,199 +0,0 @@ -{ - "language":"en", - "lang_toot":"Toot", - "lang_there":"Yes", - "lang_nothing":"None", - "lang_yesno":"Yes", - "lang_no":"No", - "lang_progress":"Wait...", - "lang_edit":"Edit", - "lang_del":"Delete", - "lang_add":"Add", - "lang_fatalerroroccured":"Some errors are occured, please restart TheDesk.", - "lang_speech":"Google US English", - "lang_lang":"Language", - "lang_langlocale":"English", - "lang_back":"Back", - "lang_set":"Set", - "lang_langadd":"Translate TheDesk to other languages or proofread TheDesk on GitHub. TheDesk needs your help.", - "lang_version_usever":"No update is found({{ver}})", - "lang_version_skipver":"Update was ignored.", - "lang_login_noauth":"Show TL of unlogined accounts", - "lang_manager_info":"About this instance", - "lang_manager_refresh":"Refresh", - "lang_manager_delete":"Logout", - "lang_manager_color":"Account Color", - "lang_manager_confirm":"is about to logout. Continue?", - "lang_manager_mainAcct":"Done:choose main account", - "lang_manager_def":"Default", - "lang_manager_none":"None", - "lang_manager_godev":"Open DevCenter of Misskey. We show also an official documents to refer.", - "lang_bbmd_misskey":"TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.", - "lang_emoji_get":"Get emojis", - "lang_emoji_custom":"Custom emojis", - "lang_postimg_previewdis":"cannot preview", - "lang_postimg_aftupload":"You cannot change accounts after uploading.", - "lang_post_tagTL":"This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?", - "lang_post_tagVis":"This toot(not 'public' toot) is not shown on this tag's TL.", - "lang_post_cwtitle":"Auto CW Alert", - "lang_post_cwtxt":"You are about to post longer toot than you set.\nWarning text:", - "lang_post_btn1":"Cancel (will not post)", - "lang_post_btn2":"Make text hidden automatically", - "lang_post_btn3":"Continue to post", - "lang_status_favWarn":"It will take a miunte to favourite a remote toot.", - "lang_status_btWarn":"It will take a miunte to boost a remote toot.", - "lang_status_follow":"Follow", - "lang_status_unfollow":"Unfollow", - "lang_status_block":"Block", - "lang_status_unblock":"Unblock", - "lang_status_mute":"Mute", - "lang_status_unmute":"Unmute", - "lang_status_redraft":"Continue to delete & redraft? You lose statuses of this toot. This fanction may contain some bugs. Images of this toot will be deleted on older than Mastodon 2.4.1.", - "lang_status_emphas":"'s toots are emphasized. Please reload after this action.", - "lang_status_unemphas":"'s toots are not emphasized. Please reload after this action.", - "lang_status_unendorse":"Not feature on profile", - "lang_status_endorse":"Feature on profile", - "lang_suggest_nodata":"Please get emojis list in order to show suggestion.", - "lang_usetxtbox_reply":"Reply Mode. Ctrl+Shift+C to clear.", - "lang_cards_check":" check", - "lang_cards_pip":"PiP mode", - "lang_details_nodata":"No data", - "lang_details_filtered":"Filtered toot", - "lang_details_embed":"Embed HTML is cliped.", - "lang_details_url":"URL of this toot is cliped.", - "lang_details_txt":"Content of this toot is cliped.", - "lang_filter_nodata":"No data", - "lang_filter_errordegree":"Please check a context", - "lang_list_nodata":"No data", - "lang_list_show":"Show", - "lang_list_users":"Users list", - "lang_list_nouser":"No users in this list.", - "lang_list_add":"Add to the list", - "lang_list_remove":"Remove from the list", - "lang_notf_new":" new notifications", - "lang_speech_refresh":"Save value about TTS config", - "lang_src_ts":"chronological order", - "lang_src_people":" people toot", - "lang_tags_always":"Always toots with ", - "lang_tags_realtime":"Tag-stream toot", - "lang_tags_tagunpin":"Unpin {{tag}}", - "lang_tags_tagwarn":"When you toot without {{tag}}, tag-streaming mode will be off.", - "lang_tl_media":"Media", - "lang_tl_reconnect":"Reconnect to streaming API", - "lang_layout_gotop":"Go top of this column. When icon is red, this column cannot connect straming API. Please reload.", - "lang_layout_thisacct":"{{notf}} of this account", - "lang_layout_delthis":"Remove this column", - "lang_layout_setthis":"Preferences of this column", - "lang_layout_mediafil":"Media filtering", - "lang_layout_linkana":"Auto Link Analyzer", - "lang_layout_linkanades":"Auto link analyzer", - "lang_layout_tts":"Text to speech ", - "lang_layout_reconnect":"Reconnect to streaming API", - "lang_layout_headercolor":"Header color of this column", - "lang_layout_nodata":"[No data]
F5/⌘+R to reload", - "lang_layout_dm":"Direct Message", - "lang_layout_webviewmode":"Prefer WebView", - "lang_excluded":"Excluded type of notification", - "lang_spotify_img":"Attach an album artwork", - "lang_spotify_imgno":"Not attach an album artwork", - "lang_spotify_acct":"Connect TheDesk to Spotify", - "lang_spotify_np":"Done:templete of NowPlaying", - "lang_setting_npprovide":"NowPlaying provider:{{set}}", - "lang_hisdata_frcreq":"Required Mastodon 2.4.3 and above", - "lang_hisdata_frcwarn":"Unfollow accounts will be shown.", - "lang_hisdata_taketime":"It will take 30s ~ several minutes", - "lang_hisdata_notonmisskey":"Misskey is unable to request.", - "lang_showontl_movetxt":"This account was moved", - "lang_showontl_movebtn":"Continue on the new account", - "lang_showontl_botacct":"[bot]", - "lang_showontl_followed":"Following you", - "lang_showontl_notf":"Notification ", - "lang_showontl_domain":"Domain ", - "lang_showontl_listwarn":"Follow to add this user to lists.", - "lang_parse_mentioned":" replied to you", - "lang_parse_faved":" favourited your toot", - "lang_parse_bted":" boosted your toot", - "lang_parse_btedsimple":" boosted", - "lang_parse_notftime":"Actioned at", - "lang_parse_cwshow":"Show", - "lang_parse_fulltext":"Full size text:", - "lang_parse_autofold":"Auto folded", - "lang_parse_more":"More", - "lang_parse_url":"URL Analyzer", - "lang_parse_tagTL":"Timeline of {{tag}}", - "lang_parse_tagtoot":"Toot with {{tag}}", - "lang_parse_tagpin":"Pin {{tag}}", - "lang_parse_public":"Public", - "lang_parse_unlisted":"Unlisted", - "lang_parse_private":"Private", - "lang_parse_direct":"Direct", - "lang_parse_clickcopy":"Click to copy text of this toot", - "lang_parse_clickcopyurl":"Click to copy URL of this toot", - "lang_parse_trans":"Translate to Japanese", - "lang_parse_replyto":"Reply to this toot", - "lang_parse_bt":"Boost this toot", - "lang_parse_fav":"Favourite this toot", - "lang_parse_quote":"Quote this toot", - "lang_parse_del":"Delete this toot", - "lang_parse_pin":"Pin this toot", - "lang_parse_det":"Details via your main account.", - "lang_parse_redraft":"Delete & re-draft", - "lang_parse_followed":"Followed you", - "lang_parse_clientop":"Operation of this client", - "lang_parse_clienttxt":" will be", - "lang_parse_clientno":"done nothing", - "lang_parse_clientemp":"emphasized(/not emphasized)", - "lang_parse_clientmute":"muted", - "lang_parse_mute":" will be muted. You can remove on preferences.", - "lang_misskeyparse_renote":"Repost", - "lang_misskeyparse_renoteqt":"Renote", - "lang_misskeyparse_reaction":"Reaction", - "lang_misskeyparse_tagnostr":"No streaming API on Tag TLs", - "lang_misskeyparse_listnostr":"No streaming API on List TLs", - "lang_misskeyparse_home":"Home", - "lang_misskeyparse_followers":"Follower", - "lang_misskeyparse_specified":"Specified User", - "lang_misskeyparse_qt":"Misskey renote(quote) mode:Ctrl+Shift+Enter to clear", - "lang_misskeyparse_renoted":" renoted your following post.", - "lang_misskeyparse_quoted":" quoted your following post.", - "lang_misskeyparse_reacted":" reacted your following post.", - "lang_setting_time":"Time format:{{set}}", - "lang_setting_theme":"Theme:{{set}}", - "lang_setting_nsfw":"NSFW:{{set}}", - "lang_setting_cw":"CW:{{set}}", - "lang_setting_cwtext":"Default CW text:{{set}}", - "lang_setting_cws":"Always CW on:{{set}}", - "lang_setting_rp":"Reply counter:{{set}}", - "lang_setting_vis":"Default visibility:{{set}}", - "lang_setting_popup":"Popup notification:{{set}}", - "lang_setting_off":"Off", - "lang_setting_s":"s", - "lang_setting_box":"Default toot box action:{{set}}", - "lang_setting_gif":"GIF:{{set}}", - "lang_setting_selt":"Auto fold:{{set1}} lines and above, {{set2}} letters and above", - "lang_setting_autocw":"Auto CW:{{set1}} lines and above, {{set2}} letters and above", - "lang_setting_width":"Minimam width:{{set}}", - "lang_setting_fixwidth":"TweetDeck fixed width:{{set}}px", - "lang_setting_img":"After posting an image:{{set}}", - "lang_setting_font":"Fonts:{{set}}", - "lang_setting_default":"default font", - "lang_setting_size":"Font size:{{set}}px", - "lang_setting_imgheight":"Image height:{{set}}px", - "lang_setting_ticker":"#InstanceTicker:{{set}}px", - "lang_setting_tag":"Tag TL:{{set}}", - "lang_setting_boxConfirm":"Post box:{{set}}", - "lang_setting_ul":"Native locale:{{set}}", - "lang_setting_notf":"Native notification:{{set}}", - "lang_setting_quote":"Quote format:{{set}}", - "lang_setting_via":"Via:{{set}}", - "lang_setting_mov":"Action buttons hiding:{{set}}", - "lang_setting_setasread":"Notification markers:{{set}}", - "lang_setting_main":"Default account:{{set}}", - "lang_setting_sec":"Secondary toot button:{{set}}", - "lang_setting_ksref":"Keyboard shortcuts are refreshed.", - "lang_setting_nomuting":"No client is muted.", - "lang_setting_notftest":" Notification test ", - "lang_setting_notftestprof":"Your icon is shown.", - "lang_setting_exportwarn":"Only important data will be exported. You must keep this data secure.", - "lang_setting_importwarn":"All data will be deleted." -} \ No newline at end of file diff --git a/app/view/make/language/setting.en.json b/app/view/make/language/setting.en.json index 534068c4..5d2e15cd 100644 --- a/app/view/make/language/setting.en.json +++ b/app/view/make/language/setting.en.json @@ -38,8 +38,10 @@ "add_new":"Add new", "name":"Name", "desc":"About this theme", - "customShare":"Share this code with other TheDesk and Misskey.", + "customShare":"Share this code with other TheDesk. Do not share this code with MiAS.", "customImport":"Import of custom themes", + "delete":"Delete", + "cImpWarn":"Get more themes on MiAS", "timeline":"Timeline Preferences", "timemode":"Time format", "relativetime":"Relative format:\"1 minutes ago\",\"3 days ago\"", diff --git a/app/view/make/language/setting.ja.json b/app/view/make/language/setting.ja.json index c539ace5..4ed81f55 100644 --- a/app/view/make/language/setting.ja.json +++ b/app/view/make/language/setting.ja.json @@ -40,6 +40,7 @@ "desc":"説明", "customShare":"このコードは他のTheDeskなどとシェアできます。このコードをMiASに貼ることはご遠慮ください。", "customImport":"カスタムテーマのインポート", + "delete":"削除", "cImpWarn":"MiAS上の80を超えるテーマを張り付けることもできます。", "timeline":"タイムラインの設定", "timemode":"時間表記設定", diff --git a/app/view/make/language/setting.ps.json b/app/view/make/language/setting.ps.json index b1d81547..8266243e 100644 --- a/app/view/make/language/setting.ps.json +++ b/app/view/make/language/setting.ps.json @@ -17,8 +17,10 @@ "nativenotf": "crwdns538:0crwdne538:0", "nnwarn": "crwdns539:0crwdne539:0", "nntest": "crwdns540:0crwdne540:0", - "minwidth": "crwdns541:0crwdne541:0", + "minwidth": "crwdns2376:0crwdne2376:0", "minwidthwarn": "crwdns542:0crwdne542:0", + "fixwidth": "crwdns2378:0crwdne2378:0", + "fixwidthwarn": "crwdns2380:0crwdne2380:0", "above": "crwdns543:0crwdne543:0", "font": "crwdns544:0crwdne544:0", "fontwarn": "crwdns1900:0crwdne1900:0", @@ -26,6 +28,18 @@ "savefolder": "crwdns547:0crwdne547:0", "savefolderwarn": "crwdns548:0crwdne548:0", "absolute": "crwdns549:0crwdne549:0", + "themeSel": "crwdns2422:0crwdne2422:0", + "customtheme": "crwdns2424:0crwdne2424:0", + "customthemeDirection": "crwdns2426:0crwdne2426:0", + "primary": "crwdns2428:0crwdne2428:0", + "secondarycolor": "crwdns2430:0crwdne2430:0", + "text": "crwdns2432:0crwdne2432:0", + "accent": "crwdns2434:0crwdne2434:0", + "add_new": "crwdns2436:0crwdne2436:0", + "name": "crwdns2438:0crwdne2438:0", + "desc": "crwdns2440:0crwdne2440:0", + "customShare": "crwdns2442:0crwdne2442:0", + "customImport": "crwdns2444:0crwdne2444:0", "timeline": "crwdns550:0crwdne550:0", "timemode": "crwdns551:0crwdne551:0", "relativetime": "crwdns552:0crwdne552:0", @@ -65,6 +79,7 @@ "imgheight": "crwdns586:0crwdne586:0", "ticker": "crwdns1908:0crwdne1908:0", "tickerwarn": "crwdns1910:0crwdne1910:0", + "animation": "crwdns2446:0crwdne2446:0", "post": "crwdns587:0crwdne587:0", "autocw": "crwdns588:0crwdne588:0", "autocwwarn": "crwdns589:0crwdne589:0", @@ -107,6 +122,8 @@ "useerempwarn": "crwdns622:0crwdne622:0", "empcolorwarn": "crwdns623:0crwdne623:0", "spotify": "crwdns624:0crwdne624:0", + "npProvider": "crwdns2354:0crwdne2354:0", + "npPeoviderWarn": "crwdns2356:0crwdne2356:0", "spotifynote1": "crwdns625:0crwdne625:0", "spotifynote2": "crwdns626:0crwdne626:0", "link": "crwdns627:0crwdne627:0", @@ -115,8 +132,9 @@ "disconnect": "crwdns630:0crwdne630:0", "templeteedit": "crwdns631:0crwdne631:0", "templeteeditwarn": "crwdns632:0crwdne632:0", - "templete1": "crwdns633:0{song}crwdnd633:0{album}crwdnd633:0{artist}crwdnd633:0{url}crwdne633:0", - "templete2": "crwdns634:0{url}crwdnd634:0{composer}crwdnd634:0{hz}crwdnd634:0{bitRate}crwdnd634:0{genre}crwdne634:0", + "templete1": "crwdns2358:0{song}crwdnd2358:0{album}crwdnd2358:0{artist}crwdnd2358:0{url}crwdne2358:0", + "templete2": "crwdns2360:0{song}crwdnd2360:0{album}crwdnd2360:0{artist}crwdnd2360:0{composer}crwdnd2360:0{hz}crwdnd2360:0{bitRate}crwdnd2360:0{genre}crwdne2360:0", + "templete3": "crwdns2362:0{song}crwdnd2362:0{album}crwdnd2362:0{artist}crwdne2362:0", "postartwork": "crwdns635:0crwdne635:0", "tts": "crwdns636:0crwdne636:0", "speed": "crwdns637:0crwdne637:0", diff --git a/app/view/make/language/update.ps.json b/app/view/make/language/update.ps.json index 5c4d2d51..29bbc99e 100644 --- a/app/view/make/language/update.ps.json +++ b/app/view/make/language/update.ps.json @@ -2,7 +2,8 @@ "updatehere": "crwdns669:0crwdne669:0", "download": "crwdns670:0crwdne670:0", "portable": "crwdns1950:0crwdne1950:0", - "winzip": "crwdns672:0crwdne672:0", + "installer": "crwdns2382:0crwdne2382:0", + "snap": "crwdns2384:0crwdne2384:0", "unrewrite": "crwdns673:0crwdne673:0", "sureupd": "crwdns674:0crwdne674:0", "skipupd": "crwdns675:0crwdne675:0", diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html index a19bb63d..a7c3004b 100644 --- a/app/view/make/setting.sample.html +++ b/app/view/make/setting.sample.html @@ -17,7 +17,7 @@ - + @@ -34,6 +34,7 @@
{{setlang}}
+ To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.
{{langlist}}
{{backup}}
@@ -118,12 +119,12 @@
-
Primary
{{primary}} +
Primary
{{secondarycolor}}
-
Secondary
{{secondarycolor}} +
Secondary
{{primary}}
@@ -138,7 +139,7 @@
-
+  


{{customShare}}

{{customImport}}

diff --git a/app/view/ps/index.html b/app/view/ps/index.html index fe4afab2..67129db8 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -54,7 +54,7 @@ var tlid=0;
-
{{post-new}}
+
crwdns2402:0crwdne2402:0
@@ -182,13 +182,13 @@ var tlid=0; crwdns1880:0crwdne1880:0
  • - crwdns1882:0crwdne1882:0 + crwdns2404:0crwdne2404:0
  • crwdns1884:0crwdne1884:0
  • - {{poll}} + crwdns2406:0crwdne2406:0
    • @@ -259,7 +259,7 @@ var tlid=0;
    @@ -267,14 +267,14 @@ var tlid=0; WIP
    - - - - + + + + -
    +
    -
    +
    crwdns507:0crwdne507:0 crwdns508:0crwdne508:0 crwdns509:0crwdne509:0 diff --git a/app/view/ps/setting.html b/app/view/ps/setting.html index 3da0524f..eef5761e 100644 --- a/app/view/ps/setting.html +++ b/app/view/ps/setting.html @@ -17,7 +17,7 @@ - + @@ -34,6 +34,7 @@
    crwdns530:0crwdne530:0
    + To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.
    日本語(Japanese)/English/Crowdin web translate/
    crwdns531:0crwdne531:0
    @@ -52,12 +53,12 @@
    -
    crwdns541:0crwdne541:0
    crwdns542:0crwdne542:0 +
    crwdns2376:0crwdne2376:0
    crwdns542:0crwdne542:0
    pxcrwdns543:0crwdne543:0
    -
    {{fixwidth}}
    {{fixwidthwarn}} +
    crwdns2378:0crwdne2378:0
    crwdns2380:0crwdne2380:0 pxcrwdns543:0crwdne543:0
    @@ -85,7 +86,7 @@ color_lenscrwdns534:0crwdne534:0
    -

    {{themeSel}}

    +

    crwdns2422:0crwdne2422:0

    @@ -101,47 +102,47 @@
    -

    {{customtheme}}

    -
    +

    crwdns2424:0crwdne2424:0

    +
    -
    {{name}}
    - -
    {{desc}}
    -
    -
    {{customthemeDirection}}
    +
    crwdns2438:0crwdne2438:0
    + +
    crwdns2440:0crwdne2440:0
    +
    +
    crwdns2426:0crwdne2426:0
    -
    Primary
    {{primary}} +
    Primary
    crwdns2430:0crwdne2430:0
    -
    Secondary
    {{secondarycolor}} +
    Secondary
    crwdns2428:0crwdne2428:0
    -
    Texts
    {{text}} +
    Texts
    crwdns2432:0crwdne2432:0
    -
    Accent
    {{accent}} +
    Accent
    crwdns2434:0crwdne2434:0
    -
    +  


    - {{customShare}} -

    {{customImport}}

    + crwdns2442:0crwdne2442:0 +

    crwdns2444:0crwdne2444:0

    {{cImpWarn}}

    @@ -241,7 +242,7 @@
    -
    {{animation}}
    +
    crwdns2446:0crwdne2446:0
    @@ -381,8 +382,8 @@ crwdns624:0crwdne624:0
    -
    {{npProvider}}
    - {{npPeoviderWarn}}
    +
    crwdns2354:0crwdne2354:0
    + crwdns2356:0crwdne2356:0
    @@ -407,9 +408,9 @@ crwdns632:0crwdne632:0

    - crwdns633:0{song}crwdnd633:0{album}crwdnd633:0{artist}crwdnd633:0{url}crwdne633:0
    - crwdns634:0{url}crwdnd634:0{composer}crwdnd634:0{hz}crwdnd634:0{bitRate}crwdnd634:0{genre}crwdne634:0
    - {{templete3}}
    + crwdns2358:0{song}crwdnd2358:0{album}crwdnd2358:0{artist}crwdnd2358:0{url}crwdne2358:0
    + crwdns2360:0{song}crwdnd2360:0{album}crwdnd2360:0{artist}crwdnd2360:0{composer}crwdnd2360:0{hz}crwdnd2360:0{bitRate}crwdnd2360:0{genre}crwdne2360:0
    + crwdns2362:0{song}crwdnd2362:0{album}crwdnd2362:0{artist}crwdne2362:0
    CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。
    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。
    diff --git a/app/view/ps/update.html b/app/view/ps/update.html index 7f194588..bbc0993a 100644 --- a/app/view/ps/update.html +++ b/app/view/ps/update.html @@ -78,9 +78,9 @@ a,button,input,label,i{

    crwdns669:0crwdne669:0

    →

    - + - {{snap}}
     + crwdns2384:0crwdne2384:0