enju_biblio 0.1.0.pre56 → 0.1.0.pre57

data/app/models/resource_import_file.rb

@@ -6,7 +6,7 @@ class ResourceImportFile < ActiveRecord::Base
     :default_shelf_id, :library_id
   default_scope {order('resource_import_files.id DESC')}
   scope :not_imported, -> {in_state(:pending)}
-  scope :stucked, -> {in_state(:pending).where('created_at < ?', 1.hour.ago)}
+  scope :stucked, -> {in_state(:pending).where('resource_import_files.created_at < ?', 1.hour.ago)}
 
   if Setting.uploaded_file.storage == :s3
     has_attached_file :resource_import, storage: :s3, s3_credentials: "#{Setting.amazon}",
@@ -86,14 +86,14 @@ class ResourceImportFile < ActiveRecord::Base
       unless manifestation
         if row['doi'].present?
           doi = URI.parse(row['doi']).path.gsub(/^\//, "")
-          manifestation = Manifestation.where(doi: doi).first
+          manifestation = Identifier.where(body: doi, identifier_type_id: IdentifierType.where(name: 'doi').first_or_create.id).first.try(:manifestation)
         end
       end
 
       unless manifestation
         if row['jpno'].present?
           jpno = row['jpno'].to_s.strip
-          manifestation = Identifier.where(body: 'jpno', identifier_type_id: IdentifierType.where(name: 'jpno').first_or_create.id).first.try(:manifestation)
+          manifestation = Identifier.where(body: jpno, identifier_type_id: IdentifierType.where(name: 'jpno').first_or_create.id).first.try(:manifestation)
         end
       end
 
@@ -195,13 +195,6 @@ class ResourceImportFile < ActiveRecord::Base
     manifestation
   end
 
-  def self.import_item(manifestation, options)
-    item = Item.new(options)
-    item.shelf = Shelf.web unless item.shelf
-    item.manifestation = manifestation
-    item
-  end
-
   def import_marc(marc_type)
     file = File.open(self.resource_import.path)
     case marc_type
@@ -283,13 +276,16 @@ class ResourceImportFile < ActiveRecord::Base
         item.binded_at = binded_at if binded_at
 
         item_columns = %w(
-          call_number item_price note
+          call_number item_price
           binding_item_identifier binding_call_number binded_at
         )
         item_columns.each do |column|
           item.assign_attributes(:"#{column}" => row[column], as: :admin)
         end
 
+        item.note = row['item_note'] 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
@@ -374,18 +370,21 @@ class ResourceImportFile < ActiveRecord::Base
     header_columns = %w(
       original_title manifestation_identifier item_identifier shelf note
       title_transcription title_alternative title_alternative_transcription
-      periodical manifestation_id publication_place
+      periodical manifestation_id publication_place carrier_type
       series_statement_identifier series_original_title series_creator_string
-      series_title_transcription creator creator_transcription publisher
+      series_title_transcription series_volume_number_string
+      series_title_subseries series_title_subseries_transcription
+      creator creator_transcription publisher
       publisher_transcription pub_date creator creator_transcription
       contributor contributor_transcription description access_address
-      volume_number_string edition_string issue_number_string
-      edition serial_number isbn issn manifestation_price item_price
+      volume_number volume_number_string issue_number issue_number_string
+      edition edition_string serial_number isbn issn manifestation_price
       width height depth number_of_pages jpno lccn budget_type bookstore
-      language fulltext_content required_role doi
+      language fulltext_content required_role doi content_type frequency
+      extent_of_text start_page end_page
       statement_of_responsibility acquired_at call_number circulation_status
-      binding_item_identifier binding_call_number binded_at
-      use_restriction include_supplements
+      binding_item_identifier binding_call_number binded_at item_price
+      use_restriction include_supplements item_note item_url
       dummy
     )
     if defined?(EnjuSubject)
@@ -439,7 +438,7 @@ class ResourceImportFile < ActiveRecord::Base
     budget_type = BudgetType.where(name: row['budget_type'].to_s.strip).first
     acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
     binded_at = Time.zone.parse(row['binded_at']) rescue nil
-    item = self.class.import_item(manifestation, {
+    item = Item.new(
       manifestation_id: manifestation.id,
       item_identifier: row['item_identifier'],
       price: row['item_price'],
@@ -447,8 +446,11 @@ class ResourceImportFile < ActiveRecord::Base
       acquired_at: acquired_at,
       binding_item_identifier: row['binding_item_identifier'],
       binding_call_number: row['binding_call_number'],
-      binded_at: binded_at
-    })
+      binded_at: binded_at,
+      url: row['item_url'],
+      note: row['item_note']
+    )
+    item.manifestation = manifestation
     if defined?(EnjuCirculation)
       circulation_status = CirculationStatus.where(name: row['circulation_status'].to_s.strip).first || CirculationStatus.where(name: 'In Process').first
       item.circulation_status = circulation_status
@@ -461,6 +463,7 @@ class ResourceImportFile < ActiveRecord::Base
     item.bookstore = bookstore
     item.budget_type = budget_type
     item.shelf = shelf
+    item.shelf = Shelf.web unless item.shelf
 
     if %w(t true).include?(row['include_supplements'].to_s.downcase.strip)
       item.include_supplements = true
@@ -504,25 +507,16 @@ class ResourceImportFile < ActiveRecord::Base
     end
 
     # TODO: 小数点以下の表現
-    width = NKF.nkf('-eZ1', row['width'].to_s).gsub(/\D/, '').to_i
-    height = NKF.nkf('-eZ1', row['height'].to_s).gsub(/\D/, '').to_i
-    depth = NKF.nkf('-eZ1', row['depth'].to_s).gsub(/\D/, '').to_i
-    end_page = NKF.nkf('-eZ1', row['number_of_pages'].to_s).gsub(/\D/, '').to_i
     language = Language.where(name: row['language'].to_s.strip.camelize).first
-    language = Language.where(:iso_639_2 => row['language'].to_s.strip.downcase).first unless language
-    language = Language.where(:iso_639_1 => row['language'].to_s.strip.downcase).first unless language
+    language = Language.where(iso_639_2: row['language'].to_s.strip.downcase).first unless language
+    language = Language.where(iso_639_1: row['language'].to_s.strip.downcase).first unless language
     
     carrier_type = CarrierType.where(name: row['carrier_type'].to_s.strip).first
+    content_type = ContentType.where(name: row['content_type'].to_s.strip).first
+    frequency = Frequency.where(name: row['frequency'].to_s.strip).first
 
     identifier = set_identifier(row)
 
-    if end_page >= 1
-      start_page = 1
-    else
-      start_page = nil
-      end_page = nil
-    end
-
     if %w(t true).include?(row['fulltext_content'].to_s.downcase.strip)
       fulltext_content = true
     end
@@ -561,9 +555,6 @@ class ResourceImportFile < ActiveRecord::Base
           work.subjects = subjects.uniq unless subjects.empty?
         end
       end
-      if row['volume_number'].present?
-        volume_number = row['volume_number'].to_s.tr('０-９', '0-9').to_i
-      end
 
       attributes = {
         :original_title => title[:original_title],
@@ -571,31 +562,34 @@ class ResourceImportFile < ActiveRecord::Base
         :title_alternative => title[:title_alternative],
         :title_alternative_transcription => title[:title_alternative_transcription],
         :pub_date => row['pub_date'],
-        :volume_number_string => row['volume_number_string'].to_s.split('　').first.try(:tr, '０-９', '0-9'),
+        :volume_number => row['volume_number'],
+        :volume_number_string => row['volume_number_string'],
+        :issue_number => row['issue_number'],
         :issue_number_string => row['issue_number_string'],
         :serial_number => row['serial_number'],
         :edition => row['edition'],
         :edition_string => row['edition_string'],
-        :width => width,
-        :depth => depth,
-        :height => height,
+        :width => row['width'],
+        :depth => row['depth'],
+        :height => row['height'],
         :price => row['manifestation_price'],
         :description => row['description'],
         #:description_transcription => row['description_transcription'],
         :note => row['note'],
         :statement_of_responsibility => row['statement_of_responsibility'],
-        :start_page => start_page,
-        :end_page => end_page,
         :access_address => row['access_address'],
         :manifestation_identifier => row['manifestation_identifier'],
         :fulltext_content => fulltext_content,
-        :publication_place => row['publication_place']
+        :publication_place => row['publication_place'],
+        :extent_of_text => row['extent_of_text'],
+        :start_page => row['start_page'],
+        :end_page => row['end_page']
       }.delete_if{|key, value| value.nil?}
+
       manifestation = self.class.import_manifestation(expression, publisher_agents, attributes,
       {
         edit_mode: options[:edit_mode]
       })
-      manifestation.volume_number = volume_number if volume_number
 
       required_role = Role.where(name: row['required_role_name'].to_s.strip.camelize).first
       if required_role and row['required_role_name'].present?
@@ -611,38 +605,44 @@ class ResourceImportFile < ActiveRecord::Base
       end
 
       manifestation.carrier_type = carrier_type if carrier_type
-
-      Manifestation.transaction do
-        manifestation.identifiers.delete_all if manifestation.identifiers.exists?
-        identifier.each do |k, v|
-          manifestation.identifiers << v if v.valid?
-        end
-      end
+      manifestation.manifestation_content_type = content_type if content_type
+      manifestation.frequency = frequency if frequency
+      #manifestation.start_page = row[:start_page].to_i if row[:start_page]
+      #manifestation.end_page = row[:end_page].to_i if row[:end_page]
 
       if row['series_original_title'].to_s.strip.present?
         Manifestation.transaction do
           if manifestation.series_statements.exists?
             manifestation.series_statements.delete_all
           end
-          series_title = row['series_original_title'].split('//')
-          series_title_transcription = row['series_title_transcription'].split('//')
-          series_statement = SeriesStatement.new(
-            :original_title => series_title[0],
-            :title_transcription => series_title_transcription[0],
-            :title_subseries => "#{series_title[1]} #{series_title[2]}",
-            :title_subseries_transcription => "#{series_title_transcription[1]} #{series_title_transcription[2]}",
-            :volume_number_string => series_title[0],
-            :creator_string => row['series_creator_string'],
-          )
-          series_statement.manifestation = manifestation
-          series_statement.save!
+          if row['series_original_title']
+            series_statement = SeriesStatement.new(
+              :original_title => row['series_original_title'],
+              :title_transcription => row['series_title_transcription'],
+              :title_subseries => row['series_title_subseries'],
+              :title_subseries_transcription => row['series_title_subseries_transcription'],
+              :volume_number_string => row['series_volume_number_string'],
+              :creator_string => row['series_creator_string'],
+            )
+            series_statement.manifestation = manifestation
+            series_statement.save!
+          end
         end
       end
 
-      if defined?(EnjuSubject)
-        classifications = import_classification(row)
-        if classifications.present?
-          manifestation.classifications << classifications
+      if manifestation.save
+        Manifestation.transaction do
+          manifestation.identifiers.delete_all if manifestation.identifiers.exists?
+          identifier.each do |k, v|
+            manifestation.identifiers << v if v.valid?
+          end
+        end
+
+        if defined?(EnjuSubject)
+          classifications = import_classification(row)
+          if classifications.present?
+            manifestation.classifications << classifications
+          end
         end
       end
 
@@ -663,17 +663,11 @@ class ResourceImportFile < ActiveRecord::Base
 
   def set_identifier(row)
     identifier = {}
-    if row['isbn']
-      identifier[:isbn] = Identifier.new(body: row['isbn'])
-      identifier[:isbn].identifier_type = IdentifierType.where(name: 'isbn').first_or_create
-    end
-    if row['jpno']
-      identifier[:jpno] = Identifier.new(body: row['jpno'])
-      identifier[:jpno].identifier_type = IdentifierType.where(name: 'jpno').first_or_create
-    end
-    if row['issn']
-      identifier[:issn] = Identifier.new(body: row['issn'])
-      identifier[:issn].identifier_type = IdentifierType.where(name: 'issn').first_or_create
+    %w(isbn issn doi jpno).each do |id_type|
+      if row["#{id_type}"].present?
+        identifier[:"#{id_type}"] = Identifier.new(body: row["#{id_type}"])
+        identifier[:"#{id_type}"].identifier_type = IdentifierType.where(name: id_type).first_or_create
+      end
     end
     identifier
   end

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

@@ -1,6 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent_import_file')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>

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

@@ -1,6 +1,7 @@
-<div id="agent_relationship_detail" class="ui-corner-all ui-widget-agent_relationship">
+<div id="agent_relationship_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent_relationship_type')) -%></h1>
-<div id="agent_relationship_list">
+<div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
@@ -42,9 +43,9 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all ui-widget-agent_relationship">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, ContentType -%>
+    <%- if can? :create, AgentRelationshipType -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.agent_relationship_type')), new_agent_relationship_type_path -%></li>
     <%- end -%>
   </ul>

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

@@ -1,6 +1,7 @@
-<div id="agent_detail" class="ui-corner-all ui-widget-agent">
+<div id="agent_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent_type')) -%></h1>
-<div id="agent_list">
+<div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
@@ -42,9 +43,9 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all ui-widget-agent">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, ContentType -%>
+    <%- if can? :create, AgentType -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.agent_type')), new_agent_type_path -%></li>
     <%- end -%>
   </ul>

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

@@ -1,6 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.carrier_type')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
@@ -44,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, ContentType -%>
+    <%- if can? :create, CarrierType -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.carrier_type')), new_carrier_type_path -%></li>
     <%- end -%>
   </ul>

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

@@ -1,6 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.content_type')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>

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

@@ -13,6 +13,11 @@
   <%= @country.display_name.localize %>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.country.note') -%>:</strong>
+  <%= @country.note -%>
+</p>
+
 </div>
 </div>
 

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

@@ -1,6 +1,7 @@
-<div id="create_detail" class="ui-corner-all ui-widget-create">
+<div id="create_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.create_type')) -%></h1>
-<div id="create_list">
+<div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
@@ -42,9 +43,9 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all ui-widget-create">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, ContentType -%>
+    <%- if can? :create, CreateType -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.create_type')), new_create_type_path -%></li>
     <%- end -%>
   </ul>

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

@@ -1,6 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.extent')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
@@ -44,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, ContentType -%>
+    <%- if can? :create, Extent -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.extent')), new_extent_path -%></li>
     <%- end -%>
   </ul>

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

@@ -1,6 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.form_of_work')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
@@ -44,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, ContentType -%>
+    <%- if can? :create, FormOfWork -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.form_of_work')), new_form_of_work_path -%></li>
     <%- end -%>
   </ul>

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

@@ -1,6 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.frequency')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
@@ -44,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, ContentType -%>
+    <%- if can? :create, Frequency -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.frequency')), new_frequency_path -%></li>
     <%- end -%>
   </ul>

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

@@ -1,13 +1,17 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.identifier_type')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.identifier_type.name') -%></th>
-    <th><%= t('activerecord.attributes.identifier_type.display_name') -%></th>
-    <th><%= t('activerecord.attributes.identifier_type.note') -%></th>
+    <th>
+      <%= t('activerecord.attributes.identifier_type.display_name') -%>
+      /
+      <%= t('activerecord.attributes.identifier_type.note') -%>
+    </th>
     <th></th>
   </tr>
 
@@ -18,9 +22,12 @@
         <%= move_position(identifier_type) -%>
       <%- end -%>
     </td>
-    <td><%= link_to identifier_type.name, identifier_type -%></td>
-    <td><%= link_to identifier_type.display_name.localize, identifier_type -%></td>
-    <td><%= identifier_type.note -%></td>
+    <td><%= identifier_type.name -%></td>
+    <td>
+      <%= link_to identifier_type.display_name.localize, identifier_type -%>
+      <br />
+      <%= identifier_type.note %>
+    </td>
     <td>
       <%- if can? :update, identifier_type -%>
         <%= link_to t('page.edit'), edit_identifier_type_path(identifier_type) -%>

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

@@ -1,6 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.import_request')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>

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

@@ -133,11 +133,7 @@
   <ul>
     <li><%= back_to_index(flash[:page_info]) -%></li>
     <% if can? :update, @item %>
-      <%- if @shelf -%>
-        <li><%= link_to t('page.edit'), edit_library_shelf_item_path(@shelf.library, @shelf, @item) -%></li>
-      <%- else -%>
-        <li><%= link_to t('page.edit'), edit_item_path(@item) -%></li>
-      <%- end -%>
+      <li><%= link_to t('page.edit'), edit_item_path(@item) -%></li>
     <% end %>
     <% if defined?(EnjuInterLibraryLoan) %>
       <li><%= link_to t('page.listing', model: t('activerecord.models.inter_library_loan')), item_inter_library_loans_path(@item) -%></li>
@@ -151,8 +147,8 @@
       <%- end -%>
     <% end %>
     <% if defined?(EnjuCirculation) %>
-      <li><%= link_to t('page.listing', model: t('activerecord.models.lending_policy')), item_lending_policies_path(@item) -%></li>
-      <li><%= link_to t('page.checkout_history'), item_checkouts_path(@item) -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.lending_policy')), lending_policies_path(item_id: @item.id) -%></li>
+      <li><%= link_to t('page.checkout_history'), checkouts_path(item_id: @item.id) -%></li>
     <% end %>
   </ul>
 </div>

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

@@ -2,13 +2,13 @@
   <%= f.error_messages %>
 
   <div class="field">
-    <%= f.label :native_name %><br />
-    <%= f.text_field :native_name %>
+    <%= f.label :name %>:<br />
+    <%= @language.name %>
   </div>
 
   <div class="field">
-    <%= f.label :name %>:<br />
-    <%= @language.name %>
+    <%= f.label :native_name %><br />
+    <%= f.text_field :native_name %>
   </div>
 
   <div class="field">
@@ -16,6 +16,21 @@
     <%= f.text_area :display_name, class: 'resource_textarea' %>
   </div>
 
+  <div class="field">
+    <%= f.label :iso_639_1 %><br />
+    <%= f.text_field :iso_639_1 %>
+  </div>
+
+  <div class="field">
+    <%= f.label :iso_639_2 %><br />
+    <%= f.text_field :iso_639_2 %>
+  </div>
+
+  <div class="field">
+    <%= f.label :iso_639_3 %><br />
+    <%= f.text_field :iso_639_3 %>
+  </div>
+
   <div class="field">
     <%= f.label :note %><br />
     <%= f.text_area :note, class: 'resource_textarea' %>

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

@@ -1,16 +1,17 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.language')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
-    <th><%= t('activerecord.attributes.language.native_name') -%></th>
     <th><%= t('activerecord.attributes.language.name') -%></th>
+    <th><%= t('activerecord.attributes.language.native_name') -%></th>
     <th><%= t('activerecord.attributes.language.display_name') -%></th>
-    <th><%= 'Iso 639 1' -%></th>
-    <th><%= 'Iso 639 2' -%></th>
-    <th><%= 'Iso 639 3' -%></th>
+    <th><%= 'ISO 639-1' -%></th>
+    <th><%= 'ISO 639-2' -%></th>
+    <th><%= 'ISO 639-3' -%></th>
     <th></th>
   </tr>
 
@@ -21,8 +22,8 @@
         <%= move_position(language) -%>
       <%- end -%>
     </td>
-    <td><%= language.native_name -%></td>
     <td><%= language.name -%></td>
+    <td><%= language.native_name -%></td>
     <td><%= link_to language.display_name.localize, language -%></td>
     <td><%= language.iso_639_1 -%></td>
     <td><%= language.iso_639_2 -%></td>

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

@@ -4,13 +4,13 @@
 <p id="notice"><%= notice %></p>
 
 <p>
-  <strong><%= t('activerecord.attributes.language.native_name') -%>:</strong>
-  <%= @language.native_name -%>
+  <strong><%= t('activerecord.attributes.language.name') -%>:</strong>
+  <%= @language.name -%>
 </p>
 
 <p>
-  <strong><%= t('activerecord.attributes.language.name') -%>:</strong>
-  <%= @language.name -%>
+  <strong><%= t('activerecord.attributes.language.native_name') -%>:</strong>
+  <%= @language.native_name -%>
 </p>
 
 <p>
@@ -18,6 +18,21 @@
   <%= @language.display_name.localize -%>
 </p>
 
+<p>
+  <strong>ISO 639-1:</strong>
+  <td><%= language.iso_639_1 -%></td>
+</p>
+
+<p>
+  <strong>ISO 639-2:</strong>
+  <td><%= language.iso_639_2 -%></td>
+</p>
+
+<p>
+  <strong>ISO 639-3:</strong>
+  <td><%= language.iso_639_3 -%></td>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.language.note') -%>:</strong>
   <%= @language.note -%>