iqvoc 4.0.8 → 4.0.9

data/app/models/note/skos/base.rb

@@ -18,22 +18,25 @@ class Note::SKOS::Base < Note::Base
 
   self.rdf_namespace = 'skos'
 
-  def self.build_from_rdf(subject, predicate, object)
-    unless subject.class.reflections.include?(self.name.to_relation_name)
-      raise "Note::SKOS::Base#build_from_rdf: Subject (#{subject}) must be able to receive this kind of note (#{self.class.name} => #{self.class.name.to_relation_name})."
+  def self.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
+    unless rdf_subject.class.reflections.include?(self.name.to_relation_name)
+      raise "#{self.name}#build_from_rdf: Subject (#{rdf_subject}) must be able to receive this kind of note (#{self.name} => #{self.name.to_relation_name})."
     end
 
-    case object
+    target_class = Iqvoc::RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
+    case rdf_object
     when String # Literal
-      unless object =~ /^"(.*)"(@(.+))$/
-        raise "Note::SKOS::Base#build_from_rdf: Object (#{object}) must be a string literal"
+      unless rdf_object =~ /^"(.*)"(@(.+))$/
+        raise "#{self.name}#build_from_rdf: Object (#{rdf_object}) must be a string literal"
       end
       lang = $3
       value = JSON.parse(%Q{["#{$1}"]})[0].gsub("\\n", "\n") # Trick to decode \uHHHHH chars
-      subject.send(self.name.to_relation_name) << self.new(:value => value, :language => lang)
+      target_class.new(:value => value, :language => lang).tap do |new_instance|
+        rdf_subject.send(target_class.name.to_relation_name) << new_instance
+      end
     when Array # Blank node
-      note = self.create!(:owner => subject)
-      object.each do |annotation|
+      note = target_class.create!(:owner => rdf_subject)
+      rdf_object.each do |annotation|
         ns, pred = *annotation.first.split(":", 2)
         note.annotations.create! do |a|
           a.namespace = ns
@@ -45,19 +48,19 @@ class Note::SKOS::Base < Note::Base
   end
 
   def build_rdf(document, subject)
-    ns, id = "", ""
-    if (self.rdf_namespace && self.rdf_predicate)
+    ns, id = '', ''
+    if self.rdf_namespace and self.rdf_predicate
       ns, id = self.rdf_namespace, self.rdf_predicate
     elsif self.class == Note::SKOS::Base # This could be done by setting self.rdf_predicate to 'note'. But all subclasses would inherit this value.
-      ns, id = "Skos", "note"
+      ns, id = 'Skos', 'note'
     else
-      raise "Note::SKOS::Base#build_rdf: Class #{self.class.name} needs to define self.rdf_namespace and self.rdf_predicate."
+      raise "#{self.class.name}#build_rdf: Class #{self.class.name} needs to define self.rdf_namespace and self.rdf_predicate."
     end
 
     if (IqRdf::Namespace.find_namespace_class(ns))
       subject.send(ns).send(id, value, :lang => language)
     else
-      raise "Note::SKOS::Base#build_rdf: couldn't find Namespace '#{ns}'."
+      raise "#{self.class.name}#build_rdf: couldn't find Namespace '#{ns}'."
     end
   end
 

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

@@ -26,7 +26,7 @@
 <fieldset>
   <legend><%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %></legend>
   <%= f.input "concept[inline_member_concept_origins]", :label => t('txt.common.type_to_search') do %>
-    <%= text_field_tag "concept[inline_member_concept_origins]", @collection.inline_member_concept_origins.join(Iqvoc::InlineDataHelper::Joiner),
+    <%= text_field_tag "concept[inline_member_concept_origins]", @collection.inline_member_concept_origins.join(Iqvoc::InlineDataHelper::JOINER),
       :class => "entity_select",
       :"data-query-url" => concepts_path(:format => :json),
       :"data-entity-uri" => concept_path(:id => "{id}"),
@@ -38,7 +38,7 @@
 <fieldset>
   <legend><%= Iqvoc::Collection.base_class.model_name.human(:count => 2) %></legend>
   <%= f.input "concept[inline_member_concept_origins]", :label => t('txt.common.type_to_search') do %>
-    <%= text_field_tag "concept[inline_member_collection_origins]", @collection.inline_member_collection_origins.join(Iqvoc::InlineDataHelper::Joiner),
+    <%= text_field_tag "concept[inline_member_collection_origins]", @collection.inline_member_collection_origins.join(Iqvoc::InlineDataHelper::JOINER),
       :class => "entity_select",
       :"data-query-url" => collections_path(:format => :json),
       :"data-entity-uri" => collection_path(:id => "{id}"),

data/app/views/collections/_header.html.erb

@@ -1,6 +1,6 @@
 <%= concept_header collection %>
 
 <%= content_for :head do -%>
-  <link href="<%= collection_url(collection.origin, :format => :ttl, :lang => nil) %>" type="text/turtle" rel="alternate" title=""/>
-  <link href="<%= collection_url(collection.origin, :format => :rdf, :lang => nil) %>" type="application/rdf+xml" rel="alternate" title=""/>
+  <link href="<%= rdf_collection_url(collection.origin, :format => :ttl, :lang => nil) %>" type="text/turtle" rel="alternate" title=""/>
+  <link href="<%= rdf_collection_url(collection.origin, :format => :rdf, :lang => nil) %>" type="application/rdf+xml" rel="alternate" title=""/>
 <% end -%>

data/app/views/collections/_sidebar.html.erb

@@ -4,8 +4,8 @@
     :perms => [:create, Iqvoc::Collection.base_class], :active => params[:action] == 'new' %>
   <% if defined?(collection) %>
   <%= sidebar_header t('txt.common.representations') %>
-  <%= sidebar_item :icon => 'share', :text => 'HTML', :path => collection_url(collection.origin, :format => :html, :lang => nil) %>
-  <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => collection_url(collection.origin, :format => :rdf, :lang => nil), :id => 'rdf_link_xml' %>
-  <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => collection_url(collection.origin, :format => :ttl, :lang => nil), :id => 'rdf_link_ttl' %>
+  <%= sidebar_item :icon => 'share', :text => 'HTML', :path => collection_url(collection.origin, :format => :html) %>
+  <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => rdf_collection_url(collection.origin, :format => :rdf, :lang => nil), :id => 'rdf_link_xml' %>
+  <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => rdf_collection_url(collection.origin, :format => :ttl, :lang => nil), :id => 'rdf_link_ttl' %>
   <% end %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <%= page_header :title => Iqvoc::Collection.base_class.model_name.human(:count => 2) %>
 
-<ul class="hybrid-treeview" data-url="<%= hierarchical_collections_path(:format => :json) %>">
+<ul class="hybrid-treeview" data-url="<%= collections_path(:format => :json) %>">
   <%= render :partial => 'collection', :collection => @top_collections %>
 </ul>
 

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

@@ -47,7 +47,7 @@
 
 <div class="relation panel">
   <h3><%= Iqvoc::Collection.base_class.model_name.human(:count => 2) %></h3>
-  <ul class="hybrid-treeview" data-url="<%= hierarchical_collections_path(:format => :json) %>">
+  <ul class="hybrid-treeview" data-url="<%= collections_path(:format => :json) %>">
     <%= render :partial => 'collection', :collection => @collection.subcollections.sort {|a, b| a.pref_label <=> b.pref_label } %>
   </ul>
 </div>

data/app/views/collections/show.iqrdf

@@ -2,7 +2,7 @@ Iqvoc.default_rdf_namespace_helper_methods.each do |meth|
   document.namespaces(self.send(meth))
 end
 
-document << @collection.build_rdf_subject(document, controller) do |collection|
+document << @collection.build_rdf_subject do |collection|
   @collection.labelings.each do |labeling|
     labeling.build_rdf(document, collection)
   end

data/app/views/concepts/alphabetical/index.html.erb

@@ -10,7 +10,7 @@
   </div>
   <ol class="concepts unstyled">
     <%= render :partial => 'pref_labeling', :collection => @pref_labelings %>
-  </dl>
+  </ol>
 </div>
 
 <%= paginate @pref_labelings %>

data/app/views/concepts/expired/index.html.erb

@@ -0,0 +1,16 @@
+<%= page_header :title => Iqvoc::Concept.base_class.model_name.human(:count => 2),
+                :desc => t('txt.views.navigation.expired') %>
+<%= render 'concepts/sidebars/plural' %>
+
+<div class="panel">
+  <div class="panel-header centered">
+    <%= letter_selector do |letter| %>
+        <% expired_concepts_path(:prefix => letter.to_s.downcase) %>
+    <% end %>
+  </div>
+  <ol class="concepts unstyled">
+    <%= render :partial => 'concepts/alphabetical/pref_labeling', :collection => @pref_labelings %>
+  </ol>
+</div>
+
+<%= paginate @pref_labelings %>

data/app/views/concepts/notifications/_referenced_concepts.html.erb

@@ -1,4 +1,4 @@
-<% if association_objects_in_editing_mode && association_objects_in_editing_mode[:concept_relations] %>
+<% if association_objects_in_editing_mode && association_objects_in_editing_mode[:concept_relations].any? %>
   <%= alert(:notice, :header => t('txt.common.referenced_concepts')) do %>
   <ul>
     <% association_objects_in_editing_mode[:concept_relations].each do |concept_relation| %>

data/app/views/concepts/sidebars/_plural.html.erb

@@ -8,6 +8,10 @@
       :icon => 'list-alt',
       :path => alphabetical_concepts_path(:prefix => 'a'),
       :active => params[:controller] == 'concepts/alphabetical' %>
+  <%= sidebar_item :text => t("txt.views.navigation.expired"),
+      :icon => 'list-alt',
+      :path => expired_concepts_path(:prefix => 'a'),
+      :active => params[:controller] == 'concepts/expired' %>
   <% if I18n.locale.to_s != Iqvoc::Concept.pref_labeling_languages.first %>
     <%= sidebar_item :icon => 'list-alt',
       :text => t("txt.views.untranslated_concepts.caption"),

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

@@ -1,6 +1,6 @@
 <%= page_header :title => 'Dashboard' %>
 
-<table class="table dashboard">
+<table class="table">
   <thead>
     <tr>
       <th><%= t("txt.views.dashboard.type") %><%= sorting_controls_for(:class) %></th>

data/app/views/layouts/_controls.html.erb

@@ -10,32 +10,33 @@
       <%- if Iqvoc::Concept.pref_labeling_languages.reject(&:nil?).any? -%>
         <li><h3><%= t("txt.views.lang_widget.primary") %></h3></li>
         <% Iqvoc::Concept.pref_labeling_languages.each do |lang| %>
+        <nobr>
           <li>
-            <%= link_to t("languages.#{lang}"), params.merge(:lang => lang),
+          <%= link_to t("languages.#{lang.presence || "-"}", :default => lang.presence || "-"), params.merge(:lang => lang || "none"),
               :class => ("current" if lang == I18n.locale.to_s) %>
-          </li>
-        <% end %>
-      <% end %>
-
-      <% secondary_languages = Iqvoc.available_languages.reject { |lang| lang == I18n.locale.to_s } %>
-      <% if secondary_languages.any? %>
-        <li><h3><%= t("txt.views.lang_widget.secondary") %></h3></li>
-        <% secondary_languages.each do |lang| %>
-          <li>
-            <label>
-              <input type="checkbox" value="<%= lang %>"> <%= t("languages.#{lang}") %>
-            </label>
-          </li>
-        <% end %>
-      <% end %>
-    </ul>
-  </li>
+          </li></nobr>
+    <% end %>
+  <% end %>
 
-  <li>
-    <% if current_user %>
-      <%= link_to t("txt.views.layouts.application.logout"), user_session_path, :method => :delete %>
-    <% else %>
-      <%= link_to t("txt.views.layouts.application.login"), new_user_session_path(:back_to => @return_url) %>
+  <% secondary_languages = Iqvoc.all_languages.reject { |lang| lang == I18n.locale.to_s } %>
+  <% if secondary_languages.any? %>
+    <li><h3><%= t("txt.views.lang_widget.secondary") %></h3></li>
+    <% secondary_languages.each do |lang| %>
+      <li>
+        <label>
+          <input type="checkbox" value="<%= lang %>"> <%= t("languages.#{lang.presence || "-"}", :default => lang.presence || "-") %>
+        </label>
+      </li>
     <% end %>
-  </li>
+  <% end %>
+</ul>
+</li>
+
+<li>
+  <% if current_user %>
+    <%= link_to t("txt.views.layouts.application.logout"), user_session_path, :method => :delete %>
+  <% else %>
+    <%= link_to t("txt.views.layouts.application.login"), new_user_session_path(:back_to => @return_url) %>
+  <% end %>
+</li>
 </ul>

data/app/views/layouts/_navigation.html.erb

@@ -7,7 +7,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </a>
-      <%= link_to Iqvoc.config["title"], root_path, :class => "brand" %></a>
+      <%= link_to Iqvoc.config["title"], root_path, :class => "brand" %>
 
       <div class="nav-collapse">
         <ul class="nav">

data/app/views/layouts/application.html.erb

@@ -35,12 +35,6 @@
     <% end %>
   </div>
 </div>
-<script>
-  // load JSON polyfill only if necessary
-  if(typeof JSON === "undefined") {
-    document.write('<%= javascript_include_tag("json2").sub("</", "<\\/").html_safe %>');
-  }
-</script>
 <%= javascript_include_tag "manifest" %>
 <%= yield :scripts %>
 </body>

data/app/views/partials/concept/_edit_link_base.html.erb

@@ -1,4 +1,5 @@
-<%= link_to truncate(item.pref_label.to_s, :length => 45), (item.published? ? concept_path(:id => item.origin) : concept_path(:published => 0, :id => item.origin)) %>
+<% label = item.pref_label.to_s.presence || ":#{item.origin} [#{t("txt.common.translation_missing_for")} #{[I18n.locale.to_s, Iqvoc::Concept.pref_labeling_languages.first.to_s].uniq.join(", ")}]" %>
+<%= link_to truncate(label, :length => 45), (item.published? ? concept_path(:id => item.origin) : concept_path(:published => 0, :id => item.origin)) %>
 <%- if (item.additional_info) -%>
   (<%= item.additional_info %>)
 <%- end -%>

data/app/views/partials/labeling/skos/_base.html.erb

@@ -1,7 +1,6 @@
 <%= content_tag :div, :class => "relation translation panel", :lang => (defined?(concept) ? lang || nil : nil) do %>
   <% if defined?(concept) %>
-  <% lang_translation = lang.nil? ? t("languages.none") : t("languages.#{lang}") %>
-    <h2><%= klass.model_name.human(:count => 2) %> <small><%= lang_translation %></small></h2>
+    <h2><%= klass.model_name.human(:count => 2) %> <small><%= t("languages.#{lang || "-"}") %></small></h2>
     <div class="relation-body">
       <%= item_listing(concept.labels_for_labeling_class_and_language(klass, lang)) do |label|
         label.value

data/app/views/partials/note/_edit_base.html.erb

@@ -5,7 +5,7 @@
       <%= content_tag("li", :class => "inline_note translation #{" new" if note.new_record?}", :lang => note.language || nil) do %>
         <%= f.simple_fields_for assoc_klass.name.to_relation_name, note do |note_form| %>
           <%= note_form.input :value, :as => :text, :input_html => { :rows => 4, :class => 'span4' } %>
-          <%= note_form.input :language, :collection => options_for_language_select(note.language), :label => t("txt.common.language"), :input_html => { :class => 'span1' } %>
+          <%= note_form.input :language, :collection => Iqvoc.note_languages.map { |l| [l, l]}, :label => t("txt.common.language"), :input_html => { :class => 'span1' } %>
 
           <% unless note.new_record? %>
             <%= note_form.input :"_destroy", :as => :boolean, :label => t("txt.common.delete") %>

data/app/views/partials/note/skos/_edit_change_note.html.erb

@@ -15,7 +15,7 @@
               <% end %>
             <% end %>
             <%= note_form.input :language,
-              :collection => options_for_language_select(note.language),
+              :collection => Iqvoc.note_languages.map { |l| [l, l]},
               :label => t("txt.common.language"),
               :include_blank => false,
               :input_html => { :class => 'span1' } %>

data/app/views/rdf/scheme.iqrdf

@@ -2,7 +2,7 @@ Iqvoc.default_rdf_namespace_helper_methods.each do |meth|
   document.namespaces(self.send(meth))
 end
 
-document << Iqvoc::Concept.root_class.instance.build_rdf_subject(document, controller) do |scheme|
+document << Iqvoc::Concept.root_class.instance.build_rdf_subject do |scheme|
   @top_concepts.each do |top_concept|
     scheme.Skos::hasTopConcept IqRdf.build_uri(top_concept.origin)
   end

data/app/views/search_results/_header.html.erb

@@ -2,7 +2,7 @@
 
 <% if @results %>
   <%= content_for :head do %>
-    <link href="<%= url_for(request.query_parameters.merge(:format => :ttl, :lang => nil, :page => @results.current_page, :only_path => false)) %>" type="text/turtle" rel="alternate" title=""/>
-    <link href="<%= url_for(request.query_parameters.merge(:format => :rdf, :lang => nil, :page => @results.current_page, :only_path => false)) %>" type="application/rdf+xml" rel="alternate" title=""/>
+    <link href="<%= rdf_search_path(request.query_parameters.merge(:format => :ttl, :lang => nil, :page => @results.current_page, :only_path => false)) %>" type="text/turtle" rel="alternate" title=""/>
+    <link href="<%= rdf_search_path(request.query_parameters.merge(:format => :rdf, :lang => nil, :page => @results.current_page, :only_path => false)) %>" type="application/rdf+xml" rel="alternate" title=""/>
   <% end %>
 <% end %>

data/app/views/search_results/_sidebar.html.erb

@@ -1,7 +1,7 @@
 <% if results %>
   <%= sidebar do %>
     <%= sidebar_header t('txt.common.representations') %>
-    <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => url_for(request.query_parameters.merge(:format => :rdf, :lang => nil, :page => results.current_page, :only_path => false)), :id => 'rdf_link_xml' %>
-    <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => url_for(request.query_parameters.merge(:format => :ttl, :lang => nil, :page => @results.current_page, :only_path => false)), :id => 'rdf_link_ttl' %>
+    <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => rdf_search_path(request.query_parameters.merge(:format => :rdf, :lang => nil, :page => results.current_page, :only_path => false)), :id => 'rdf_link_xml' %>
+    <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => rdf_search_path(request.query_parameters.merge(:format => :ttl, :lang => nil, :page => @results.current_page, :only_path => false)), :id => 'rdf_link_ttl' %>
   <% end %>
 <% end %>

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

@@ -13,8 +13,8 @@
 
     <%= input_block :label => t('txt.views.search_results.mode'), :id => 'qt' do %>
       <%= select_tag :qt, options_for_select([
-          [t('txt.views.search_results.exact'), 'exact'],
           [t('txt.views.search_results.contains'), 'contains'],
+          [t('txt.views.search_results.exact'), 'exact'],
           [t('txt.views.search_results.ends_with'), 'ends_with'],
           [t('txt.views.search_results.begins_with'), 'begins_with']
         ], params[:qt]) %>

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

@@ -1,7 +1,7 @@
 <%= page_header :title => t("txt.views.triplestore_sync.caption") %>
 <%= render "dashboard/sidebar" %>
 
-<%= form_tag triplestore_sync_path(:format => nil, :lang => nil), :method => :post do %>
+<%= form_tag triplestore_sync_path(:format => nil), :method => :post do %>
   <%= submit_tag t("txt.views.triplestore_sync.start"), :class => "btn btn-primary" %>
 <% end %>
 
@@ -15,7 +15,7 @@
       Iqvoc.default_rdf_namespace_helper_methods.each do |meth|
         doc.namespaces(self.send(meth))
       end
-      uri = record.build_rdf_subject(doc, controller).full_uri # XXX: we actually just want path, plus HTML format
+      uri = record.build_rdf_subject.full_uri # XXX: we actually just want path, plus HTML format
     %>
     <li><%= link_to record.to_s, uri %></li>
     <% end %>

data/config/locales/de.yml

@@ -18,7 +18,7 @@ de:
   languages:
     de: Deutsch
     en: Englisch
-    none: Wiss.
+    none: Unbekannt
     fr: Französisch
     sl: Slowenisch
     pl: Polnisch
@@ -31,6 +31,10 @@ de:
     it: Italienisch
     cs: Tschechisch
     sk: Slowakisch
+    et: Estnisch
+    dk: Dänisch
+    fi: Finnisch
+    sv: Schwedisch
   views:
     pagination:
       first: "« Erste"
@@ -89,7 +93,7 @@ de:
        caption: "Instanzkonfiguration"
        settings:
          title: Titel
-         available_languages: verfügbare Sprachen
+         note_languages: Sprachen für Notes
          languages_pref_labeling: Sprachen für bevorzugte Labels
          languages_further_labelings_Labeling::SKOS::AltLabel: Sprachen für alternative Labels
          triplestore_url: Triplestore-URL
@@ -143,6 +147,7 @@ de:
        instance_configuration: "Konfiguration"
        hierarchical: "Hierarchisch"
        alphabetical: "Alphabetisch"
+       expired: "Abgelaufene"
        search: "Suche"
        about: "Über"
        users: "Benutzer"
@@ -361,3 +366,5 @@ de:
        association_narrower_unpublished: "Spezifischere Begriffe müssen veröffentlicht sein."
        association_related_unpublished: "Verwandte Begriffe müssen veröffentlicht sein."
        no_pref_label: "-- kein PrefLabel --"
+       pref_label_not_unique: "Das PrefLabel %{label} ist bereits in Verwendung."
+       pref_labels_not_unique: "Die PrefLabels %{label} sind bereits in Verwendung."

data/config/locales/en.yml

@@ -18,7 +18,7 @@ en:
   languages:
     de: German
     en: English
-    none: Sci.
+    none: Unbekannt
     fr: French
     sl: Slovenian
     pl: Polish
@@ -31,6 +31,10 @@ en:
     it: Italian
     cs: Czech
     sk: Slovak
+    et: Estonian
+    dk: Danish
+    fi: Finnish
+    sv: Swedish
   views:
     pagination:
       first: "« First"
@@ -89,7 +93,7 @@ en:
        caption: "Instance Configuration"
        settings:
          title: site title
-         available_languages: available languages
+         note_languages: languages for notes
          languages_pref_labeling: languages for preferred labels
          languages_further_labelings_Labeling::SKOS::AltLabel: languages for alternative labels
          triplestore_url: triplestore URL
@@ -151,6 +155,7 @@ en:
        instance_configuration: "Configuration"
        hierarchical: "Hierarchical"
        alphabetical: "Alphabetical"
+       expired: "Expired"
        search: "Search"
        about: "About"
        users: "Users"
@@ -333,8 +338,8 @@ en:
        error: "Relation not found. Probably removed from the target side. Please refresh your browser window."
      collections:
        save:
-         success: "The collection has been successfully created."
-         error: "The collection could not be created."
+         success: "The collection has been successfully saved."
+         error: "The collection could not be saved."
        destroy:
          success: "The collection has been successfully deleted."
          error: "The collection could not be deleted."
@@ -368,3 +373,5 @@ en:
        association_narrower_unpublished: "Specific terms have to be published."
        association_related_unpublished: "Related terms have to be published."
        no_pref_label: "-- no PrefLabel --"
+       pref_label_not_unique: "The preferred label '%{label}' is already in use."
+       pref_labels_not_unique: "The preferred labels '%{label}' are already in use."

data/config/locales/pt.yml

@@ -18,7 +18,7 @@ pt:
   languages:
     de: Alemão
     en: Inglês
-    none: Sci.
+    none: Desconhecido
     fr: Francês
     sl: Esloveno
     pl: Polonês
@@ -31,6 +31,10 @@ pt:
     it: Italiano
     cs: Checo
     sk: Eslovaco
+    et: Estoniano
+    dk: Dinamarquês
+    fi: Finlandês
+    sv: Sueco
   views:
     pagination:
       first: "« Primeira"
@@ -89,7 +93,6 @@ pt:
        caption: "Configuração da Instância"
        settings:
          title: "título do sítio"
-         available_languages: "idiomas disponíveis"
          languages_pref_labeling: "idiomas para os rótulos preferenciais"
          languages_further_labelings_Labeling::SKOS::AltLabel: "idiomas para os rótulos alternativos"
          triplestore_url: "URL do repositório de triplas"
@@ -367,4 +370,6 @@ pt:
        association_broader_unpublished: "Termos gerais precisam ser publicados."
        association_narrower_unpublished: "Termo específicos precisam ser publicados."
        association_related_unpublished: "Termos relacionados precisam ser publicados."
-       no_pref_label: "-- sem rótulo principal --"
+       no_pref_label: "-- sem rótulo preferencial --"
+       pref_label_not_unique: "O rótulo preferencial '%{label}' já está em uso."
+       pref_labels_not_unique: "Os rótulos preferenciais '%{label}' já estão em uso."

data/config/routes.rb

@@ -17,11 +17,13 @@
 Rails.application.routes.draw do
   match 'schema(.:format)' => 'pages#schema', :as => 'schema'
 
-  scope '(:lang)', :constraints => lambda { |params, req|
-    lang = params[:lang]
-    return lang.nil? || lang.to_s =~ /^#{Iqvoc::Concept.pref_labeling_languages.join("|").presence || " "}$/
+  scope ':lang', :constraints => lambda { |params, req|
+    langs = Iqvoc::Concept.pref_labeling_languages.join("|").presence || "en"
+    return params[:lang].to_s =~ /^#{langs}$/
   } do
 
+    Iqvoc.localized_routes.each { |hook| hook.call(self) }
+
     resource  :user_session, :only => [:new, :create, :destroy]
     resources :users, :except => [:show]
 
@@ -43,8 +45,7 @@ Rails.application.routes.draw do
     match 'alphabetical_concepts(/:prefix)(.:format)' => 'concepts/alphabetical#index', :as => 'alphabetical_concepts'
     match 'untranslated_concepts/:prefix(.:format)'   => 'concepts/untranslated#index', :as => 'untranslated_concepts'
     match 'hierarchical_concepts(.:format)' => 'concepts/hierarchical#index', :as => 'hierarchical_concepts'
-
-    match 'hierarchical_collections(.:format)' => 'collections/hierarchical#index', :as => 'hierarchical_collections'
+    match 'expired_concepts(.:format)' => 'concepts/expired#index', :as => 'expired_concepts'
 
     match 'dashboard(.:format)' => 'dashboard#index',      :as => 'dashboard'
 
@@ -61,6 +62,14 @@ Rails.application.routes.draw do
     root :to => 'frontpage#index', :format => nil
   end
 
+  match 'schema(.:format)' => 'pages#schema', :as => 'schema'
   match '/scheme(.:format)' => 'rdf#scheme', :as => 'scheme'
-  match '/:id(.:format)' => 'rdf#show', :as => 'rdf'
+
+  get 'search(.:format)' => 'search_results#index', :as => 'rdf_search'
+  get '/:id(.:format)' => 'rdf#show', :as => 'rdf'
+  get '/collections/:id(.:format)', :as => "rdf_collection", :to => "collections#show"
+  get '/collections', :as => "rdf_collections", :to => "collections#index"
+
+
+  root :to => 'frontpage#index', :format => nil
 end

data/db/migrate/20130227145825_fix_collection_type.rb

@@ -0,0 +1,10 @@
+class FixCollectionType < ActiveRecord::Migration
+  def up
+    execute "UPDATE concepts SET type='Collection::SKOS::Unordered' WHERE type='Collection::Unordered'"
+    execute "UPDATE collection_members SET type='Collection::Member::SKOS::Base' WHERE type='Collection::Member::Concept'"
+  end
+
+  def down
+    execute "UPDATE concepts SET type='Collection::Unordered' WHERE type='Collection::SKOS::Unordered'"
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120326102037) do
+ActiveRecord::Schema.define(:version => 20130227145825) do
 
   create_table "collection_members", :force => true do |t|
     t.integer "collection_id"

data/lib/generators/app/template.rb

@@ -43,6 +43,26 @@ end
 # Iqvoc.core_assets += []
 EOF
 
+remove_file "app/assets/javascripts/application.js"
+create_file "app/assets/javascripts/manifest.js", <<-EOF
+//= require framework
+//= require iqvoc/manifest
+
+//= require #{app_path}/manifest
+EOF
+create_file "app/assets/javascripts/#{app_path}/manifest.js"
+
+remove_file "app/assets/stylesheets/application.css"
+create_file "app/assets/stylesheets/manifest.css", <<-EOF
+/*
+*= require framework
+*= require iqvoc/manifest
+
+*= require #{app_path}/manifest
+*/
+EOF
+create_file "app/assets/stylesheets/#{app_path}/manifest.css"
+
 remove_file "public/index.html"
 remove_file "app/controllers/application_controller.rb"
 remove_file "app/helpers/application_helper.rb"

data/lib/iqvoc/configuration/collection.rb

@@ -6,11 +6,11 @@ module Iqvoc
       extend ActiveSupport::Concern
 
       included do
-        mattr_accessor :base_class_name, :member_class_names
+        mattr_accessor :base_class_name, :member_class_name
 
-        self.base_class_name = 'Collection::Unordered'
+        self.base_class_name = 'Collection::SKOS::Unordered'
 
-        self.member_class_names  = ['Collection::Member::SKOS::Base']
+        self.member_class_name  = 'Collection::Member::SKOS::Base'
       end
 
       module ClassMethods
@@ -18,8 +18,8 @@ module Iqvoc
           base_class_name.constantize
         end
 
-        def member_classes
-          member_class_names.map(&:constantize)
+        def member_class
+          member_class_name.constantize
         end
       end