From bc152acaf2704e8e035b2f660d538287365fbca2 Mon Sep 17 00:00:00 2001
From: Angel Perez <iAngel.p93@gmail.com>
Date: Fri, 20 Jul 2018 15:29:34 -0400
Subject: [PATCH] Don't evaluate a conditional and assign a variable on the
 same line

---
 config/initializers/i18n_translation.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/initializers/i18n_translation.rb b/config/initializers/i18n_translation.rb
index ca1ec8cfd..cf3703ce2 100644
--- a/config/initializers/i18n_translation.rb
+++ b/config/initializers/i18n_translation.rb
@@ -7,15 +7,19 @@ module ActionView
       include TagHelper
 
       def t(key, options = {})
-        if translation = I18nContent.by_key(key).last
+        translation = I18nContent.by_key(key).last
+
+        if translation.present?
           Globalize.with_locale(locale) do
             string = I18nContent.where(key: key).first.value
             options.each do |key, value|
               string.sub! "%{#{key}}", (value || "%{#{key}}")
             end
+
             return string.html_safe
           end
         end
+
         translate(key, options)
       end
     end