Merge pull request #1081 from h3poteto/iss-982
refs #982 Add notice in login for users who use proxy server
This commit is contained in:
commit
4dde913666
|
@ -79,5 +79,9 @@
|
||||||
"follow_request_accept_error": "Failed to accept the request",
|
"follow_request_accept_error": "Failed to accept the request",
|
||||||
"follow_reuqest_reject_error": "failed to reject the request",
|
"follow_reuqest_reject_error": "failed to reject the request",
|
||||||
"start_all_streamings_error": "Failed to start streaming of {{domain}}"
|
"start_all_streamings_error": "Failed to start streaming of {{domain}}"
|
||||||
|
},
|
||||||
|
"login": {
|
||||||
|
"proxy_info": "If you want to use proxy server, please setup your proxy in",
|
||||||
|
"proxy_here": " here"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -376,6 +376,8 @@
|
||||||
},
|
},
|
||||||
"login": {
|
"login": {
|
||||||
"domain_name_label": "First, let's log in to a Mastodon instance. Please enter an instance domain name.",
|
"domain_name_label": "First, let's log in to a Mastodon instance. Please enter an instance domain name.",
|
||||||
|
"proxy_info": "If you want to use proxy server, please setup your proxy in",
|
||||||
|
"proxy_here": " here",
|
||||||
"search": "Search",
|
"search": "Search",
|
||||||
"login": "Login"
|
"login": "Login"
|
||||||
},
|
},
|
||||||
|
|
|
@ -34,5 +34,9 @@
|
||||||
},
|
},
|
||||||
"save": "Save"
|
"save": "Save"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"login": {
|
||||||
|
"proxy_info": "If you want to use proxy server, please setup your proxy in",
|
||||||
|
"proxy_here": " here"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,5 +99,9 @@
|
||||||
"title": "Reblog",
|
"title": "Reblog",
|
||||||
"body": "{{username}} boosted your status"
|
"body": "{{username}} boosted your status"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"login": {
|
||||||
|
"proxy_info": "If you want to use proxy server, please setup your proxy in",
|
||||||
|
"proxy_here": " here"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -376,6 +376,8 @@
|
||||||
},
|
},
|
||||||
"login": {
|
"login": {
|
||||||
"domain_name_label": "ドメイン名を入力してマストドンにログインしてください.",
|
"domain_name_label": "ドメイン名を入力してマストドンにログインしてください.",
|
||||||
|
"proxy_info": "もしプロキシを利用する場合は",
|
||||||
|
"proxy_here": "こちら.",
|
||||||
"search": "検索",
|
"search": "検索",
|
||||||
"login": "ログイン"
|
"login": "ログイン"
|
||||||
},
|
},
|
||||||
|
|
|
@ -117,5 +117,9 @@
|
||||||
"title": "Reblog",
|
"title": "Reblog",
|
||||||
"body": "{{username}} boosted your status"
|
"body": "{{username}} boosted your status"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"login": {
|
||||||
|
"proxy_info": "If you want to use proxy server, please setup your proxy in",
|
||||||
|
"proxy_here": " here"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -138,5 +138,9 @@
|
||||||
"title": "Reblog",
|
"title": "Reblog",
|
||||||
"body": "{{username}} boosted your status"
|
"body": "{{username}} boosted your status"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"login": {
|
||||||
|
"proxy_info": "If you want to use proxy server, please setup your proxy in",
|
||||||
|
"proxy_here": " here"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,5 +34,9 @@
|
||||||
},
|
},
|
||||||
"save": "Save"
|
"save": "Save"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"login": {
|
||||||
|
"proxy_info": "If you want to use proxy server, please setup your proxy in",
|
||||||
|
"proxy_here": " here"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,9 @@
|
||||||
<el-form-item :label="$t('login.domain_name_label')" prop="domainName">
|
<el-form-item :label="$t('login.domain_name_label')" prop="domainName">
|
||||||
<el-input v-model="form.domainName" placeholder="mastodon.social" v-shortkey="['enter']" @shortkey.native="handleKey"></el-input>
|
<el-input v-model="form.domainName" placeholder="mastodon.social" v-shortkey="['enter']" @shortkey.native="handleKey"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<p class="proxy-info">
|
||||||
|
{{ $t('login.proxy_info') }}<router-link to="/preferences/network">{{ $t('login.proxy_here') }}</router-link>
|
||||||
|
</p>
|
||||||
<!-- Dummy form to guard submitting with enter -->
|
<!-- Dummy form to guard submitting with enter -->
|
||||||
<el-form-item class="hidden">
|
<el-form-item class="hidden">
|
||||||
<el-input></el-input>
|
<el-input></el-input>
|
||||||
|
@ -165,5 +168,10 @@ export default {
|
||||||
.hidden {
|
.hidden {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.proxy-info {
|
||||||
|
color: #dcdfe6;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue