diff --git a/app/views/users/registrations/new.html.haml b/app/views/users/registrations/new.html.haml index 1d1c5d58e..6661623f2 100644 --- a/app/views/users/registrations/new.html.haml +++ b/app/views/users/registrations/new.html.haml @@ -17,13 +17,11 @@  ? .email-suggestion-answer = button_tag type: 'button', class: 'button small', onclick: "DS.acceptEmailSuggestion()" do - = t('simple_form.yes') + = t('utils.yes') = button_tag type: 'button', class: 'button small', onclick: "DS.discardEmailSuggestionBox()" do - = t('simple_form.no') + = t('utils.no') = f.label :password, t('views.registrations.new.password_label', min_length: PASSWORD_MIN_LENGTH), id: :user_password_label = f.password_field :password, autocomplete: 'new-password', value: @user.password, placeholder: t('views.registrations.new.password_placeholder', min_length: PASSWORD_MIN_LENGTH), 'aria-describedby': :user_password_label = f.submit t('views.shared.account.create'), class: "button large primary expand" - - diff --git a/config/locales/en.yml b/config/locales/en.yml index ae210882e..4cf327266 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -32,6 +32,8 @@ en: help: 'Help' utils: + 'yes': Yes + 'no': No deconnexion: "Log out" pj: "Attachments" asterisk_html: Fields marked by an asterisk ( * ) are mandatory. diff --git a/config/locales/fr.yml b/config/locales/fr.yml index a74388d3f..6f50099de 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -22,6 +22,8 @@ fr: help: 'Aide' utils: + 'yes': Oui + 'no': Non deconnexion: "Déconnexion" pj: "Pièces jointes" asterisk_html: Les champs suivis d’un astérisque ( * ) sont obligatoires. diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml deleted file mode 100644 index 7f24a9bdc..000000000 --- a/config/locales/simple_form.en.yml +++ /dev/null @@ -1,31 +0,0 @@ -en: - simple_form: - "yes": 'Yes' - "no": 'No' - required: - text: 'required' - mark: '*' - # You can uncomment the line below if you need to overwrite the whole required html. - # When using html, text and mark won’t be used. - # html: '*' - error_notification: - default_message: "Please review the problems below:" - # Examples - # labels: - # defaults: - # password: 'Password' - # user: - # new: - # email: 'E-mail to sign in.' - # edit: - # email: 'E-mail.' - # hints: - # defaults: - # username: 'User name to sign in.' - # password: 'No special characters, please.' - # include_blanks: - # defaults: - # age: 'Rather not say' - # prompts: - # defaults: - # age: 'Select your age' diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml deleted file mode 100644 index 73dbc13fc..000000000 --- a/config/locales/simple_form.fr.yml +++ /dev/null @@ -1,31 +0,0 @@ -fr: - simple_form: - "yes": 'Oui' - "no": 'Non' - required: - text: 'obligatoire' - mark: '*' - # You can uncomment the line below if you need to overwrite the whole required html. - # When using html, text and mark won't be used. - # html: '*' - error_notification: - default_message: "Erreur, veuillez vérifier vos réponses:" - # Examples - # labels: - # defaults: - # password: 'Password' - # user: - # new: - # email: 'E-mail to sign in.' - # edit: - # email: 'E-mail.' - # hints: - # defaults: - # username: 'User name to sign in.' - # password: 'No special characters, please.' - # include_blanks: - # defaults: - # age: 'Rather not say' - # prompts: - # defaults: - # age: 'Select your age'