From aa39c069a1dc6782651aeb47799c935486eecd76 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Thu, 8 Dec 2016 19:30:59 +0200
Subject: [PATCH 1/3] Fix missing translations

---
 config/locales/en.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0988e1ce0..c4fb88757 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -614,6 +614,7 @@ en:
   delete: 'Delete'
   are_you_sure: 'Are you sure?'
   renew: 'Renew'
+  new: New
   renew_domain: 'Renew domain'
   cur_exp_date: 'curExpDate'
   transfer: 'Transfer'
@@ -952,3 +953,4 @@ en:
   deleted: 'Deleted'
   cant_match_version: 'Impossible match version with request'
   user_not_authenticated: "user not authenticated"
+  actions: Actions

From 03ef3e1c506e3dcb68049f78c3a8ec6815a87205 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Thu, 8 Dec 2016 19:32:28 +0200
Subject: [PATCH 2/3] Update domain presenter

---
 app/presenters/domain_presenter.rb       | 10 +++++++++-
 spec/presenters/domain_presenter_spec.rb | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb
index b09743c5e..2d0cfd791 100644
--- a/app/presenters/domain_presenter.rb
+++ b/app/presenters/domain_presenter.rb
@@ -1,11 +1,19 @@
 class DomainPresenter
-  delegate :name, :registrant_name, to: :domain
+  delegate :name, :registrant_name, :registrant_id, to: :domain
 
   def initialize(domain:, view:)
     @domain = domain
     @view = view
   end
 
+  def expire_time
+    view.l(domain.expire_time)
+  end
+
+  def expire_date
+    view.l(domain.expire_time, format: :date)
+  end
+
   def on_hold_date
     view.l(domain.on_hold_time, format: :date) if domain.on_hold_time
   end
diff --git a/spec/presenters/domain_presenter_spec.rb b/spec/presenters/domain_presenter_spec.rb
index 79adcc68f..2209c01aa 100644
--- a/spec/presenters/domain_presenter_spec.rb
+++ b/spec/presenters/domain_presenter_spec.rb
@@ -3,6 +3,24 @@ require 'rails_helper'
 RSpec.describe DomainPresenter do
   let(:presenter) { described_class.new(domain: domain, view: view) }
 
+  describe '#expire_time' do
+    let(:domain) { instance_double(Domain, expire_time: Time.zone.parse('05.07.2010')) }
+
+    it 'returns localized time' do
+      expect(view).to receive(:l).with(Time.zone.parse('05.07.2010')).and_return('expire time')
+      expect(presenter.expire_time).to eq('expire time')
+    end
+  end
+
+  describe '#expire_date' do
+    let(:domain) { instance_double(Domain, expire_time: Time.zone.parse('05.07.2010')) }
+
+    it 'returns localized date' do
+      expect(view).to receive(:l).with(Time.zone.parse('05.07.2010'), format: :date).and_return('expire date')
+      expect(presenter.expire_date).to eq('expire date')
+    end
+  end
+
   describe '#on_hold_date' do
     subject(:on_hold_date) { presenter.on_hold_date }
 
@@ -100,6 +118,7 @@ RSpec.describe DomainPresenter do
   domain_delegatable_attributes = %i(
     name
     registrant_name
+    registrant_id
   )
 
   domain_delegatable_attributes.each do |attribute_name|

From 55b5e7a41de424a07685607ca57a963752afef75 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Thu, 8 Dec 2016 19:33:07 +0200
Subject: [PATCH 3/3] Do not autoload app/validators folder twice

---
 config/initializers/load_validators.rb | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 config/initializers/load_validators.rb

diff --git a/config/initializers/load_validators.rb b/config/initializers/load_validators.rb
deleted file mode 100644
index ea84920bf..000000000
--- a/config/initializers/load_validators.rb
+++ /dev/null
@@ -1 +0,0 @@
-Registry::Application.config.autoload_paths += %W(#{Registry::Application.config.root}/app/validators/)