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
9eaefa3b
Commit
9eaefa3b
authored
Jul 19, 2019
by
o@immerda.ch
Browse files
recovery token wording
parent
2d052b88
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/controllers/sessions_controller.rb
View file @
9eaefa3b
...
...
@@ -41,11 +41,11 @@ class SessionsController < ApplicationController
res
=
api
.
account_properties
if
res
[
'mail_crypt_enabled'
]
&&
if
res
[
'locked'
]
flash
[
:notice
]
=
:locked_account_hint
elsif
res
[
'mail_crypt_enabled'
]
&&
res
[
'mail_crypt_recovery_token_present'
]
flash
[
:notice
]
=
:recovery_token_hint
elsif
res
[
'locked'
]
flash
[
:notice
]
=
:locked_account_hint
elsif
res
[
'mail_crypt_enabled'
]
&&
!
session
[
:recovery_email_set
]
# TODO: add translations
...
...
config/locales/de.yml
View file @
9eaefa3b
...
...
@@ -23,7 +23,7 @@ de:
recovery_token_hint
:
"
Wir
empfehlen
dir
einen
Wiederherstellungscode
zu
generieren"
backup_recovery_token_email
:
"
Sende
mir
d
en
Wiederherstellungscode
an
meine
Wiederherstellubngs
Email
Adresse
(nur
für
immerda
Wiederherstellungs
Adresse
möglich)."
backup_recovery_token_email
:
"
Sende
mir
ein
en
Wiederherstellungscode
an
meine
Wiederherstellubngs
Email
Adresse
(nur
für
immerda
Wiederherstellungs
Adresse
möglich)."
backup_recovery_token_keep
:
"
Ich
kann
den
Wiederherstellungscode
jetzt
gerade
nicht
aufbewahren
und
werde
ihn
später
generieren."
backup_recovery_token_delete
:
"
Ich
kann
den
Wiederherstellungscode
jetzt
sicher
aufbewahren."
...
...
config/locales/en.yml
View file @
9eaefa3b
...
...
@@ -23,7 +23,7 @@ en:
recovery_token_hint
:
"
We
recommend
you
generate
a
recovery
token"
backup_recovery_token_email
:
"
Send
me
my
recovery
token
to
my
recovery
email
address
(only
for
immerda
recovery
emails)."
backup_recovery_token_email
:
"
Send
me
a
recovery
token
to
the
recovery
email
address
(only
for
immerda
recovery
emails)."
backup_recovery_token_delete
:
"
I
can
safely
store
my
token."
backup_recovery_token_keep
:
"
I
can't
safely
store
the
token
right
now.
I
will
generate
one
later."
...
...
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