refs #982 Add notice in login for users who use proxy server

This commit is contained in:
AkiraFukushima 2019-11-04 22:30:52 +09:00
parent b677a706ec
commit 2c811ce9a7
9 changed files with 36 additions and 0 deletions

View File

@ -79,5 +79,9 @@
"follow_request_accept_error": "Failed to accept the request",
"follow_reuqest_reject_error": "failed to reject the request",
"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"
}
}

View File

@ -376,6 +376,8 @@
},
"login": {
"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",
"login": "Login"
},

View File

@ -34,5 +34,9 @@
},
"save": "Save"
}
},
"login": {
"proxy_info": "If you want to use proxy server, please setup your proxy in",
"proxy_here": " here"
}
}

View File

@ -99,5 +99,9 @@
"title": "Reblog",
"body": "{{username}} boosted your status"
}
},
"login": {
"proxy_info": "If you want to use proxy server, please setup your proxy in",
"proxy_here": " here"
}
}

View File

@ -376,6 +376,8 @@
},
"login": {
"domain_name_label": "ドメイン名を入力してマストドンにログインしてください.",
"proxy_info": "もしプロキシを利用する場合は",
"proxy_here": "こちら.",
"search": "検索",
"login": "ログイン"
},

View File

@ -117,5 +117,9 @@
"title": "Reblog",
"body": "{{username}} boosted your status"
}
},
"login": {
"proxy_info": "If you want to use proxy server, please setup your proxy in",
"proxy_here": " here"
}
}

View File

@ -138,5 +138,9 @@
"title": "Reblog",
"body": "{{username}} boosted your status"
}
},
"login": {
"proxy_info": "If you want to use proxy server, please setup your proxy in",
"proxy_here": " here"
}
}

View File

@ -34,5 +34,9 @@
},
"save": "Save"
}
},
"login": {
"proxy_info": "If you want to use proxy server, please setup your proxy in",
"proxy_here": " here"
}
}

View File

@ -11,6 +11,9 @@
<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-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 -->
<el-form-item class="hidden">
<el-input></el-input>
@ -165,5 +168,10 @@ export default {
.hidden {
display: none;
}
.proxy-info {
color: #dcdfe6;
margin-bottom: 24px;
}
}
</style>