Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
birger
users
Commits
942de3f0
Commit
942de3f0
authored
Aug 19, 2018
by
o@immerda.ch
Browse files
submit lang on signup
parent
431bb9ec
Changes
9
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/signup.coffee
View file @
942de3f0
...
...
@@ -4,3 +4,4 @@
/
/=
require
zxcvbn
//
=
require
pwstrength
//
=
require
signup_helpers
//
=
require
pwhelp
app/controllers/concerns/api_backend.rb
View file @
942de3f0
...
...
@@ -158,6 +158,7 @@ module ApiBackend
"invite"
=>
invite
,
"recovery_email"
=>
recovery_email
,
"keep_recovery_token"
=>
keep_recovery_token
,
"language"
=>
I18n
.
locale
,
})
end
...
...
app/views/password
/
_help_de.html.erb
→
app/views/
application/_
password_help_de.html.erb
View file @
942de3f0
File moved
app/views/password
/
_help_en.html.erb
→
app/views/
application/_
password_help_en.html.erb
View file @
942de3f0
File moved
app/views/password/show.html.erb
View file @
942de3f0
<h4><a
id=
"pw-help-toggle"
href=
"#"
>
<%=
t
(
:password_help
)
%>
</a></h4>
<div
id=
"pw-help"
style=
"display:none;"
>
<%=
render
"help_
#{
I18n
.
locale
}
"
rescue
render
'help_en'
%>
<%=
render
"
password_
help_
#{
I18n
.
locale
}
"
rescue
render
'help_en'
%>
<hr
/>
</div>
...
...
app/views/signup/create.html.erb
View file @
942de3f0
...
...
@@ -38,6 +38,14 @@
</table>
<%=
t
:recovery_email_short_help
%>
<br
/>
<br
/>
<h4><a
id=
"pw-help-toggle"
href=
"#"
>
<%=
t
(
:password_help
)
%>
</a></h4>
<div
id=
"pw-help"
style=
"display:none;"
>
<%=
render
"password_help_
#{
I18n
.
locale
}
"
rescue
render
'help_en'
%>
<hr
/>
</div>
<p>
<div
id=
"keep_recovery_token_question"
>
<br
/>
...
...
app/views/signup/success.html.erb
View file @
942de3f0
...
...
@@ -37,7 +37,6 @@
<p>
<ul
class=
"menu"
>
<li>
<%=
link_to
t
(
:main_title
),
root_path
%>
</li>
<li><a
href=
"https://immerda.ch"
>
immerda.ch
</a></li>
<li><a
href=
"https://webmail.immerda.ch"
>
Webmail
</a></li>
</ul>
</p>
config/locales/de.yml
View file @
942de3f0
...
...
@@ -58,7 +58,7 @@ de:
signup_success
:
"
Konto
erfolgreich
erstellt"
check_token_failed
:
"
Ungültiger
Einladungstoken!"
invalid_alias_domain
:
"
Ungültige
Emailadresse"
main_title
:
"
Immerda
Konto
Verwalt
ung"
main_title
:
"
Immerda
Konto
einstell
ung
en
"
new_account_intro1
:
"
Dein
Konto
ist
erstellt!
Hier
ein
paar
infos"
new_account_intro_token
:
"
Deine
Mails
sind
auf
dem
Server
mit
deinem
Passwort
gesichert
abgelegt.
Wenn
du
es
vergisst,
brauchst
du
einen
Wiederherstellungscode,
um
sie
wieder
lesen
zu
können."
new_account_intro_token_display
:
"
Kopiere
den
Code
jetzt
und
bewahre
ihn
sicher
auf."
...
...
config/locales/en.yml
View file @
942de3f0
...
...
@@ -58,7 +58,7 @@ en:
signup_success
:
"
Account
successfully
created"
check_token_failed
:
"
Invalid
Invitation
token!"
invalid_alias_domain
:
"
Invalid
emailaddress"
main_title
:
"
Immerda
Account
Management
"
main_title
:
"
Immerda
Account
Settings
"
new_account_intro1
:
"
Your
account
is
now
ready!
Here
some
things
to
consider"
new_account_intro_token
:
"
On
our
servers
your
messages
are
secured
by
your
password.
If
you
foget
your
password,
you
need
a
recovery
token
to
regain
access
to
old
messages."
new_account_intro_token_display
:
"
Copy
the
token
now
and
store
it
safely."
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment