diff --git a/app/controllers/admin/registrars_controller.rb b/app/controllers/admin/registrars_controller.rb index de8d099d2..119abf85b 100644 --- a/app/controllers/admin/registrars_controller.rb +++ b/app/controllers/admin/registrars_controller.rb @@ -78,7 +78,8 @@ module Admin :billing_email, :code, :test_registrar, - :accounting_customer_code) + :accounting_customer_code, + :language) end end end diff --git a/app/models/registrar.rb b/app/models/registrar.rb index b410a1c76..418277b8a 100644 --- a/app/models/registrar.rb +++ b/app/models/registrar.rb @@ -16,8 +16,11 @@ class Registrar < ActiveRecord::Base validates :name, :reg_no, :country_code, :email, :code, presence: true validates :name, :reg_no, :reference_no, :code, uniqueness: true validates :accounting_customer_code, presence: true + validates :language, presence: true validate :forbidden_codes + after_initialize :set_defaults + def forbidden_codes return true unless ['CID'].include? code errors.add(:code, I18n.t(:forbidden_code)) @@ -163,4 +166,10 @@ class Registrar < ActiveRecord::Base return true unless Setting.api_ip_whitelist_enabled white_ips.api.pluck(:ipv4, :ipv6).flatten.include?(ip) end + + private + + def set_defaults + self.language = Setting.default_language unless language + end end diff --git a/app/views/admin/registrars/_form.html.erb b/app/views/admin/registrars/_form.html.erb index 7bdddb5d9..389960f01 100644 --- a/app/views/admin/registrars/_form.html.erb +++ b/app/views/admin/registrars/_form.html.erb @@ -149,6 +149,7 @@ + <%= render 'admin/registrars/form/preferences', f: f %>