Merge branch 'master' into improve-test-env-config

config/locales/registrar/bulk_change.en.yml

@@ -0,0 +1,31 @@
+en:
+  registrar:
+    bulk_change:
+      new:
+        header: Bulk change
+        technical_contact: Technical contact
+        nameserver: Nameserver
+        bulk_transfer: Bulk transfer
+
+      tech_contact_form:
+        current_contact_id: Current contact ID
+        new_contact_id: New contact ID
+        submit_btn: Replace technical contacts
+        help_btn: Toggle help
+        help: >-
+          Replace technical contact specified in "current contact ID" with the one in "new
+          contact ID" on any domain registered under this registrar
+
+      nameserver_form:
+        ip_hint: One IP per line
+        replace_btn: Replace nameserver
+        help_btn: Toggle help
+        help: >-
+          Replace nameserver specified in the "old hostname" with the one in "new hostname" with
+          optional IPv4 and IPv6 addresses on any domain registered under this registrar
+
+      bulk_transfer_form:
+        file_field_hint: CSV file with domain list provided by another registrar
+        submit_btn: Transfer
+        help_btn: Toggle help
+        help: Transfer domains in the csv file with correct transfer code to this registrar

config/locales/registrar/domain_transfers.en.yml

@@ -3,17 +3,10 @@ en:
     domain_transfers:
       new:
         header: Domain transfer
-        single: One by one
-        batch: Batch
 
       create:
         header: Domain transfer
         transferred: "%{count} domains have been successfully transferred"
 
       form:
-        single:
-          transfer_btn: Transfer
-
-        batch:
-          batch_file_help: CSV file with domain list provided by another registrar
-          transfer_btn: Transfer batch
+        submit_btn: Transfer

config/locales/registrar/domains.en.yml

@@ -5,7 +5,7 @@ en:
         header: Domains
         new_btn: New domain
         transfer_btn: Transfer
-        replace_nameserver_btn: Replace nameserver
+        bulk_change_btn: Bulk change
         csv:
           domain_name: Domain
           transfer_code: Transfer code

config/locales/registrar/nameservers.en.yml

@@ -0,0 +1,5 @@
+en:
+  registrar:
+    nameservers:
+      update:
+        replaced: Nameserver have been successfully replaced

config/locales/registrar/registrar_nameservers.en.yml

@@ -1,13 +0,0 @@
-en:
-  registrar:
-    registrar_nameservers:
-      edit:
-        header: Replace nameserver
-        replace_btn: Replace
-
-      form:
-        ip_hint: One IP per line
-        replace_btn: Replace nameserver
-
-      update:
-        replaced: Nameserver have been successfully replaced

config/locales/registrar/tech_contacts.en.yml

@@ -0,0 +1,7 @@
+en:
+  registrar:
+    tech_contacts:
+      update:
+        replaced: Technical contacts have been successfully replaced.
+        affected_domains: Affected domains
+        skipped_domains: Skipped domains

config/routes.rb

@@ -62,9 +62,9 @@ Rails.application.routes.draw do
       end
     end
     resources :domain_transfers, only: %i[new create]
-    get 'registrar/nameservers', to: 'registrar_nameservers#edit', as: :edit_registrar_nameserver
-    put 'registrar/nameservers', to: 'registrar_nameservers#update', as: :update_registrar_nameserver
-
+    resource :bulk_change, controller: :bulk_change, only: :new
+    resource :tech_contacts, only: :update
+    resource :nameservers, only: :update
     resources :contacts, constraints: {:id => /[^\/]+(?=#{ ActionController::Renderers::RENDERERS.map{|e| "\\.#{e}\\z"}.join("|") })|[^\/]+/} do
       member do
         get 'delete'