graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 18:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2282 from sei0o/improve-login-failed-message

Browse source 
ログイン失敗時のメッセージを改善
This commit is contained in:
syuilo 2018-08-17 13:19:41 +09:00 committed by GitHub
commit 77d82d2d17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
locales/en.yml
View file

@ -287,6 +287,7 @@ common/views/components/signin.vue:
signin: "Sign in" signin: "Sign in"
or: "Or" or: "Or"
signin-with-twitter: "Log in with Twitter" 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: common/views/components/signup.vue:
username: "Username" username: "Username"
checking: "Confirming..." checking: "Confirming..."

1
locales/ja.yml
View file

@ -314,6 +314,7 @@ common/views/components/signin.vue:
signin: "サインイン" signin: "サインイン"
or: "または" or: "または"
signin-with-twitter: "Twitterでログイン" signin-with-twitter: "Twitterでログイン"
login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
common/views/components/signup.vue: common/views/components/signup.vue:
username: "ユーザー名" username: "ユーザー名"

2
src/client/app/common/views/components/signin.vue
View file

@ -60,7 +60,7 @@ export default Vue.extend({
}).then(() => { }).then(() => {
location.reload(); location.reload();
}).catch(() => { }).catch(() => {
alert('something happened'); alert('%i18n:@login-failed%');
this.signing = false; this.signing = false;
}); });
} }