diff --git a/app/views/admin/domain_versions/archive.haml b/app/views/admin/domain_versions/archive.haml index b519272d5..2a22284e9 100644 --- a/app/views/admin/domain_versions/archive.haml +++ b/app/views/admin/domain_versions/archive.haml @@ -11,11 +11,11 @@ .col-md-3 .form-group = label_tag :registrant - = 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_placeholder') .col-md-3 .form-group = 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 .form-group = label_tag :action @@ -45,7 +45,7 @@ %th{class: 'col-xs-2'} = t(:name) %th{class: 'col-xs-2'} - = t(:registrant) + = t('.registrant') %th{class: 'col-xs-2'} = t(:registrar_name) %th{class: 'col-xs-2'} diff --git a/app/views/admin/domain_versions/show.haml b/app/views/admin/domain_versions/show.haml index 90b53d846..d0863eed5 100644 --- a/app/views/admin/domain_versions/show.haml +++ b/app/views/admin/domain_versions/show.haml @@ -46,7 +46,7 @@ - domain.statuses.each do |s| = s - %dt= t(:registrant) + %dt= t('.registrant') %dd{class: changing_css_class(@version,"registrant_id")} - registrant.each do |r| - link = r.version_loader ? admin_contact_version_path(r.version_loader.try(:id)) : admin_contact_path(r.id) diff --git a/app/views/admin/domains/partials/_owner.haml b/app/views/admin/domains/partials/_owner.haml index 7f499f86b..c08170650 100644 --- a/app/views/admin/domains/partials/_owner.haml +++ b/app/views/admin/domains/partials/_owner.haml @@ -1,6 +1,6 @@ .panel.panel-default .panel-heading - %h3.panel-title= t(:registrant) + %h3.panel-title= t('.title') .panel-body %dl.dl-horizontal %dt= t(:name) diff --git a/app/views/admin/domains/versions.haml b/app/views/admin/domains/versions.haml index 226ffc81c..7447ab6f8 100644 --- a/app/views/admin/domains/versions.haml +++ b/app/views/admin/domains/versions.haml @@ -11,7 +11,7 @@ %th{class: 'col-xs-1'}= t('.time') %th{class: 'col-xs-2'}= t(:statuses) %th{class: 'col-xs-1'}= t(:period) - %th{class: 'col-xs-2'}= t(:registrant) + %th{class: 'col-xs-2'}= t('.registrant') %th{class: 'col-xs-2'}= t('.admin_contact') %th{class: 'col-xs-2'}= t('.tech_contact') %th{class: 'col-xs-2'}= t(:nameservers) diff --git a/app/views/registrant/domain_delete_confirms/show.haml b/app/views/registrant/domain_delete_confirms/show.haml index fca337844..e2b42b56d 100644 --- a/app/views/registrant/domain_delete_confirms/show.haml +++ b/app/views/registrant/domain_delete_confirms/show.haml @@ -26,7 +26,7 @@ .col-md-12.text-center.confirmation .column-keys %p= t(:domain_name) + ':' - %p= t(:registrant) + ':' + %p= t('.registrant') + ':' .column-values %p= @domain.name %p= "#{@domain.registrant_name} (#{@domain.registrant.ident})" diff --git a/app/views/registrant/domains/download_list.haml b/app/views/registrant/domains/download_list.haml index 481324e62..f0af344cd 100644 --- a/app/views/registrant/domains/download_list.haml +++ b/app/views/registrant/domains/download_list.haml @@ -12,7 +12,7 @@ %th{class: 'col-xs-2'} =t(:name) %th{class: 'col-xs-2'} - =t(:registrant) + =t('.registrant') %th{class: 'col-xs-2'} =t(:valid_to) %th{class: 'col-xs-2'} diff --git a/app/views/registrant/domains/partials/_owner.haml b/app/views/registrant/domains/partials/_owner.haml index 812b97924..01bfa9ea9 100644 --- a/app/views/registrant/domains/partials/_owner.haml +++ b/app/views/registrant/domains/partials/_owner.haml @@ -1,6 +1,6 @@ .panel.panel-default .panel-heading - %h3.panel-title= t(:registrant) + %h3.panel-title= t('.title') .panel-body %dl.dl-horizontal %dt= t(:name) diff --git a/app/views/registrar/domains/form/_general.haml b/app/views/registrar/domains/form/_general.haml index 91ae7462f..0a729a262 100644 --- a/app/views/registrar/domains/form/_general.haml +++ b/app/views/registrar/domains/form/_general.haml @@ -18,7 +18,7 @@ .form-group .col-md-3.control-label - = label_tag :domain_registrant, t(:registrant), class: 'required' + = label_tag :domain_registrant, t('.registrant'), class: 'required' .col-md-7 = text_field_tag 'domain[registrant]', @domain_params[:registrant], class: "hidden" = text_field_tag 'domain[registrant_helper]', contacts.find_by(code: @domain_params[:registrant]).try(:search_name), diff --git a/app/views/registrar/domains/partials/_general.haml b/app/views/registrar/domains/partials/_general.haml index ca3dd9992..db06b3376 100644 --- a/app/views/registrar/domains/partials/_general.haml +++ b/app/views/registrar/domains/partials/_general.haml @@ -11,7 +11,7 @@ %dd= @data.css('clID').text - registrant = Contact.find_by_code(@data.css('registrant').text) - %dt= t(:registrant) + %dt= t('.registrant') %dd= "#{registrant.name} (#{@data.css('registrant').text})" %dt= t('.registered') diff --git a/config/locales/admin/domain_versions.en.yml b/config/locales/admin/domain_versions.en.yml index fd2f7059a..93111757c 100644 --- a/config/locales/admin/domain_versions.en.yml +++ b/config/locales/admin/domain_versions.en.yml @@ -3,9 +3,12 @@ en: domain_versions: archive: reset_btn: Reset + registrant_placeholder: Registrant + registrant: Registrant show: created: Created updated: Updated + registrant: Registrant admin_contacts: Admin. contacts tech_contacts: Tech. contacts diff --git a/config/locales/admin/domains.en.yml b/config/locales/admin/domains.en.yml index 3df0fe2f5..f5fe0931a 100644 --- a/config/locales/admin/domains.en.yml +++ b/config/locales/admin/domains.en.yml @@ -22,6 +22,7 @@ en: versions: time: Time + registrant: Registrant admin_contact: Admin. contact tech_contact: Tech. contact @@ -37,6 +38,9 @@ en: tech_contacts: title: Tech. contacts + owner: + title: Registrant + force_delete_toggle_btn: schedule: Schedule force delete cancel: Cancel force delete diff --git a/config/locales/registrant/domain_delete_confirms.en.yml b/config/locales/registrant/domain_delete_confirms.en.yml new file mode 100644 index 000000000..a53d23f1c --- /dev/null +++ b/config/locales/registrant/domain_delete_confirms.en.yml @@ -0,0 +1,5 @@ +en: + registrant: + domain_delete_confirms: + show: + registrant: Registrant diff --git a/config/locales/registrant/domains.en.yml b/config/locales/registrant/domains.en.yml index 5a35aaa7e..ce789cf69 100644 --- a/config/locales/registrant/domains.en.yml +++ b/config/locales/registrant/domains.en.yml @@ -1,7 +1,12 @@ en: registrant: domains: + download_list: + registrant: Registrant partials: + owner: + title: Registrant + admin_contacts: title: Admin. contacts diff --git a/config/locales/registrar/domains.en.yml b/config/locales/registrar/domains.en.yml index 287704d29..15ff53a43 100644 --- a/config/locales/registrar/domains.en.yml +++ b/config/locales/registrar/domains.en.yml @@ -15,8 +15,12 @@ en: flags: Flags alg: Algorithm + general: + registrant: registrant + partials: general: + registrant: Registrant registered: Registered created: Created updated: Updated