Skip to content

Update language spanish, add placeholders in signup, add behavior fromWhere #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update language spanish, add placeholders in signup, add behavior fromWhere #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b24173
Update signIn.html
Oct 10, 2014
b61f5af
Update signUp.html
Oct 10, 2014
a13ebba
Update spanish.coffee
Oct 10, 2014
153c1ef
Update entry.coffee
Oct 10, 2014
ab24dd1
Update signIn.coffee
Oct 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/entry.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ AccountsEntry =
entrySignUp: '/sign-up'
extraSignUpFields: []
showOtherLoginServices: true
fromWhere:false

isStringEmail: (email) ->
emailPattern = /^([\w.-]+)@([\w.-]+)\.([a-zA-Z.]{2,6})$/i
Expand Down
10 changes: 5 additions & 5 deletions client/t9n/spanish.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ es =
signOut: "Salir"
signUp: "Suscribir"
OR: "O"
forgotPassword: "Contraseña olvidada?"
forgotPassword: "¿Contraseña olvidada?"
emailAddress: "Dirección de Email"
emailResetLink: "Reiniciar Email"
dontHaveAnAccount: "No tenés una cuenta?"
dontHaveAnAccount: "¿No tenés una cuenta?"
resetYourPassword: "Resetear tu contraseña"
updateYourPassword: "Actualizar tu contraseña"
password: "Contraseña"
Expand All @@ -16,10 +16,10 @@ es =
signUpWithYourEmailAddress: "Suscribir con tu email"
username: "Usuario"
optional: "Opcional"
signupCode: "Codigo para suscribir"
clickAgree: "Si haces clic en Sucribir estas de acuerdo con la"
signupCode: "Código para suscribir"
clickAgree: "Si haces clic en Suscribir estas de acuerdo con la"
privacyPolicy: "Póliza de Privacidad"
terms: "Terminos de Uso"
terms: "Términos de Uso"
sign: "Ingresar"
configure: "Disposición"
with: "con"
Expand Down
2 changes: 1 addition & 1 deletion client/views/signIn/signIn.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ AccountsEntry.entrySignInEvents = {
Session.set('password', undefined)
if error
T9NHelper.accountsError error
else if Session.get('fromWhere')
else if Session.get('fromWhere') and AccountsEntry.settings.fromWhere
Router.go Session.get('fromWhere')
Session.set('fromWhere', undefined)
else
Expand Down
2 changes: 1 addition & 1 deletion client/views/signIn/signIn.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h3>{{t9n "signIn"}}</h3>
{{#if passwordLoginService}}
<form class="entry-form" id='signIn'>
<div class="form-group">
<input autofocus name="email" type="{{emailInputType}}" class="form-control" value='{{email}}' placeholder="{{emailPlaceholder}}">
<input autofocus name="email" type="{{emailInputType}}" class="form-control" value='{{email}}' placeholder="{{t9n 'email'}}">
</div>
<div class="form-group">
<input name="password" type="password" class="form-control" value='{{password}}' placeholder="{{t9n 'password'}}">
Expand Down
10 changes: 5 additions & 5 deletions client/views/signUp/signUp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,30 +32,30 @@ <h3>{{t9n "createAccount"}}</h3>
{{#if showUsername}}
<div class="form-group">
<label>{{t9n "username"}}</label>
<input autofocus name="username" type="string" class="form-control" value=''>
<input autofocus name="username" type="string" class="form-control" value='' placeholder="{{t9n 'username'}}">
</div>
{{/if}}

{{#if showEmail}}
<div class="form-group">
<label>{{t9n "emailAddress"}}</label>
{{#if showUsername}}
<input type="email" class="form-control" value='{{emailAddress}}'>
<input type="email" class="form-control" value='{{emailAddress}}' placeholder="{{t9n 'email'}}">
{{else}}
<input autofocus type="email" class="form-control" value='{{emailAddress}}'>
<input autofocus type="email" class="form-control" value='{{emailAddress}}' placeholder="{{t9n 'email'}}">
{{/if}}
</div>
{{/if}}

<div class="form-group">
<label>{{t9n "password"}}</label>
<input type="password" class="form-control" value=''>
<input type="password" class="form-control" value='' placeholder="{{t9n 'password'}}">
</div>

{{#if showSignupCode}}
<div class="form-group">
<label>{{t9n "signupCode"}}</label>
<input name="signupCode" type="string" class="form-control" value=''>
<input name="signupCode" type="string" class="form-control" value='' placeholder="{{t9n 'signupCode'}}">
</div>
{{/if}}

Expand Down