enju_biblio 0.3.13 → 0.4.0.beta.1

data/app/models/resource_export_file.rb

@@ -30,11 +30,13 @@ class ResourceExportFile < ApplicationRecord
   def export!
     transition_to!(:started)
     role_name = user.try(:role).try(:name)
-    tsv = Manifestation.export(role: role_name)
-    file = StringIO.new(tsv)
-    file.class.class_eval { attr_accessor :original_filename, :content_type }
-    file.original_filename =  'resource_export.txt'
-    self.resource_export = file
+    tempfile = Tempfile.new(['resource_export_file_', '.txt'])
+    tempfile.puts(Manifestation.csv_header(role_name, col_sep: "\t"))
+    Manifestation.find_each do |manifestation|
+      tempfile.puts(manifestation.to_csv(format: :txt, role: role_name))
+    end
+    tempfile.close
+    self.resource_export = File.new(tempfile.path, "r")
     save!
     transition_to!(:completed)
     mailer = ResourceExportMailer.completed(self)
@@ -64,7 +66,7 @@ end
 #  user_id                      :integer
 #  resource_export_file_name    :string
 #  resource_export_content_type :string
-#  resource_export_file_size    :integer
+#  resource_export_file_size    :bigint
 #  resource_export_updated_at   :datetime
 #  executed_at                  :datetime
 #  created_at                   :datetime

data/app/models/resource_export_file_state_machine.rb

@@ -6,7 +6,7 @@ class ResourceExportFileStateMachine
   state :completed
   state :failed
 
-  transition from: :pending, to: [:started, :failed]
+  transition from: :pending, to: :started
   transition from: :started, to: [:completed, :failed]
 
   after_transition(from: :pending, to: :started) do |resource_export_file|

data/app/models/resource_import_file.rb

@@ -76,13 +76,12 @@ class ResourceImportFile < ApplicationRecord
     #end
     row_num = 1
 
-    ResourceImportResult.create!(resource_import_file_id: id, body: (%w( imported_manifestation_id imported_item_id ) + rows.headers).join("\t"))
+    ResourceImportResult.create!(resource_import_file_id: id, body: rows.headers.join("\t"))
     rows.each do |row|
       row_num += 1
-      import_result = ResourceImportResult.new(resource_import_file_id: id)
+      import_result = ResourceImportResult.create!(resource_import_file_id: id, body: row.fields.join("\t"))
       if row['dummy'].to_s.strip.present?
         import_result.error_message = "line #{row_num}: #{I18n.t('import.dummy')}"
-        import_result.body = ([nil, nil] + row.fields).join("\t")
         import_result.save!
         next
       end
@@ -93,7 +92,6 @@ class ResourceImportFile < ApplicationRecord
         import_result.item = item
         import_result.manifestation = item.manifestation
         import_result.error_message = "line #{row_num}: #{I18n.t('import.item_found')}"
-        import_result.body = ([item.manifestation.id, item.id] + row.fields).join("\t")
         import_result.save!
         num[:item_found] += 1
         next
@@ -189,13 +187,8 @@ class ResourceImportFile < ApplicationRecord
       import_result.manifestation = manifestation
 
       if manifestation
-        ResourceImportFile.import_manifestation_custom_value(row, manifestation).each do |value|
-          value.update!(manifestation: manifestation)
-        end
-
-        item = nil
         if item_identifier.present? || row['shelf'].present? || row['call_number'].present?
-          item = create_item(row, manifestation)
+          import_result.item = create_item(row, manifestation)
         else
           if manifestation.fulltext_content?
             item = create_item(row, manifestation)
@@ -207,21 +200,17 @@ class ResourceImportFile < ApplicationRecord
           end
           num[:failed] += 1
         end
-
-        if item
-          ResourceImportFile.import_item_custom_value(row, item).each do |value|
-            value.update!(item: item)
-          end
-
-          import_result.item = item
-        end
       else
         num[:failed] += 1
       end
 
-      import_result.body = ([manifestation.try(:id), item.try(:id)] + row.fields).join("\t")
       import_result.save!
-      num[:item_imported] += 1 if import_result.item
+      num[:item_imported] +=1 if import_result.item
+
+      if row_num % 50 == 0
+        Sunspot.commit
+        GC.start
+      end
     end
 
     Sunspot.commit
@@ -322,24 +311,55 @@ class ResourceImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       import_result = ResourceImportResult.create!(resource_import_file_id: id, body: row.fields.join("\t"))
-      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
-      unless item
-        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
-      end
-
+      item_identifier = row['item_identifier'].to_s.strip
+      item = Item.find_by(item_identifier: item_identifier) if item_identifier.present?
       if item
         if item.manifestation
           fetch(row, edit_mode: 'update')
-          item = update_item(item, row)
         end
-
-        ResourceImportFile.import_item_custom_value(row, item).each do |value|
-          value.update!(item: item)
+        shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
+        bookstore = Bookstore.find_by(name: row['bookstore'])
+        required_role = Role.find_by(name: row['required_role'])
+
+        item.shelf = shelf if shelf
+        item.bookstore = bookstore if bookstore
+        item.required_role = required_role if required_role
+
+        acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
+        binded_at = Time.zone.parse(row['binded_at']) rescue nil
+        item.acquired_at = acquired_at if acquired_at
+        item.binded_at = binded_at if binded_at
+
+        if defined?(EnjuCirculation)
+          circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
+          checkout_type = CheckoutType.find_by(name: row['checkout_type'])
+          use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
+          item.circulation_status = circulation_status if circulation_status
+          item.checkout_type = checkout_type if checkout_type
+          item.use_restriction = use_restriction if use_restriction
         end
-        ResourceImportFile.import_manifestation_custom_value(row, item.manifestation).each do |value|
-          value.update!(manifestation: item.manifestation)
+
+        item_columns = %w(
+          call_number
+          binding_item_identifier binding_call_number binded_at
+        )
+        item_columns.each do |column|
+          if row[column].present?
+            item.assign_attributes(:"#{column}" => row[column])
+          end
         end
 
+        item.price = row['item_price'] if row['item_price'].present?
+        item.note = row['item_note'].try(:gsub, /\\n/, "\n") if row['item_note'].present?
+        item.url = row['item_url'] if row['item_url'].present?
+
+        if row['include_supplements']
+          if %w(t true).include?(row['include_supplements'].downcase.strip)
+            item.include_supplements = true
+          else
+            item.include_supplements = false if item.include_supplements
+          end
+        end
         item.manifestation.reload
         item.save!
         import_result.item = item
@@ -351,9 +371,6 @@ class ResourceImportFile < ApplicationRecord
         end
         if manifestation
           fetch(row, edit_mode: 'update')
-          ResourceImportFile.import_manifestation_custom_value(row, manifestation).each do |value|
-            value.update!(manifestation: manifestation)
-          end
           import_result.manifestation = manifestation
         end
       end
@@ -379,11 +396,8 @@ class ResourceImportFile < ApplicationRecord
 
     rows.each do |row|
       row_num += 1
-      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
-      unless item
-        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
-      end
-
+      item_identifier = row['item_identifier'].to_s.strip
+      item = Item.find_by(item_identifier: item_identifier)
       if item
         item.destroy if item.removable?
       end
@@ -407,9 +421,10 @@ class ResourceImportFile < ApplicationRecord
     row_num = 1
 
     rows.each do |row|
-      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
+      item_identifier = row['item_identifier'].to_s.strip
+      item = Item.find_by(item_identifier: item_identifier)
       unless item
-        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
+        item = Item.find_by(id: row['item_id'].to_s.strip)
       end
 
       manifestation_identifier = row['manifestation_identifier'].to_s.strip
@@ -466,9 +481,6 @@ class ResourceImportFile < ApplicationRecord
       use_restriction include_supplements item_note item_url
       dummy
     )
-    header_columns += ManifestationCustomProperty.order(:position).pluck(:name).map{|c| "manifestation:#{c}"}
-    header_columns += ItemCustomProperty.order(:position).pluck(:name).map{|c| "item:#{c}"}
-
     if defined?(EnjuSubject)
       header_columns += ClassificationType.order(:position).pluck(:name).map{|c| "classification:#{c}"}
       header_columns += SubjectHeadingType.order(:position).pluck(:name).map{|s| "subject:#{s}"}
@@ -565,68 +577,12 @@ class ResourceImportFile < ApplicationRecord
     item
   end
 
-  def update_item(item, row)
-    shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
-    bookstore = Bookstore.find_by(name: row['bookstore'])
-    required_role = Role.find_by(name: row['required_role'])
-
-    item.shelf = shelf if shelf
-    item.bookstore = bookstore if bookstore
-    item.required_role = required_role if required_role
-
-    acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
-    binded_at = Time.zone.parse(row['binded_at']) rescue nil
-    item.acquired_at = acquired_at if acquired_at
-    item.binded_at = binded_at if binded_at
-
-    if defined?(EnjuCirculation)
-      circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
-      checkout_type = CheckoutType.find_by(name: row['checkout_type'])
-      use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
-      item.circulation_status = circulation_status if circulation_status
-      item.checkout_type = checkout_type if checkout_type
-      item.use_restriction = use_restriction if use_restriction
-    end
-
-    item_columns = %w(
-      call_number
-      binding_item_identifier binding_call_number binded_at
-    )
-    item_columns.each do |column|
-      if row[column].present?
-        item.assign_attributes(:"#{column}" => row[column])
-      end
-    end
-
-    item.price = row['item_price'] if row['item_price'].present?
-    item.note = row['item_note'].try(:gsub, /\\n/, "\n") if row['item_note'].present?
-    item.url = row['item_url'] if row['item_url'].present?
-
-    if row['include_supplements']
-      if %w(t true).include?(row['include_supplements'].downcase.strip)
-        item.include_supplements = true
-      else
-        item.include_supplements = false if item.include_supplements
-      end
-    end
-
-    item
-  end
-
   def fetch(row, options = {edit_mode: 'create'})
-    manifestation = nil
-    item = nil
-
-    if options[:edit_mode] == 'update'
-      if row['item_identifier'].to_s.strip.present?
-        item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip)
-      end
-      if row['item_id'].to_s.strip.present?
-        item = Item.find_by(id: row['item_id'].to_s.strip)
-      end
-
-      manifestation = item.manifestation if item
-
+    case options[:edit_mode]
+    when 'create'
+      manifestation = nil
+    when 'update'
+      manifestation = Item.find_by(item_identifier: row['item_identifier'].to_s.strip).try(:manifestation)
       unless manifestation
         manifestation_identifier = row['manifestation_identifier'].to_s.strip
         manifestation = Manifestation.find_by(manifestation_identifier: manifestation_identifier) if manifestation_identifier
@@ -807,7 +763,6 @@ class ResourceImportFile < ApplicationRecord
         manifestation.set_agent_role_type(publishers_list, scope: :publisher)
       end
     end
-
     manifestation
   end
 
@@ -822,7 +777,7 @@ class ResourceImportFile < ApplicationRecord
   def set_identifier(row)
     identifiers = []
     %w(isbn issn doi jpno ncid).each do |id_type|
-      if row[id_type.to_s].present?
+      if row["#{id_type}"].present?
         row[id_type].split(/\/\//).each do |identifier_s|
           import_id = Identifier.new(body: identifier_s)
           identifier_type = IdentifierType.find_by(name: id_type)
@@ -834,52 +789,6 @@ class ResourceImportFile < ApplicationRecord
     end
     identifiers
   end
-
-  def self.import_manifestation_custom_value(row, manifestation)
-    values = []
-    ManifestationCustomProperty.order(:position).pluck(:name).map{|c| "manifestation:#{c}"}.each do |column_name|
-      value = nil
-      property = column_name.split(':').last
-      next if row[column_name].blank?
-      if manifestation
-        value = manifestation.manifestation_custom_values.find_by(manifestation_custom_property: property)
-      end
-
-      if value
-        value.value = row[column_name]
-      else
-        value = ManifestationCustomValue.new(
-          manifestation_custom_property: ManifestationCustomProperty.find_by(name: property),
-          value: row[column_name]
-        )
-      end
-      values << value
-    end
-    values
-  end
-
-  def self.import_item_custom_value(row, item)
-    values = []
-    ItemCustomProperty.order(:position).pluck(:name).map{|c| "item:#{c}"}.each do |column_name|
-      value = nil
-      property = column_name.split(':').last
-      next if row[column_name].blank?
-      if item
-        value = item.item_custom_values.find_by(item_custom_property: property)
-      end
-
-      if value
-        value.value = row[column_name]
-      else
-        value = ItemCustomValue.new(
-          item_custom_property: ItemCustomProperty.find_by(name: property),
-          value: row[column_name]
-        )
-      end
-      values << value
-    end
-    values
-  end
 end
 
 # == Schema Information

data/app/views/agent_import_results/index.txt.erb

@@ -0,0 +1,3 @@
+<%- @agent_import_results.each do |agent_import_result| -%>
+<%= agent_import_result.body %>
+<%- end -%>

data/app/views/agent_relationship_types/index.html.erb

@@ -24,7 +24,7 @@
     </td>
     <td><%= agent_relationship_type.name -%></td>
     <td>
-      <%= link_to agent_relationship_type.display_name.localize, agent_relationship_type -%>
+      <%= link_to agent_relationship_type.display_name, agent_relationship_type -%>
       <br />
       <%= agent_relationship_type.note %>
     </td>

data/app/views/agent_relationship_types/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.agent_relationship_type.display_name') -%>:</strong>
-  <%= @agent_relationship_type.display_name.localize -%>
+  <%= @agent_relationship_type.display_name -%>
 </p>
 
 <p>

data/app/views/agent_relationships/_form.html.erb

@@ -23,7 +23,7 @@
   </div>
   <div class="field">
     <%= f.label :agent_relationship_type_id %><br />
-    <%= f.select(:agent_relationship_type_id, @agent_relationship_types.collect{|r| [r.display_name.localize, r.id]}) -%>
+    <%= f.select(:agent_relationship_type_id, @agent_relationship_types.collect{|r| [r.display_name, r.id]}) -%>
   </div>
   <div class="actions">
     <%= f.submit %>

data/app/views/agent_types/index.html.erb

@@ -24,7 +24,7 @@
     </td>
     <td><%= agent_type.name -%></td>
     <td>
-      <%= link_to agent_type.display_name.localize, agent_type -%>
+      <%= link_to agent_type.display_name, agent_type -%>
       <br />
       <%= agent_type.note %>
     </td>

data/app/views/agent_types/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.agent_type.display_name') -%>:</strong>
-  <%= @agent_type.display_name.localize -%>
+  <%= @agent_type.display_name -%>
 </p>
 
 <p>

data/app/views/agents/_agent.html.erb

@@ -3,7 +3,7 @@
         <%= link_to agent.full_name, agent -%><br />
         <%= agent.full_name_transcription -%>
       </td>
-      <td><%= agent.agent_type.display_name.localize -%></td>
+      <td><%= agent.agent_type.display_name -%></td>
       <td>
         <%- if policy(agent).destroy? -%>
           <%= link_to t('page.edit'), edit_agent_path(agent) -%>

data/app/views/agents/_agent_list.html.erb

@@ -3,14 +3,14 @@
     <%- @agent.parents.each do |agent_relationship| -%>
       <li>
         [P]
-        (<%= agent_relationship.agent_relationship_type.display_name.localize -%>)
+        (<%= agent_relationship.agent_relationship_type.display_name -%>)
         <%= link_to agent_relationship.parent.full_name, agent_relationship.parent -%>
       </li>
     <%- end -%>
     <%- @agent.children.each do |agent_relationship| -%>
       <li>
         [P]
-        (<%= agent_relationship.agent_relationship_type.display_name.localize -%>)
+        (<%= agent_relationship.agent_relationship_type.display_name -%>)
         <%= link_to agent_relationship.child.full_name, agent_relationship.child -%>
       </li>
     <%- end -%>

data/app/views/agents/_form.html.erb

@@ -4,7 +4,7 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.agent_type') -%>
-    <%= f.select(:agent_type_id, @agent_types.collect{|p| [p.display_name.localize, p.id]}) -%>
+    <%= f.select(:agent_type_id, @agent_types.collect{|p| [p.display_name, p.id]}) -%>
   </div>
 
   <div class="field">
@@ -52,12 +52,12 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.language') -%>
-    <%= f.select(:language_id, @languages.collect{|l| [l.display_name.localize, l.id]}) -%>
+    <%= f.select(:language_id, @languages.collect{|l| [l.display_name, l.id]}) -%>
   </div>
 
   <div class="field">
     <%= f.label t('activerecord.models.country') -%>
-    <%= f.select(:country_id, @countries.collect{|c| [c.display_name.localize, c.id]}) -%>
+    <%= f.select(:country_id, @countries.collect{|c| [c.display_name, c.id]}) -%>
   </div>
 
   <div class="field">
@@ -72,7 +72,7 @@
 
   <div class="field">
     <%= f.label t('role.required_role') -%>
-    <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
+    <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name, r.id]}) -%>
   </div>
 
   <div class="actions">

data/app/views/agents/_index_agent.html.erb

@@ -32,7 +32,7 @@
         <%= link_to agent.full_name, agent -%><br />
         <%= agent.full_name_transcription -%>
       </td>
-      <td><%= agent.agent_type.display_name.localize -%></td>
+      <td><%= agent.agent_type.display_name -%></td>
       <td><%=l agent.date_of_birth if agent.date_of_birth -%></td>
       <td>
         <%- if policy(agent).destroy? -%>

data/app/views/agents/_index_agent_merge_list.html.erb

@@ -26,7 +26,7 @@
 <%- @agents.each do |agent| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to agent.full_name, agent_merge_list_agent_path(@agent_merge_list, agent) -%></td>
-    <td><%= agent.agent_type.display_name.localize -%></td>
+    <td><%= agent.agent_type.display_name -%></td>
     <td><%=l agent.date_of_birth if agent.date_of_birth -%></td>
     <td>
       <%- if policy(agent).destroy? -%>

data/app/views/agents/_index_expression.html.erb

@@ -30,8 +30,8 @@
   <%- @agents.each do |agent| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td><%= link_to agent.full_name, agent -%></td>
-      <td><%= expression.realized(agent).realize_type.display_name.localize if params[:mode] != 'add' and expression.realized(agent).try(:realize_type) -%></td>
-      <td><%= agent.agent_type.display_name.localize -%></td>
+      <td><%= expression.realized(agent).realize_type.display_name if params[:mode] != 'add' and expression.realized(agent).try(:realize_type) -%></td>
+      <td><%= agent.agent_type.display_name -%></td>
       <td>
         <%- if policy(agent).destroy? -%>
           <%- if params[:mode] == 'add' -%>

data/app/views/agents/_index_manifestation.html.erb

@@ -26,8 +26,8 @@
   <%- @agents.each do |agent| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td><%= link_to agent.full_name, agent -%></td>
-      <td><%= manifestation.produced(agent).produce_type.display_name.localize if params[:mode] != 'add' and manifestation.produced(agent).try(:produce_type) -%></td>
-      <td><%= agent.agent_type.display_name.localize -%></td>
+      <td><%= manifestation.produced(agent).produce_type.display_name if params[:mode] != 'add' and manifestation.produced(agent).try(:produce_type) -%></td>
+      <td><%= agent.agent_type.display_name -%></td>
       <td>
         <%- if policy(agent).destroy? -%>
           <%- if params[:mode] == 'add' -%>

data/app/views/agents/_index_work.html.erb

@@ -34,8 +34,8 @@
   <%- @agents.each do |agent| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td><%= link_to agent.full_name, agent -%></td>
-      <td><%= work.created(agent).create_type.display_name.localize if params[:mode] != 'add' and work.created(agent).try(:create_type) -%></td>
-      <td><%= agent.agent_type.display_name.localize -%></td>
+      <td><%= work.created(agent).create_type.display_name if params[:mode] != 'add' and work.created(agent).try(:create_type) -%></td>
+      <td><%= agent.agent_type.display_name -%></td>
       <td>
         <%- if policy(agent).destroy? -%>
           <%- if params[:mode] == 'add' -%>

data/app/views/agents/index.atom.builder

@@ -1,5 +1,5 @@
 atom_feed(url: agents_url(format: :atom)) do |feed|
-  feed.title t('agent.library_group_agent', library_group_name: @library_group.display_name.localize)
+  feed.title t('agent.library_group_agent', library_group_name: @library_group.display_name)
   feed.updated(@agents.first ? @agents.first.created_at : Time.zone.now)
 
   @agents.each do |agent|

data/app/views/agents/index.rss.builder

@@ -3,12 +3,12 @@ xml.rss('version' => "2.0",
         'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
-    xml.title t('agent.library_group_agent', library_group_name: @library_group.display_name.localize)
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(request.params.merge(format: nil, only_path: true))}"
+    xml.title t('agent.library_group_agent', library_group_name: @library_group.display_name)
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(filtered_params.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(request.params.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(filtered_params.merge(format: :rss, only_path: true))}"
     xml.tag! "atom:link", rel: 'alternate', href: agents_url
     xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: page_opensearch_url
     if params[:query].present?

data/app/views/agents/show.html+phone.erb

@@ -20,7 +20,7 @@
       </tr>
       <tr>
         <td><strong><%= t('activerecord.models.agent_type') -%>:</strong></td>
-        <td><%= @agent.agent_type.display_name.localize -%></td>
+        <td><%= @agent.agent_type.display_name -%></td>
       </tr>
       <tr>
         <td><strong><%= t('activerecord.attributes.agent.email') -%>:</strong></td>
@@ -44,7 +44,7 @@
       </tr>
       <tr>
         <td><strong><%= t('activerecord.models.language') -%>:</strong></td>
-        <td><%= @agent.language.display_name.localize -%></td>
+        <td><%= @agent.language.display_name -%></td>
       </tr>
       <tr>
         <td><strong><%= t('activerecord.attributes.agent.note') -%>:</strong></td>

data/app/views/agents/show.html.erb

@@ -29,7 +29,7 @@
       </tr>
       <tr>
         <td><strong><%= t('activerecord.models.agent_type') -%>:</strong></td>
-        <td><%= @agent.agent_type.display_name.localize -%></td>
+        <td><%= @agent.agent_type.display_name -%></td>
       </tr>
       <tr>
         <td><strong><%= t('activerecord.attributes.agent.email') -%>:</strong></td>
@@ -53,7 +53,7 @@
       </tr>
       <tr>
         <td><strong><%= t('activerecord.models.language') -%>:</strong></td>
-        <td><%= @agent.language.display_name.localize -%></td>
+        <td><%= @agent.language.display_name -%></td>
       </tr>
       <tr>
         <td><strong><%= t('activerecord.attributes.agent.note') -%>:</strong></td>

data/app/views/carrier_types/index.html.erb

@@ -23,11 +23,11 @@
       <%- end -%>
     </td>
     <td>
-      <%= image_tag(carrier_type_path(carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: carrier_type.display_name.localize) %>
+      <%= image_tag(carrier_type_path(carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: carrier_type.display_name) %>
       <%= carrier_type.name -%>
     </td>
     <td>
-      <%= link_to carrier_type.display_name.localize, carrier_type -%>
+      <%= link_to carrier_type.display_name, carrier_type -%>
       <br />
       <%= carrier_type.note %>
     </td>

data/app/views/carrier_types/show.html.erb

@@ -10,13 +10,13 @@
 
 <p>
   <strong><%= t('activerecord.attributes.carrier_type.display_name') -%>:</strong>
-  <%= @carrier_type.display_name.localize -%>
+  <%= @carrier_type.display_name -%>
 </p>
 
 <p>
   <strong><%= t('page.file') -%>:</strong>
   <%= link_to carrier_type_path(@carrier_type, format: :download) do -%>
-    <%= image_tag(carrier_type_path(@carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: @carrier_type.display_name.localize) %>
+    <%= image_tag(carrier_type_path(@carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: @carrier_type.display_name) %>
     <%= @carrier_type.attachment_file_name %>
   <% end %>
 </p>
@@ -27,7 +27,7 @@
   </p>
   <ul>
     <% @carrier_type.checkout_types.each do |checkout_type| %>
-      <li><%= link_to checkout_type.display_name.localize, checkout_type %></li>
+      <li><%= link_to checkout_type.display_name, checkout_type %></li>
     <% end %>
   </ul>
 <% end %>

data/app/views/content_types/index.html.erb

@@ -24,7 +24,7 @@
     </td>
     <td><%= content_type.name -%></td>
     <td>
-      <%= link_to content_type.display_name.localize, content_type -%>
+      <%= link_to content_type.display_name, content_type -%>
       <br />
       <%= content_type.note %>
     </td>