summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-08-17 13:19:41 +0900
committerGitHub <noreply@github.com>2018-08-17 13:19:41 +0900
commit77d82d2d173d02add50b56c907c0d41103f4a030 (patch)
tree1aec1d0f69d92b1fb4067e874f3182632b67ee49
parentMerge pull request #2278 from mei23/mei-0817-announce3 (diff)
parentログイン失敗時のメッセージを改善 (diff)
downloadmisskey-77d82d2d173d02add50b56c907c0d41103f4a030.tar.gz
misskey-77d82d2d173d02add50b56c907c0d41103f4a030.tar.bz2
misskey-77d82d2d173d02add50b56c907c0d41103f4a030.zip
Merge pull request #2282 from sei0o/improve-login-failed-message
ログイン失敗時のメッセージを改善
-rw-r--r--locales/en.yml1
-rw-r--r--locales/ja.yml1
-rw-r--r--src/client/app/common/views/components/signin.vue2
3 files changed, 3 insertions, 1 deletions
diff --git a/locales/en.yml b/locales/en.yml
index cbf64b2be9..ba6adfbca1 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -287,6 +287,7 @@ common/views/components/signin.vue:
signin: "Sign in"
or: "Or"
signin-with-twitter: "Log in with Twitter"
+ login-failed: "Log in failed. Make sure you have entered your correct username and password."
common/views/components/signup.vue:
username: "Username"
checking: "Confirming..."
diff --git a/locales/ja.yml b/locales/ja.yml
index 888fb08c96..310a73a64e 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -314,6 +314,7 @@ common/views/components/signin.vue:
signin: "サインイン"
or: "または"
signin-with-twitter: "Twitterでログイン"
+ login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
common/views/components/signup.vue:
username: "ユーザー名"
diff --git a/src/client/app/common/views/components/signin.vue b/src/client/app/common/views/components/signin.vue
index cdfc75971c..0c3cceb1b3 100644
--- a/src/client/app/common/views/components/signin.vue
+++ b/src/client/app/common/views/components/signin.vue
@@ -60,7 +60,7 @@ export default Vue.extend({
}).then(() => {
location.reload();
}).catch(() => {
- alert('something happened');
+ alert('%i18n:@login-failed%');
this.signing = false;
});
}