From 25fed4f75c9203552607a271e56ad0bb9212552c Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Wed, 24 Sep 2014 18:41:57 +0300
Subject: [PATCH] Fix translations

---
 app/controllers/client_controller.rb | 2 +-
 app/models/domain_transfer.rb        | 4 ++--
 config/locales/en.yml                | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/client_controller.rb b/app/controllers/client_controller.rb
index 2d79137c6..d45b8f5ad 100644
--- a/app/controllers/client_controller.rb
+++ b/app/controllers/client_controller.rb
@@ -1,5 +1,5 @@
 class ClientController < ApplicationController
   def current_user
-    EppUser.first
+    EppUser.last
   end
 end
diff --git a/app/models/domain_transfer.rb b/app/models/domain_transfer.rb
index 7f7d203de..e3de62f4e 100644
--- a/app/models/domain_transfer.rb
+++ b/app/models/domain_transfer.rb
@@ -20,11 +20,11 @@ class DomainTransfer < ActiveRecord::Base
     transaction do
       self.status = DomainTransfer::CLIENT_APPROVED
       self.transferred_at = Time.zone.now
-      save!
+      save
 
       domain.generate_auth_info
       domain.registrar = transfer_to
-      domain.save!
+      domain.save(validate: false)
     end
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 15342263f..41f13b0c7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -113,8 +113,6 @@ en:
           attributes:
             base:
               transfer_can_be_approved_only_by_current_registrar: 'Transfer can be approved only by current domain registrar'
-            domain:
-              not_found: 'Domain was not found'
 
         nameserver:
           attributes:
@@ -295,3 +293,5 @@ en:
     transferred_at: 'Transferred at'
     transfer_confirm_time: 'Transfer confirm time'
     request_domain_transfer: 'Request domain transfer'
+    password_invalid: 'Password invalid!'
+    domain_was_not_found: 'Domain was not found!'