Commit 32586f28 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'Externalise-strings-in-_form.html.haml' into 'master'

Externalise strings in /users/_form.html.haml

See merge request gitlab-org/gitlab!58096
parents e604b277 3a8cfa27
......@@ -3,40 +3,38 @@
= form_errors(@user)
%fieldset
%legend Account
%legend= _('Account')
.form-group.row
.col-sm-2.col-form-label
= f.label :name
.col-sm-10
= f.text_field :name, required: true, autocomplete: 'off', class: 'form-control gl-form-input'
%span.help-inline * required
%span.help-inline * #{_('required')}
.form-group.row
.col-sm-2.col-form-label
= f.label :username
.col-sm-10
= f.text_field :username, required: true, autocomplete: 'off', autocorrect: 'off', autocapitalize: 'off', spellcheck: false, class: 'form-control gl-form-input'
%span.help-inline * required
%span.help-inline * #{_('required')}
.form-group.row
.col-sm-2.col-form-label
= f.label :email
.col-sm-10
= f.text_field :email, required: true, autocomplete: 'off', class: 'form-control gl-form-input'
%span.help-inline * required
%span.help-inline * #{_('required')}
- if @user.new_record?
%fieldset
%legend Password
%legend= _('Password')
.form-group.row
.col-sm-2.col-form-label
= f.label :password
.col-sm-10
%strong
Reset link will be generated and sent to the user.
%br
User will be forced to set the password on first sign in.
= _('Reset link will be generated and sent to the user. %{break} User will be forced to set the password on first sign in.').html_safe % { break: '<br />'.html_safe }
- else
%fieldset
%legend Password
%legend= _('Password')
.form-group.row
.col-sm-2.col-form-label
= f.label :password
......@@ -55,7 +53,7 @@
= render_if_exists 'admin/users/limits', f: f
%fieldset
%legend Profile
%legend= _('Profile')
.form-group.row
.col-sm-2.col-form-label
= f.label :avatar
......@@ -87,8 +85,8 @@
.form-actions
- if @user.new_record?
= f.submit 'Create user', class: "btn gl-button btn-confirm"
= link_to 'Cancel', admin_users_path, class: "gl-button btn btn-default btn-cancel"
= f.submit _('Create user'), class: "btn gl-button btn-confirm"
= link_to _('Cancel'), admin_users_path, class: "gl-button btn btn-default btn-cancel"
- else
= f.submit 'Save changes', class: "btn gl-button btn-confirm"
= link_to 'Cancel', admin_user_path(@user), class: "gl-button btn btn-default btn-cancel"
= f.submit _('Save changes'), class: "btn gl-button btn-confirm"
= link_to _('Cancel'), admin_user_path(@user), class: "gl-button btn btn-default btn-cancel"
---
title: Externalise strings in /admin/users/_form.html.haml
merge_request: 58096
author: nuwe1
type: other
......@@ -9334,6 +9334,9 @@ msgstr ""
msgid "Create tag %{tagName}"
msgstr ""
msgid "Create user"
msgstr ""
msgid "Create wildcard: %{searchTerm}"
msgstr ""
......@@ -27234,6 +27237,9 @@ msgstr ""
msgid "Reset key"
msgstr ""
msgid "Reset link will be generated and sent to the user. %{break} User will be forced to set the password on first sign in."
msgstr ""
msgid "Reset password"
msgstr ""
......@@ -38197,6 +38203,9 @@ msgstr[1] ""
msgid "repository:"
msgstr ""
msgid "required"
msgstr ""
msgid "reset it."
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment