Rename en.registrar translation key to en.registrar_name

#240
This commit is contained in:
Artur Beljajev 2016-11-11 12:42:16 +02:00
parent 2643df8d21
commit 064716bebf
29 changed files with 45 additions and 46 deletions

View file

@ -9,7 +9,7 @@
.row .row
.col-md-12 .col-md-12
.form-group .form-group
= f.label t(:registrar) = f.label t(:registrar_name)
= f.select :account_registrar_id_in, Registrar.all.map { |x| [x, x.id] }, {}, class: 'form-control js-combobox', placeholder: t(:choose), multiple: true = f.select :account_registrar_id_in, Registrar.all.map { |x| [x, x.id] }, {}, class: 'form-control js-combobox', placeholder: t(:choose), multiple: true
.row .row
.col-md-6 .col-md-6
@ -56,7 +56,7 @@
%thead %thead
%tr %tr
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'account_registrar_code', t(:registrar)) = sort_link(@q, 'account_registrar_code', t(:registrar_name))
%th{class: 'col-xs-3'} %th{class: 'col-xs-3'}
= sort_link(@q, 'description') = sort_link(@q, 'description')
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}

View file

@ -32,11 +32,11 @@
.form-group .form-group
.form-group.has-feedback.js-typeahead-container .form-group.has-feedback.js-typeahead-container
.col-md-4.control-label .col-md-4.control-label
= f.label :registrar_typeahead, t(:registrar), class: 'required' = f.label :registrar_typeahead, t(:registrar_name), class: 'required'
.col-md-7 .col-md-7
= f.text_field(:registrar_typeahead, = f.text_field(:registrar_typeahead,
class: 'form-control js-registrar-typeahead typeahead required', class: 'form-control js-registrar-typeahead typeahead required',
placeholder: t(:registrar), autocomplete: 'off') placeholder: t(:registrar_name), autocomplete: 'off')
%span.glyphicon.glyphicon-ok.form-control-feedback.js-typeahead-ok.hidden %span.glyphicon.glyphicon-ok.form-control-feedback.js-typeahead-ok.hidden
%span.glyphicon.glyphicon-remove.form-control-feedback.js-typeahead-remove %span.glyphicon.glyphicon-remove.form-control-feedback.js-typeahead-remove
= f.hidden_field(:registrar_id, class: 'js-registrar-id') = f.hidden_field(:registrar_id, class: 'js-registrar-id')

View file

@ -11,7 +11,7 @@
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'username') = sort_link(@q, 'username')
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'registrar_name', t(:registrar)) = sort_link(@q, 'registrar_name', t(:registrar_name))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'active', t(:active)) = sort_link(@q, 'active', t(:active))
%tbody %tbody

View file

@ -23,7 +23,7 @@
%dt= t(:password) %dt= t(:password)
%dd= @api_user.password %dd= @api_user.password
%dt= t(:registrar) %dt= t(:registrar_name)
%dd= link_to(@api_user.registrar, admin_registrar_path(@api_user.registrar)) %dd= link_to(@api_user.registrar, admin_registrar_path(@api_user.registrar))
%dt= t(:role) %dt= t(:role)

View file

@ -50,7 +50,7 @@
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= t(:ident) = t(:ident)
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= t(:registrar) = t(:registrar_name)
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= t(:action) = t(:action)
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}

View file

@ -49,7 +49,7 @@
%dd{class: changing_css_class(@version,"updated_at")} %dd{class: changing_css_class(@version,"updated_at")}
= l(contact.updated_at, format: :short) = l(contact.updated_at, format: :short)
%dt= t(:registrar) %dt= t(:registrar_name)
%dd{class: changing_css_class(@version,"registrar_id")} %dd{class: changing_css_class(@version,"registrar_id")}
- if contact.registrar.present? - if contact.registrar.present?
= link_to(contact.registrar, admin_registrar_path(contact.registrar)) = link_to(contact.registrar, admin_registrar_path(contact.registrar))

View file

@ -36,7 +36,7 @@
.row .row
.col-md-3 .col-md-3
.form-group .form-group
= f.label t(:registrar) = f.label t(:registrar_name)
= f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose) = f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose)
.col-md-3 .col-md-3
.form-group .form-group
@ -88,7 +88,7 @@
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'email', t(:created_at)) = sort_link(@q, 'email', t(:created_at))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'registrar_name', t(:registrar)) = sort_link(@q, 'registrar_name', t(:registrar_name))
%tbody %tbody
- @contacts.each do |contact| - @contacts.each do |contact|
%tr %tr

View file

@ -16,7 +16,7 @@
%thead %thead
%tr %tr
%th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name %th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name
%th{class: 'col-xs-3'}=custom_sort_link t(:registrar), :registrar_name %th{class: 'col-xs-3'}=custom_sort_link t(:registrar_name), :registrar_name
%th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to %th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to
%th{class: 'col-xs-3'}= t(:roles) %th{class: 'col-xs-3'}= t(:roles)
%tbody %tbody

View file

@ -39,7 +39,7 @@
by by
= updator_link(@contact) = updator_link(@contact)
%dt= t(:registrar) %dt= t(:registrar_name)
%dd %dd
- if @contact.registrar.present? - if @contact.registrar.present?
= link_to(@contact.registrar, admin_registrar_path(@contact.registrar)) = link_to(@contact.registrar, admin_registrar_path(@contact.registrar))

View file

@ -14,7 +14,7 @@
= f.search_field :registrant, value: params[:q][:registrant], class: 'form-control', placeholder: t(:registrant) = f.search_field :registrant, value: params[:q][:registrant], class: 'form-control', placeholder: t(:registrant)
.col-md-3 .col-md-3
.form-group .form-group
= label_tag t(:registrar) = label_tag t(:registrar_name)
= f.search_field :registrar, value: params[:q][:registrar], class: 'form-control', placeholder: t(:registrant) = f.search_field :registrar, value: params[:q][:registrar], class: 'form-control', placeholder: t(:registrant)
.col-md-3 .col-md-3
.form-group .form-group
@ -48,7 +48,7 @@
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= t(:registrant) = t(:registrant)
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= t(:registrar) = t(:registrar_name)
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= t(:action) = t(:action)
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}

View file

@ -98,7 +98,7 @@
%br %br
- if domain.registrar - if domain.registrar
%dt= t(:registrar) %dt= t(:registrar_name)
%dd{class: changing_css_class(@version,"registrar_id")} %dd{class: changing_css_class(@version,"registrar_id")}
= link_to admin_registrar_path(domain.registrar), target: "registrar_#{domain.registrar.id}" do = link_to admin_registrar_path(domain.registrar), target: "registrar_#{domain.registrar.id}" do
= domain.registrar.name = domain.registrar.name

View file

@ -23,7 +23,7 @@
.row .row
.col-md-6 .col-md-6
.form-group .form-group
= f.label t(:registrar) = f.label t(:registrar_name)
= f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose) = f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose)
.col-md-3 .col-md-3
.form-group .form-group
@ -63,7 +63,7 @@
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'valid_to', t(:valid_to)) = sort_link(@q, 'valid_to', t(:valid_to))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'registrar_name', t(:registrar)) = sort_link(@q, 'registrar_name', t(:registrar_name))
%tbody %tbody
- @domains.each do |x| - @domains.each do |x|
%tr %tr

View file

@ -9,7 +9,7 @@
%dt= t(:registered_at) %dt= t(:registered_at)
%dd= l(@domain.registered_at) %dd= l(@domain.registered_at)
%dt= t(:registrar) %dt= t(:registrar_name)
%dd= link_to(@domain.registrar, admin_registrar_path(@domain.registrar)) %dd= link_to(@domain.registrar, admin_registrar_path(@domain.registrar))
%dt= t(:authinfo_pw) %dt= t(:authinfo_pw)

View file

@ -16,7 +16,7 @@
%th{class: 'col-xs-2'}= t(:tech) %th{class: 'col-xs-2'}= t(:tech)
%th{class: 'col-xs-2'}= t(:nameservers) %th{class: 'col-xs-2'}= t(:nameservers)
%th{class: 'col-xs-2'}= t(:dnskeys) %th{class: 'col-xs-2'}= t(:dnskeys)
%th{class: 'col-xs-2'}= t(:registrar) %th{class: 'col-xs-2'}= t(:registrar_name)
%tbody %tbody
-#- if @pending_domain.present? -#- if @pending_domain.present?

View file

@ -27,7 +27,7 @@
.col-md-3 .col-md-3
.form-group .form-group
= f.label :registrar = f.label :registrar
= f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar), autocomplete: 'off' = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar_name), autocomplete: 'off'
.col-md-3 .col-md-3
.form-group .form-group
= f.label t(:created_after) = f.label t(:created_after)
@ -55,7 +55,7 @@
%th{class: 'col-xs-2'}= t(:request_object) %th{class: 'col-xs-2'}= t(:request_object)
%th{class: 'col-xs-2'}= t(:request_successful) %th{class: 'col-xs-2'}= t(:request_successful)
%th{class: 'col-xs-2'}= t(:api_user) %th{class: 'col-xs-2'}= t(:api_user)
%th{class: 'col-xs-2'}= t(:registrar) %th{class: 'col-xs-2'}= t(:registrar_name)
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'created_at') = sort_link(@q, 'created_at')
%tbody %tbody

View file

@ -21,7 +21,7 @@
%dt= t(:api_user) %dt= t(:api_user)
%dd= @epp_log.api_user_name %dd= @epp_log.api_user_name
%dt= t(:registrar) %dt= t(:registrar_name)
%dd= @epp_log.api_user_registrar %dd= @epp_log.api_user_registrar
%dt= t(:ip) %dt= t(:ip)

View file

@ -25,7 +25,7 @@
.col-md-3 .col-md-3
.form-group .form-group
= f.label :registrar = f.label :registrar
= f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar), autocomplete: 'off' = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar_name), autocomplete: 'off'
.col-md-3 .col-md-3
.form-group .form-group
= f.label t(:created_after) = f.label t(:created_after)
@ -52,7 +52,7 @@
%th{class: 'col-xs-2'}= t(:request_method) %th{class: 'col-xs-2'}= t(:request_method)
%th{class: 'col-xs-2'}= t(:response_code) %th{class: 'col-xs-2'}= t(:response_code)
%th{class: 'col-xs-2'}= t(:api_user) %th{class: 'col-xs-2'}= t(:api_user)
%th{class: 'col-xs-2'}= t(:registrar) %th{class: 'col-xs-2'}= t(:registrar_name)
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'created_at') = sort_link(@q, 'created_at')
%tbody %tbody

View file

@ -21,7 +21,7 @@
%dt= t(:api_user) %dt= t(:api_user)
%dd= @repp_log.api_user_name %dd= @repp_log.api_user_name
%dt= t(:registrar) %dt= t(:registrar_name)
%dd= @repp_log.api_user_registrar %dd= @repp_log.api_user_registrar
%dt= t(:ip) %dt= t(:ip)

View file

@ -11,7 +11,7 @@
%h3.panel-title= t(:general) %h3.panel-title= t(:general)
.panel-body .panel-body
%dl.dl-horizontal %dl.dl-horizontal
%dt= t(:registrar) %dt= t(:registrar_name)
%dd= link_to(@registrar, [:admin, @registrar]) %dd= link_to(@registrar, [:admin, @registrar])
%dt= t(:ipv4) %dt= t(:ipv4)

View file

@ -16,7 +16,7 @@
%thead %thead
%tr %tr
%th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name %th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name
%th{class: 'col-xs-3'}=custom_sort_link t(:registrar), :registrar_name %th{class: 'col-xs-3'}=custom_sort_link t(:registrar_name), :registrar_name
%th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to %th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to
%th{class: 'col-xs-3'}=custom_sort_link t(:roles), :roles %th{class: 'col-xs-3'}=custom_sort_link t(:roles), :roles
%tbody %tbody

View file

@ -42,7 +42,7 @@
by by
= @contact.name = @contact.name
%dt= t(:registrar) %dt= t(:registrar_name)
%dd %dd
- if @contact.registrar.present? - if @contact.registrar.present?
= link_to(@contact.registrar, registrant_registrar_path(@contact.registrar)) = link_to(@contact.registrar, registrant_registrar_path(@contact.registrar))

View file

@ -16,7 +16,7 @@
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
=t(:valid_to) =t(:valid_to)
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
=t(:registrar) =t(:registrar_name)
%tbody %tbody
- @domains.result.each do |x| - @domains.result.each do |x|
%tr %tr

View file

@ -61,7 +61,7 @@
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'valid_to', t(:valid_to)) = sort_link(@q, 'valid_to', t(:valid_to))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'registrar_name', t(:registrar)) = sort_link(@q, 'registrar_name', t(:registrar_name))
%tbody %tbody
- @domains.each do |x| - @domains.each do |x|
%tr %tr

View file

@ -9,7 +9,7 @@
%dt= t(:registered_at) %dt= t(:registered_at)
%dd= l(@domain.registered_at) %dd= l(@domain.registered_at)
%dt= t(:registrar) %dt= t(:registrar_name)
%dd= link_to(@domain.registrar, registrant_registrar_path(@domain.registrar)) %dd= link_to(@domain.registrar, registrant_registrar_path(@domain.registrar))
%dt= t(:authinfo_pw) %dt= t(:authinfo_pw)

View file

@ -19,7 +19,7 @@
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
=t(:created_at) =t(:created_at)
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
=t(:registrar) =t(:registrar_name)
%tbody %tbody
- @contacts.each do |contact| - @contacts.each do |contact|
%tr %tr

View file

@ -38,7 +38,7 @@
.row .row
.col-md-3 .col-md-3
.form-group .form-group
= f.label t(:registrar) = f.label t(:registrar_name)
= f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose) = f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose)
.col-md-3 .col-md-3
.form-group .form-group
@ -97,7 +97,7 @@
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'email', t(:created_at)) = sort_link(@q, 'email', t(:created_at))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'registrar_name', t(:registrar)) = sort_link(@q, 'registrar_name', t(:registrar_name))
%th{class: 'col-xs-2'}= t(:actions) %th{class: 'col-xs-2'}= t(:actions)
%tbody %tbody
- @contacts.each do |contact| - @contacts.each do |contact|

View file

@ -16,7 +16,7 @@
%thead %thead
%tr %tr
%th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name %th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name
%th{class: 'col-xs-3'}=custom_sort_link t(:registrar), :registrar_name %th{class: 'col-xs-3'}=custom_sort_link t(:registrar_name), :registrar_name
%th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to %th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to
%th{class: 'col-xs-3'}= t(:roles) %th{class: 'col-xs-3'}= t(:roles)
%tbody %tbody

View file

@ -7,7 +7,7 @@
%dd= @data.css('pw').text.present? ? @data.css('pw').text : t('hidden') %dd= @data.css('pw').text.present? ? @data.css('pw').text : t('hidden')
- if @data.css('pw').text.blank? - if @data.css('pw').text.blank?
%dt= t(:registrar) %dt= t(:registrar_name)
%dd= @data.css('clID').text %dd= @data.css('clID').text
- registrant = Contact.find_by_code(@data.css('registrant').text) - registrant = Contact.find_by_code(@data.css('registrant').text)

View file

@ -285,7 +285,7 @@ en:
valid_to: 'Valid to' valid_to: 'Valid to'
name: 'Name' name: 'Name'
transfer_can_be_approved_only_by_current_registrar: 'Transfer can be approved only by current domain registrar' transfer_can_be_approved_only_by_current_registrar: 'Transfer can be approved only by current domain registrar'
registrar: 'Registrar' registrar_name: 'Registrar'
owner: 'Registrant' owner: 'Registrant'
domain_details: 'Domain details' domain_details: 'Domain details'
registered_at: 'Registered at' registered_at: 'Registered at'
@ -440,7 +440,6 @@ en:
setting: 'Setting' setting: 'Setting'
registrar: 'Registrar'
transfer_requested: 'Transfer requested.' transfer_requested: 'Transfer requested.'
message_was_not_found: 'Message was not found' message_was_not_found: 'Message was not found'
host_obj_is_not_allowed: 'hostObj object is not allowed' host_obj_is_not_allowed: 'hostObj object is not allowed'