krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

adjust wording on new client's register and login screens (#8958)

Browse Source
This commit is contained in:
Alys
2017-08-22 23:56:56 +10:00
committed by GitHub
parent 798d0ab82b
commit e5a92f64c0
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
website/client/components/auth/registerLogin.vue
View File

@@ -17,10 +17,13 @@
.col-6 .col-6
.btn.btn-secondary.social-button(@click='socialAuth("google")', v-once) .btn.btn-secondary.social-button(@click='socialAuth("google")', v-once)
.svg-icon.social-icon(v-html="icons.googleIcon") .svg-icon.social-icon(v-html="icons.googleIcon")
.text {{this.registering ? $t('signUpWithSocial', {social: 'Google'}) : $t('loginWithSocial', {social: 'Google'})}} span {{this.registering ? $t('signUpWithSocial', {social: 'Google'}) : $t('loginWithSocial', {social: 'Google'})}}
.form-group .form-group(v-if='registering')
label(for='usernameInput', v-once) {{$t('username')}} label(for='usernameInput', v-once) {{$t('username')}}
input#usernameInput.form-control(type='text', :placeholder='$t("usernamePlaceholder")', v-model='username') input#usernameInput.form-control(type='text', :placeholder='$t("usernamePlaceholder")', v-model='username')
.form-group(v-if='!registering')
label(for='usernameInput', v-once) {{$t('emailOrUsername')}}
input#usernameInput.form-control(type='text', :placeholder='$t("emailPlaceholder")', v-model='username')
.form-group(v-if='registering') .form-group(v-if='registering')
label(for='emailInput', v-once) {{$t('email')}} label(for='emailInput', v-once) {{$t('email')}}
input#emailInput.form-control(type='email', :placeholder='$t("emailPlaceholder")', v-model='email') input#emailInput.form-control(type='email', :placeholder='$t("emailPlaceholder")', v-model='email')
@@ -33,10 +36,10 @@
small.form-text(v-once, v-html="$t('termsAndAgreement')") small.form-text(v-once, v-html="$t('termsAndAgreement')")
.text-center .text-center
.btn.btn-info(@click='register()', v-if='registering', v-once) {{$t('joinHabitica')}} .btn.btn-info(@click='register()', v-if='registering', v-once) {{$t('joinHabitica')}}
.btn.btn-info(@click='login()', v-if='!registering', v-once) {{$t('alreadyHaveAccountLogin')}} .btn.btn-info(@click='login()', v-if='!registering', v-once) {{$t('login')}}
.toggle-links .toggle-links
router-link(:to="{name: 'login'}", v-if='registering', exact) router-link(:to="{name: 'login'}", v-if='registering', exact)
a.toggle-link(v-once) {{ $t('login') }} a.toggle-link(v-once) {{ $t('alreadyHaveAccountLogin') }}
router-link(:to="{name: 'register'}", v-if='!registering', exact) router-link(:to="{name: 'register'}", v-if='!registering', exact)
a.toggle-link(v-once) Don't have an account? Join Habitica! a.toggle-link(v-once) Don't have an account? Join Habitica!

3
website/common/locales/en/front.json
View File

@@ -189,7 +189,8 @@
"unlockByline2": "Unlock new motivational tools, such as pet collecting, random rewards, spell-casting, and more!", "unlockByline2": "Unlock new motivational tools, such as pet collecting, random rewards, spell-casting, and more!",
"unlockHeadline": "As you stay productive, you unlock new content!", "unlockHeadline": "As you stay productive, you unlock new content!",
"useUUID": "Use UUID / API Token (For Facebook Users)", "useUUID": "Use UUID / API Token (For Facebook Users)",
"username": "Username", "username": "Login Name",
"emailOrUsername": "Email or Login Name",
"watchVideos": "Watch Videos", "watchVideos": "Watch Videos",
"work": "Work", "work": "Work",
"zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!", "zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",

2
website/common/locales/en/newClient.json
View File

@@ -121,7 +121,7 @@
"loginWithSocial": "Login with <%= social %>", "loginWithSocial": "Login with <%= social %>",
"confirmPassword": "Confirm Password", "confirmPassword": "Confirm Password",
"usernamePlaceholder": "e.g., HabitRabbit", "usernamePlaceholder": "e.g., HabitRabbit",
"emailPlaceholder": "e.g., rabbit@habitica.com", "emailPlaceholder": "e.g., rabbit@example.com",
"passwordPlaceholder": "e.g., •••••••••••• ", "passwordPlaceholder": "e.g., •••••••••••• ",
"confirmPasswordPlaceholder": "Make sure it’s the same password!", "confirmPasswordPlaceholder": "Make sure it’s the same password!",
"termsAndAgreement": "By clicking the button below, you are indicating that you have read and agree to the <a href='/static/terms'>Terms of Service</a> and <a href='/static/privacy'>Privacy Policy</a>.", "termsAndAgreement": "By clicking the button below, you are indicating that you have read and agree to the <a href='/static/terms'>Terms of Service</a> and <a href='/static/privacy'>Privacy Policy</a>.",