Merge pull request #33 from cutls/WIP-(before-CI)

TheDesk Usamin (18.0.3)

app/js/post/secure.js

@@ -60,7 +60,7 @@ function loadVis(){
 					memory = "public";
 				}
 				vis(memory);
-			} else if(vist == "server") {
+			} else if(vist == "useapi") {
 				var acct_id = $("#post-acct-sel").val();
 				var multi = localStorage.getItem("multi");
 				var obj = JSON.parse(multi);

app/js/ui/layout.js

@@ -54,8 +54,7 @@ function parseColumn() {
 	}
 	var acctlist=obj;
 	console.log(obj);
-	/*
+	/*var xed=localStorage.getItem("xed");
-var xed=localStorage.getItem("xed");
 	if(xed){
 		xpand();
 	}*/

app/js/ui/settings.js

@@ -89,17 +89,23 @@ function load() {
 	var max=envView.config.length;
 	for(var i=0;i<max;i++){
 		var ls=envView.config[i].storage;
-		envView.config[i].setValue=localStorage.getItem(ls)
+		if(localStorage.getItem(ls)){
+			envView.config[i].setValue=localStorage.getItem(ls)
+		}
 	}
 	var max=tlView.config.length;
 	for(var i=0;i<max;i++){
 		var ls=tlView.config[i].storage;
-		tlView.config[i].setValue=localStorage.getItem(ls)
+		if(localStorage.getItem(ls)){
+			tlView.config[i].setValue=localStorage.getItem(ls)
+		}
 	}
 	var max=postView.config.length;
 	for(var i=0;i<max;i++){
 		var ls=postView.config[i].storage;
-		postView.config[i].setValue=localStorage.getItem(ls)
+		if(localStorage.getItem(ls)){
+			postView.config[i].setValue=localStorage.getItem(ls)
+		}
 	}
 	if(localStorage.getItem("imas")){
 		$(".imas").removeClass("hide");

app/main.js

@@ -60,14 +60,15 @@ try {
 try {
 	var lang = fs.readFileSync(lang_path, 'utf8');
 } catch (e) {
-	var lang=app.getLocale();
+	var langs=app.getLocale();
-	if(~lang.indexOf("ja")){
+	if(~langs.indexOf("ja")){
 		lang="ja";
 	}else{
 		lang="en";
 	}
 	fs.writeFileSync(lang_path,lang);
 }
+console.log(app.getLocale());
 console.log("launch:"+lang);
 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function() {

app/view/en/setting.vue.js

@@ -273,7 +273,7 @@ var tlConstruction=[
         setValue:"no",
         text:{
             head:"Enable #InstanceTicker",
-            desc:'Show colorful stickers about tooters' server. <a href="https://cdn.weep.me/mastodon/">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.',
+            desc:'Show colorful stickers about the server. <a href="https://cdn.weep.me/mastodon/">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.',
             checkbox:yesno
         }
     },{

app/view/make/language/setting.en.json

@@ -82,7 +82,7 @@
     "or":"or",
     "imgheight":"Height of images",
     "ticker":"Enable #InstanceTicker",
-    "tickerwarn":"Show colorful stickers about tooters' server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+    "tickerwarn":"Show colorful stickers about the server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
     "animation":"Animation of timelines",
     "post":"Posting Preferences",
     "autocw":"Alert before posting a long toot.",