Merge pull request #7839 from fjordllc/fix/request_retirement

マージ済みの#7640のバグ修正
fjordllc · Jun 10, 2024 · e1ed472 · e1ed472
2 parents 1bf80e9 + 25b4548
commit e1ed472
Showing 1 changed file with 8 additions and 17 deletions.
diff --git a/app/views/user_mailer/request_retirement.html.erb b/app/views/user_mailer/request_retirement.html.erb
@@ -7,15 +7,6 @@
     </td>
   </tr>
 
-<% requester_name_text = I18n.t('activerecord.attributes.request_retirement.requester_name') %>
-<% requester_email_text = I18n.t('activerecord.attributes.request_retirement.requester_email') %>
-<% company_name_text = I18n.t('activerecord.attributes.request_retirement.company_name') %>
-<% target_user_text = RequestRetirement.human_attribute_name(:target_user_id) %>
-<% reason_text = RequestRetirement.human_attribute_name(:reason) %>
-<% keep_data_text = RequestRetirement.human_attribute_name(:keep_data) %>
-<% keep_data_option_text = I18n.t('activerecord.attributes.request_retirement.options.keep') %>
-<% delete_data_option_text = I18n.t('activerecord.attributes.request_retirement.options.delete') %>
-
   <tr>
     <td style="padding: 16px 24px 16px 24px;">
       <div class="a-long-text">
@@ -28,31 +19,31 @@
         </p>
         <ul>
           <li>
-            <%= requester_name_text %><br>
+            <%= RequestRetirement.human_attribute_name(:requester_name) %><br>
             <%= @request_retirement.user.login_name %>
           </li>
           <li>
-            <%= requester_email_text %><br>
+            <%= RequestRetirement.human_attribute_name(:requester_email) %><br>
             <%= @request_retirement.user.email %>
           </li>
           <li>
-            <%= company_name_text %><br>
+            <%= RequestRetirement.human_attribute_name(:company_name) %><br>
             <%= @request_retirement.user.company.name %>
           </li>
           <li>
-            <%= target_user_text %><br>
+            <%= RequestRetirement.human_attribute_name(:target_user) %><br>
             <%= @request_retirement.target_user.name %>
           </li>
           <li>
-            <%= reason_text %><br>
+            <%= RequestRetirement.human_attribute_name(:reason) %><br>
             <%= @request_retirement.reason %>
           </li>
           <li>
-            <%= keep_data_text %><br>
+            <%= RequestRetirement.human_attribute_name(:keep_data) %><br>
             <% if @request_retirement.keep_data %>
-              <%= keep_data_option_text %>
+              <%= RequestRetirement.human_attribute_name('keep_data.option.keep') %>
             <% else %>
-              <%= delete_data_option_text %>
+              <%= RequestRetirement.human_attribute_name('keep_data.option.delete') %>
             <% end %>
           </li>
         </ul>