Merge branch 'i18n-extract-app/views/doorkeeper' into 'master'
i18n: externalize strings from 'app/views/doorkeeper' See merge request gitlab-org/gitlab-ce!19695
This commit is contained in:
Rémy Coutable
commit
f73fb24449
|
|
@ -2,9 +2,9 @@
|
|||
= form_tag oauth_application_path(application) do
|
||||
%input{ :name => "_method", :type => "hidden", :value => "delete" }/
|
||||
- if defined? small
|
||||
= button_tag type: "submit", class: "btn btn-transparent", data: { confirm: "Are you sure?" } do
|
||||
= button_tag type: "submit", class: "btn btn-transparent", data: { confirm: _("Are you sure?") } do
|
||||
%span.sr-only
|
||||
Destroy
|
||||
= _('Destroy')
|
||||
= icon('trash')
|
||||
- else
|
||||
= submit_tag 'Destroy', data: { confirm: "Are you sure?" }, class: submit_btn_css
|
||||
= submit_tag _('Destroy'), data: { confirm: _("Are you sure?") }, class: submit_btn_css
|
||||
|
|
|
|||
|
|
@ -10,16 +10,14 @@
|
|||
= f.text_area :redirect_uri, class: 'form-control', required: true
|
||||
|
||||
%span.form-text.text-muted
|
||||
Use one line per URI
|
||||
= _('Use one line per URI')
|
||||
- if Doorkeeper.configuration.native_redirect_uri
|
||||
%span.form-text.text-muted
|
||||
Use
|
||||
%code= Doorkeeper.configuration.native_redirect_uri
|
||||
for local tests
|
||||
= _('Use <code>%{native_redirect_uri}</code> for local tests').html_safe % { native_redirect_uri: Doorkeeper.configuration.native_redirect_uri }
|
||||
|
||||
.form-group
|
||||
= f.label :scopes, class: 'label-light'
|
||||
= render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes
|
||||
|
||||
.prepend-top-default
|
||||
= f.submit 'Save application', class: "btn btn-create"
|
||||
= f.submit _('Save application'), class: "btn btn-create"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
- page_title "Edit", @application.name, "Applications"
|
||||
- page_title _("Edit"), @application.name, _("Applications")
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
%h3.page-title Edit application
|
||||
%h3.page-title= _('Edit application')
|
||||
= render 'form', application: @application
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
- page_title "Applications"
|
||||
- page_title _("Applications")
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
|
||||
.row.prepend-top-default
|
||||
|
|
@ -7,28 +7,27 @@
|
|||
= page_title
|
||||
%p
|
||||
- if user_oauth_applications?
|
||||
Manage applications that can use GitLab as an OAuth provider,
|
||||
and applications that you've authorized to use your account.
|
||||
= _("Manage applications that can use GitLab as an OAuth provider, and applications that you've authorized to use your account.")
|
||||
- else
|
||||
Manage applications that you've authorized to use your account.
|
||||
= _("Manage applications that you've authorized to use your account.")
|
||||
.col-lg-8
|
||||
- if user_oauth_applications?
|
||||
%h5.prepend-top-0
|
||||
Add new application
|
||||
= _('Add new application')
|
||||
= render 'form', application: @application
|
||||
%hr
|
||||
- if user_oauth_applications?
|
||||
.oauth-applications
|
||||
%h5
|
||||
Your applications (#{@applications.size})
|
||||
= _("Your applications (%{size})") % { size: @applications.size }
|
||||
- if @applications.any?
|
||||
.table-responsive
|
||||
%table.table
|
||||
%thead
|
||||
%tr
|
||||
%th Name
|
||||
%th Callback URL
|
||||
%th Clients
|
||||
%th= _('Name')
|
||||
%th= _('Callback URL')
|
||||
%th= _('Clients')
|
||||
%th.last-heading
|
||||
%tbody
|
||||
- @applications.each do |application|
|
||||
|
|
@ -41,25 +40,25 @@
|
|||
%td
|
||||
= link_to edit_oauth_application_path(application), class: "btn btn-transparent append-right-5" do
|
||||
%span.sr-only
|
||||
Edit
|
||||
= _('Edit')
|
||||
= icon('pencil')
|
||||
= render 'delete_form', application: application, small: true
|
||||
- else
|
||||
.settings-message.text-center
|
||||
You don't have any applications
|
||||
= _("You don't have any applications")
|
||||
.oauth-authorized-applications.prepend-top-20.append-bottom-default
|
||||
- if user_oauth_applications?
|
||||
%h5
|
||||
Authorized applications (#{@authorized_tokens.size})
|
||||
= _("Authorized applications (%{size})") % { size: @authorized_tokens.size }
|
||||
|
||||
- if @authorized_tokens.any?
|
||||
.table-responsive
|
||||
%table.table.table-striped
|
||||
%thead
|
||||
%tr
|
||||
%th Name
|
||||
%th Authorized At
|
||||
%th Scope
|
||||
%th= _('Name')
|
||||
%th= _('Authorized At')
|
||||
%th= _('Scope')
|
||||
%th
|
||||
%tbody
|
||||
- @authorized_apps.each do |app|
|
||||
|
|
@ -72,12 +71,12 @@
|
|||
- @authorized_anonymous_tokens.each do |token|
|
||||
%tr
|
||||
%td
|
||||
Anonymous
|
||||
= _('Anonymous')
|
||||
.form-text.text-muted
|
||||
%em Authorization was granted by entering your username and password in the application.
|
||||
%em= _("Authorization was granted by entering your username and password in the application.")
|
||||
%td= token.created_at
|
||||
%td= token.scopes
|
||||
%td= render 'doorkeeper/authorized_applications/delete_form', token: token
|
||||
- else
|
||||
.settings-message.text-center
|
||||
You don't have any authorized applications
|
||||
= _("You don't have any authorized applications")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- page_title "New Application"
|
||||
- page_title _("New Application")
|
||||
|
||||
%h3.page-title New Application
|
||||
%h3.page-title= _("New Application")
|
||||
|
||||
%hr
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
- add_to_breadcrumbs "Applications", oauth_applications_path
|
||||
- add_to_breadcrumbs _("Applications"), oauth_applications_path
|
||||
- breadcrumb_title @application.name
|
||||
- page_title @application.name, "Applications"
|
||||
- page_title @application.name, _("Applications")
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
|
||||
%h3.page-title
|
||||
Application: #{@application.name}
|
||||
= _("Application: %{name}") % { name: @application.name }
|
||||
|
||||
.table-holder.oauth-application-show
|
||||
%table.table
|
||||
%tr
|
||||
%td
|
||||
Application Id
|
||||
= _('Application Id')
|
||||
%td
|
||||
%code#application_id= @application.uid
|
||||
%tr
|
||||
%td
|
||||
Secret:
|
||||
= _('Secret:')
|
||||
%td
|
||||
%code#secret= @application.secret
|
||||
|
||||
%tr
|
||||
%td
|
||||
Callback url
|
||||
= _('Callback url')
|
||||
%td
|
||||
- @application.redirect_uri.split.each do |uri|
|
||||
%div
|
||||
|
|
@ -30,5 +30,5 @@
|
|||
= render "shared/tokens/scopes_list", token: @application
|
||||
|
||||
.form-actions
|
||||
= link_to 'Edit', edit_oauth_application_path(@application), class: 'btn btn-primary wide float-left'
|
||||
= link_to _('Edit'), edit_oauth_application_path(@application), class: 'btn btn-primary wide float-left'
|
||||
= render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger prepend-left-10'
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
%h3.page-title An error has occurred
|
||||
%h3.page-title= _("An error has occurred")
|
||||
%main{ :role => "main" }
|
||||
%pre= @pre_auth.error_response.body[:error_description]
|
||||
|
|
|
|||
|
|
@ -3,34 +3,28 @@
|
|||
.modal-content
|
||||
.modal-header
|
||||
%h3.page-title
|
||||
Authorize
|
||||
= link_to @pre_auth.client.name, @pre_auth.redirect_uri, target: '_blank', rel: 'noopener noreferrer'
|
||||
to use your account?
|
||||
- link_to_client = link_to(@pre_auth.client.name, @pre_auth.redirect_uri, target: '_blank', rel: 'noopener noreferrer')
|
||||
= _("Authorize %{link_to_client} to use your account?")
|
||||
|
||||
.modal-body
|
||||
- if current_user.admin?
|
||||
.text-warning
|
||||
%p
|
||||
= icon("exclamation-triangle fw")
|
||||
You are an admin, which means granting access to
|
||||
%strong= @pre_auth.client.name
|
||||
will allow them to interact with GitLab as an admin as well. Proceed with caution.
|
||||
= _('You are an admin, which means granting access to <strong>%{client_name}</strong> will allow them to interact with GitLab as an admin as well. Proceed with caution.').html_safe % { client_name: @pre_auth.client.name }
|
||||
%p
|
||||
An application called
|
||||
= link_to @pre_auth.client.name, @pre_auth.redirect_uri, target: '_blank', rel: 'noopener noreferrer'
|
||||
is requesting access to your GitLab account.
|
||||
- link_to_client = link_to(@pre_auth.client.name, @pre_auth.redirect_uri, target: '_blank', rel: 'noopener noreferrer')
|
||||
= _("An application called %{link_to_client} is requesting access to your GitLab account.").html_safe % { link_to_client: link_to_client }
|
||||
|
||||
- auth_app_owner = @pre_auth.client.application.owner
|
||||
- if auth_app_owner
|
||||
This application was created by
|
||||
= succeed "." do
|
||||
= link_to auth_app_owner.name, user_path(auth_app_owner)
|
||||
- link_to_owner = link_to(auth_app_owner.name, user_path(auth_app_owner))
|
||||
= _("This application was created by %{link_to_owner}.").html_safe % { link_to_owner: link_to_owner }
|
||||
|
||||
Please note that this application is not provided by GitLab and you should verify its authenticity before
|
||||
allowing access.
|
||||
= _("Please note that this application is not provided by GitLab and you should verify its authenticity before allowing access.")
|
||||
- if @pre_auth.scopes
|
||||
%p
|
||||
This application will be able to:
|
||||
= _("This application will be able to:")
|
||||
%ul
|
||||
- @pre_auth.scopes.each do |scope|
|
||||
%li
|
||||
|
|
@ -44,7 +38,7 @@
|
|||
= hidden_field_tag :response_type, @pre_auth.response_type
|
||||
= hidden_field_tag :scope, @pre_auth.scope
|
||||
= hidden_field_tag :nonce, @pre_auth.nonce
|
||||
= submit_tag "Deny", class: "btn btn-danger"
|
||||
= submit_tag _("Deny"), class: "btn btn-danger"
|
||||
= form_tag oauth_authorization_path, method: :post, class: 'inline' do
|
||||
= hidden_field_tag :client_id, @pre_auth.client.uid
|
||||
= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
|
||||
|
|
@ -52,4 +46,4 @@
|
|||
= hidden_field_tag :response_type, @pre_auth.response_type
|
||||
= hidden_field_tag :scope, @pre_auth.scope
|
||||
= hidden_field_tag :nonce, @pre_auth.nonce
|
||||
= submit_tag "Authorize", class: "btn btn-success prepend-left-10"
|
||||
= submit_tag _("Authorize"), class: "btn btn-success prepend-left-10"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
%h3.page-title Authorization code:
|
||||
%h3.page-title= _("Authorization code:")
|
||||
%main{ :role => "main" }
|
||||
%code#authorization_code= params[:code]
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@
|
|||
|
||||
= form_tag path do
|
||||
%input{ :name => "_method", :type => "hidden", :value => "delete" }/
|
||||
= submit_tag 'Revoke', onclick: "return confirm('Are you sure?')", class: 'btn btn-remove btn-sm'
|
||||
= submit_tag _('Revoke'), onclick: "return confirm('#{_('Are you sure?')}')", class: 'btn btn-remove btn-sm'
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
%header
|
||||
%h1 Your authorized applications
|
||||
%h1= _("Your authorized applications")
|
||||
%main{ :role => "main" }
|
||||
.table-holder
|
||||
%table.table.table-striped
|
||||
%thead
|
||||
%tr
|
||||
%th Application
|
||||
%th Created At
|
||||
%th= _('Application')
|
||||
%th= _('Created At')
|
||||
%th
|
||||
%th
|
||||
%tbody
|
||||
|
|
|
|||
|
|
@ -280,6 +280,9 @@ msgstr ""
|
|||
msgid "Add Readme"
|
||||
msgstr ""
|
||||
|
||||
msgid "Add new application"
|
||||
msgstr ""
|
||||
|
||||
msgid "Add new directory"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -379,9 +382,15 @@ msgstr ""
|
|||
msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import."
|
||||
msgstr ""
|
||||
|
||||
msgid "An application called %{link_to_client} is requesting access to your GitLab account."
|
||||
msgstr ""
|
||||
|
||||
msgid "An error accured whilst committing your changes."
|
||||
msgstr ""
|
||||
|
||||
msgid "An error has occurred"
|
||||
msgstr ""
|
||||
|
||||
msgid "An error occured creating the new branch."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -475,12 +484,24 @@ msgstr ""
|
|||
msgid "An error occurred. Please try again."
|
||||
msgstr ""
|
||||
|
||||
msgid "Anonymous"
|
||||
msgstr ""
|
||||
|
||||
msgid "Any"
|
||||
msgstr ""
|
||||
|
||||
msgid "Appearance"
|
||||
msgstr ""
|
||||
|
||||
msgid "Application"
|
||||
msgstr ""
|
||||
|
||||
msgid "Application Id"
|
||||
msgstr ""
|
||||
|
||||
msgid "Application: %{name}"
|
||||
msgstr ""
|
||||
|
||||
msgid "Applications"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -562,6 +583,24 @@ msgstr ""
|
|||
msgid "Author"
|
||||
msgstr ""
|
||||
|
||||
msgid "Authorization code:"
|
||||
msgstr ""
|
||||
|
||||
msgid "Authorization was granted by entering your username and password in the application."
|
||||
msgstr ""
|
||||
|
||||
msgid "Authorize"
|
||||
msgstr ""
|
||||
|
||||
msgid "Authorize %{link_to_client} to use your account?"
|
||||
msgstr ""
|
||||
|
||||
msgid "Authorized At"
|
||||
msgstr ""
|
||||
|
||||
msgid "Authorized applications (%{size})"
|
||||
msgstr ""
|
||||
|
||||
msgid "Authors: %{authors}"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -921,6 +960,12 @@ msgstr ""
|
|||
msgid "CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages."
|
||||
msgstr ""
|
||||
|
||||
msgid "Callback URL"
|
||||
msgstr ""
|
||||
|
||||
msgid "Callback url"
|
||||
msgstr ""
|
||||
|
||||
msgid "Can't find HEAD commit for this branch"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1104,6 +1149,9 @@ msgstr ""
|
|||
msgid "Click to expand text"
|
||||
msgstr ""
|
||||
|
||||
msgid "Clients"
|
||||
msgstr ""
|
||||
|
||||
msgid "Clone repository"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1768,6 +1816,9 @@ msgstr ""
|
|||
msgid "Created"
|
||||
msgstr ""
|
||||
|
||||
msgid "Created At"
|
||||
msgstr ""
|
||||
|
||||
msgid "Created by me"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1846,6 +1897,9 @@ msgstr ""
|
|||
msgid "Delete list"
|
||||
msgstr ""
|
||||
|
||||
msgid "Deny"
|
||||
msgstr ""
|
||||
|
||||
msgid "Deploy"
|
||||
msgid_plural "Deploys"
|
||||
msgstr[0] ""
|
||||
|
|
@ -1983,6 +2037,9 @@ msgstr ""
|
|||
msgid "Description:"
|
||||
msgstr ""
|
||||
|
||||
msgid "Destroy"
|
||||
msgstr ""
|
||||
|
||||
msgid "Details"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2076,6 +2133,9 @@ msgstr ""
|
|||
msgid "Edit Snippet"
|
||||
msgstr ""
|
||||
|
||||
msgid "Edit application"
|
||||
msgstr ""
|
||||
|
||||
msgid "Edit files in the editor and commit changes here"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2940,6 +3000,12 @@ msgstr ""
|
|||
msgid "Manage all notifications"
|
||||
msgstr ""
|
||||
|
||||
msgid "Manage applications that can use GitLab as an OAuth provider, and applications that you've authorized to use your account."
|
||||
msgstr ""
|
||||
|
||||
msgid "Manage applications that you've authorized to use your account."
|
||||
msgstr ""
|
||||
|
||||
msgid "Manage group labels"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3141,6 +3207,9 @@ msgstr ""
|
|||
msgid "New"
|
||||
msgstr ""
|
||||
|
||||
msgid "New Application"
|
||||
msgstr ""
|
||||
|
||||
msgid "New Group"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3620,6 +3689,9 @@ msgstr ""
|
|||
msgid "Please accept the Terms of Service before continuing."
|
||||
msgstr ""
|
||||
|
||||
msgid "Please note that this application is not provided by GitLab and you should verify its authenticity before allowing access."
|
||||
msgstr ""
|
||||
|
||||
msgid "Please select at least one filter to see results"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4060,6 +4132,9 @@ msgstr ""
|
|||
msgid "Reviewing (merge request !%{mergeRequestId})"
|
||||
msgstr ""
|
||||
|
||||
msgid "Revoke"
|
||||
msgstr ""
|
||||
|
||||
msgid "Runner token"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4084,6 +4159,9 @@ msgstr ""
|
|||
msgid "Save"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save application"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save changes"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4105,6 +4183,9 @@ msgstr ""
|
|||
msgid "Scheduling Pipelines"
|
||||
msgstr ""
|
||||
|
||||
msgid "Scope"
|
||||
msgstr ""
|
||||
|
||||
msgid "Scroll to bottom"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4144,6 +4225,9 @@ msgstr ""
|
|||
msgid "Seconds to wait for a storage access attempt"
|
||||
msgstr ""
|
||||
|
||||
msgid "Secret:"
|
||||
msgstr ""
|
||||
|
||||
msgid "Select"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4730,6 +4814,12 @@ msgstr ""
|
|||
msgid "This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area."
|
||||
msgstr ""
|
||||
|
||||
msgid "This application was created by %{link_to_owner}."
|
||||
msgstr ""
|
||||
|
||||
msgid "This application will be able to:"
|
||||
msgstr ""
|
||||
|
||||
msgid "This diff is collapsed."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5126,9 +5216,15 @@ msgstr ""
|
|||
msgid "Usage statistics"
|
||||
msgstr ""
|
||||
|
||||
msgid "Use <code>%{native_redirect_uri}</code> for local tests"
|
||||
msgstr ""
|
||||
|
||||
msgid "Use group milestones to manage issues from multiple projects in the same milestone."
|
||||
msgstr ""
|
||||
|
||||
msgid "Use one line per URI"
|
||||
msgstr ""
|
||||
|
||||
msgid "Use the following registration token during setup:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5369,6 +5465,9 @@ msgstr ""
|
|||
msgid "Yes, add it"
|
||||
msgstr ""
|
||||
|
||||
msgid "You are an admin, which means granting access to <strong>%{client_name}</strong> will allow them to interact with GitLab as an admin as well. Proceed with caution."
|
||||
msgstr ""
|
||||
|
||||
msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5420,6 +5519,12 @@ msgstr ""
|
|||
msgid "You do not have any assigned merge requests"
|
||||
msgstr ""
|
||||
|
||||
msgid "You don't have any applications"
|
||||
msgstr ""
|
||||
|
||||
msgid "You don't have any authorized applications"
|
||||
msgstr ""
|
||||
|
||||
msgid "You have no permissions"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5486,6 +5591,12 @@ msgstr ""
|
|||
msgid "Your Todos"
|
||||
msgstr ""
|
||||
|
||||
msgid "Your applications (%{size})"
|
||||
msgstr ""
|
||||
|
||||
msgid "Your authorized applications"
|
||||
msgstr ""
|
||||
|
||||
msgid "Your changes can be committed to %{branch_name} because a merge request is open."
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ module QA
|
|||
module Main
|
||||
class OAuth < Page::Base
|
||||
view 'app/views/doorkeeper/authorizations/new.html.haml' do
|
||||
element :authorization_button, 'submit_tag "Authorize"'
|
||||
element :authorization_button, 'submit_tag _("Authorize")'
|
||||
end
|
||||
|
||||
def needs_authorization?
|
||||
|
|
|
|||
Loading…
Reference in New Issue