diff --git a/app/helpers/admin/property_hires_helper.rb b/app/helpers/admin/property_hires_helper.rb
index 65bb585..b761d51 100644
--- a/app/helpers/admin/property_hires_helper.rb
+++ b/app/helpers/admin/property_hires_helper.rb
@@ -137,8 +137,8 @@ module Admin::PropertyHiresHelper
property = Property.where(id: property_id).first
if !property.nil?
email_set = property.hire_email_sets.select{|v| v.field_name == field_name}
- title = property['title'].collect{|k,v| v}.select{|v| !v.to_s.empty?}.join('/')
- note = property['note'].collect{|k,v| v}.select{|v| !v.to_s.empty?}.join('/')
+ title = property.title_translations.collect{|k,v| v}.select{|v| v.present?}.uniq.join('/')
+ note = property.note_translations.collect{|k,v| v}.select{|v| v.present?}.uniq.join('/')
content = "title:#{title}
note:#{note}"
mail_subject = I18n.t("property_hire.email_#{field_name}_success")
email_set_content = nil
diff --git a/app/views/email/delete_email.html.erb b/app/views/email/delete_email.html.erb
index e380c5c..c3abebb 100644
--- a/app/views/email/delete_email.html.erb
+++ b/app/views/email/delete_email.html.erb
@@ -8,7 +8,7 @@
<% property = Property.where(id: @data['property_id']).first %>
<% if !property.nil? %>
-
<%= property['title'].collect{|k,v| v}.uniq.join('/') rescue nil %>
+ <%= property.title_translations.collect{|k,v| v}.select{|v| v.present?}.uniq.join('/') rescue nil %>
<% I18n.with_locale(@data['locale']) do %>
@@ -30,7 +30,7 @@
<% elsif ['purchase_date'].include?(k) %>
<%= v.strftime('%Y/%m/%d %H:%M') rescue nil %>
<% elsif ['property_usage','note'].include?(k) %>
- <%= property[k].collect{|k,v| v}.uniq.join('/') rescue nil %>
+ <%= property.send("#{k}_translations").collect{|k,v| v}.select{|v| v.present?}.uniq.join('/') rescue nil %>
<% elsif k=='owners' %>
<%= property.owner_profiles.collect{|v| v.name}.join(', ') %>
<% elsif ['category','property_location'].include?(k) %>
diff --git a/app/views/email/edit_email.html.erb b/app/views/email/edit_email.html.erb
index 8acc41c..286e1a2 100644
--- a/app/views/email/edit_email.html.erb
+++ b/app/views/email/edit_email.html.erb
@@ -7,7 +7,7 @@
<% else %>
<%= t('property_hire.email_edit_success') %>
<% end %>
-<%= property['title'].collect{|k,v| v}.uniq.join('/') rescue nil %>
+<%= property.title_translations.collect{|k,v| v}.select{|v| v.present?}.uniq.join('/') rescue nil %>
<% I18n.with_locale(@data['locale']) do %>
@@ -29,7 +29,7 @@
<% elsif ['purchase_date'].include?(k) %>
<%= v.strftime('%Y/%m/%d %H:%M') rescue nil %>
<% elsif ['property_usage','note'].include?(k) %>
- <%= property[k].collect{|k,v| v}.uniq.join('/') rescue nil %>
+ <%= property.send("#{k}_translations").collect{|k,v| v}.select{|v| v.present?}.uniq.join('/') rescue nil %>
<% elsif k=='owners' %>
<%= property.owner_profiles.collect{|v| v.name}.join(', ') rescue nil %>
<% elsif ['category','property_location'].include?(k) %>