iqvoc 3.2.3 → 3.2.4

data/Gemfile

@@ -34,6 +34,9 @@ gem 'rails_helpers_fix'
 
 group :development do
   gem 'awesome_print'
+  gem 'capistrano'
+  gem 'capistrano-ext'
+  gem 'rvm' # RVM API (for capistrano deployments)
 end
 
 group :development, :test do
@@ -54,8 +57,8 @@ group :test do
   gem 'capybara-webkit'
   gem 'database_cleaner'
   gem 'factory_girl_rails'
-  # gem 'factory_girl'
   gem 'memory_test_fix'
+  gem 'turn'
 end
 
 group :production, :production_internal do

data/Gemfile.lock

@@ -24,10 +24,19 @@ GEM
       activesupport (= 3.0.10)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
+    activerecord-jdbc-adapter (1.2.0)
+    activerecord-jdbcmysql-adapter (1.2.0)
+      activerecord-jdbc-adapter (~> 1.2.0)
+      jdbc-mysql (~> 5.1.0)
+    activerecord-jdbcsqlite3-adapter (1.2.0)
+      activerecord-jdbc-adapter (~> 1.2.0)
+      jdbc-sqlite3 (~> 3.7.2)
+    activerecord-oracle_enhanced-adapter (1.4.0)
     activeresource (3.0.10)
       activemodel (= 3.0.10)
       activesupport (= 3.0.10)
     activesupport (3.0.10)
+    ansi (1.3.0)
     arel (2.0.10)
     authlogic (3.0.3)
       activerecord (>= 3.0.7)
@@ -35,6 +44,14 @@ GEM
     awesome_print (0.4.0)
     builder (2.1.2)
     cancan (1.6.5)
+    capistrano (2.9.0)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    capistrano-ext (1.2.1)
+      capistrano (>= 1.0.0)
     capybara (1.0.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -42,24 +59,29 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    capybara-webkit (0.6.0)
+    capybara-webkit (0.6.1)
       capybara (~> 1.0.0)
-    childprocess (0.2.1)
+    childprocess (0.2.2)
       ffi (~> 1.0.6)
     database_cleaner (0.6.7)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    factory_girl (2.0.4)
-    factory_girl_rails (1.1.0)
-      factory_girl (~> 2.0.0)
+    factory_girl (2.1.0)
+    factory_girl_rails (1.2.0)
+      factory_girl (~> 2.1.0)
       railties (>= 3.0.0)
     ffi (1.0.9)
+    ffi (1.0.9-java)
+    highline (1.6.2)
     i18n (0.5.0)
     iq_rdf (0.0.15)
       builder
       bundler
-    json (1.5.3)
-    json_pure (1.5.3)
+    jdbc-mysql (5.1.13)
+    jdbc-sqlite3 (3.7.2)
+    json (1.6.1)
+    json (1.6.1-java)
+    json_pure (1.6.1)
     kaminari (0.12.4)
       rails (>= 3.0.0)
     mail (2.2.19)
@@ -70,9 +92,17 @@ GEM
     memory_test_fix (0.2.0)
     mime-types (1.16)
     mysql2 (0.2.7)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.2.1)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
     nokogiri (1.5.0)
+    nokogiri (1.5.0-java)
     polyglot (0.3.2)
-    rack (1.2.3)
+    rack (1.2.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -93,9 +123,10 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.9.2)
-    rdoc (3.9.2)
+    rdoc (3.9.4)
     rubyzip (0.9.4)
-    selenium-webdriver (2.4.0)
+    rvm (1.9.2)
+    selenium-webdriver (2.6.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
@@ -105,11 +136,14 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
+    turn (0.8.2)
+      ansi (>= 1.2.2)
     tzinfo (0.3.29)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -119,6 +153,8 @@ DEPENDENCIES
   authlogic
   awesome_print
   cancan
+  capistrano
+  capistrano-ext
   capybara
   capybara-webkit
   database_cleaner
@@ -131,4 +167,6 @@ DEPENDENCIES
   nokogiri (= 1.5.0)
   rails (= 3.0.10)
   rails_helpers_fix
+  rvm
   sqlite3
+  turn

data/README.md

@@ -20,15 +20,15 @@ iQvoc is built with state-of-the-art technology and can be easily customized acc
 
 ## Getting Started
 
-1. Configure your database via `config/database.template.yml`
-2. `bundle install`
-3. Run `rake db:create` to create the database
+1. Configure your database via `config/database.template.yml`. Don't forget to rename it to `database.yml`
+2. Run `bundle install`
+3. Run `bundle exec rake db:create` to create the database
 4. Create the necessary tables by running `rake db:migrate`
 5. Load some base data by running `rake db:seed`
 6. Create `config/initializers/secret_token.rb` based on
    `config/initializers/secret_token.rb.template`, filling in the secret token
-   generated by `rake secret`
-7. Boot up the app using `rails s` (or `passenger start` if you use passenger)
+   generated by `bundle exec rake secret`
+7. Boot up the app using `bundle exec rails s` (or `passenger start` if you use passenger)
 8. Log in with "admin@iqvoc" / "admin" or "demo@iqvoc" / "cooluri" (cf. step #5)
 9. Visit the Users section and change the default passwords
 

data/app/controllers/application_controller.rb

@@ -39,6 +39,7 @@ class ApplicationController < ActionController::Base
   # Force an extension to every url. (LOD)
   def ensure_extension
     unless params[:format] || request.method != "GET"
+      flash.keep
       redirect_to url_for(params.merge(:format => (request.format && request.format.symbol) || :html))
     end
   end

data/app/controllers/concepts/versions_controller.rb

@@ -69,7 +69,7 @@ class Concepts::VersionsController < ApplicationController
     authorize! :lock, new_version
 
     new_version.lock_by_user(current_user.id)
-    new_version.save!
+    new_version.save :validate => false
 
     flash[:notice] = t("txt.controllers.versioning.locked")
     redirect_to edit_concept_path(:published => 0, :id => new_version)
@@ -83,8 +83,8 @@ class Concepts::VersionsController < ApplicationController
     authorize! :unlock, new_version
 
     new_version.unlock
-    new_version.save!
-
+    new_version.save :validate => false
+    
     flash[:notice] = t("txt.controllers.versioning.unlocked")
     redirect_to concept_path(:published => 0, :id => new_version)
   end

data/app/controllers/concepts_controller.rb

@@ -19,7 +19,7 @@ class ConceptsController < ApplicationController
 
   def index
     authorize! :read, Concept::Base
-    
+
     respond_to do |format|
       format.json do # Search for widget
         @concepts = Iqvoc::Concept.base_class.editor_selectable.with_pref_labels.merge(Label::Base.by_query_value("#{params[:query]}%")).all
@@ -129,7 +129,7 @@ class ConceptsController < ApplicationController
   def update
     @concept = Iqvoc::Concept.base_class.by_origin(params[:id]).unpublished.last
     raise ActiveRecord::RecordNotFound unless @concept
-    
+
     authorize! :update, @concept
 
     if @concept.update_attributes(params[:concept])
@@ -158,7 +158,7 @@ class ConceptsController < ApplicationController
 
   protected
 
-  # TODO: Find a method name matching the behaviour of the method
+  # TODO: rename to match the behavior of the method
   def labeling_as_json(labeling)
     label = labeling.target
     return {
@@ -171,4 +171,3 @@ class ConceptsController < ApplicationController
   end
 
 end
-

data/app/helpers/application_helper.rb

@@ -40,7 +40,7 @@ module ApplicationHelper
 
     content_tag :ul, :class => "entity_list" do
       items.map do |item|
-        content_tag :li do
+        content_tag :li, :class => (items.last == item ? "last-child" : "") do
           block.call(item)
         end
       end.join("\n").html_safe

data/app/models/concept/base.rb

@@ -163,12 +163,15 @@ class Concept::Base < ActiveRecord::Base
     has_many labeling_class_name.to_relation_name,
       :foreign_key => 'owner_id',
       :class_name => labeling_class_name
-    # When a Label has only one labeling (the "no skosxl" case) we'll have to
-    # clone the label too.
-    if labeling_class_name.constantize.reflections[:target].options[:dependent] == :destroy
-      include_to_deep_cloning(labeling_class_name.to_relation_name => :target)
-    else
-      include_to_deep_cloning(labeling_class_name.to_relation_name)
+    # Only clone superclass relations
+    unless Iqvoc::Concept.labeling_classes.keys.detect { |klass| labeling_class_name.constantize < klass }
+      # When a Label has only one labeling (the "no skosxl" case) we'll have to
+      # clone the label too.
+      if labeling_class_name.constantize.reflections[:target].options[:dependent] == :destroy
+        include_to_deep_cloning(labeling_class_name.to_relation_name => :target)
+      else
+        include_to_deep_cloning(labeling_class_name.to_relation_name)
+      end
     end
   end
 

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

@@ -62,13 +62,18 @@ class Labeling::SKOS::Base < Labeling::Base
         raise "Collection with Origin #{params[:collection_origin]} not found!"
       end
     end
-
-    scope = scope.includes(:owner).
-        # Ensure only concepts are taken into account (i.e. exclude collections)
-        where("concepts.type" => Iqvoc::Concept.base_class_name).
-        # Ensure that the included concept is published
-        merge(Iqvoc::Concept.base_class.published)
-
+    scope = scope.includes(:owner)
+    
+    scope = case params[:for]
+    when "concept"
+      scope.where("concepts.type" => Iqvoc::Concept.base_class_name).merge(Concept::Base.published)
+    when "collection"
+      scope.where("concepts.type" => Iqvoc::Collection.base_class_name)
+    else
+      # no additional conditions
+      scope
+    end
+    
     scope
   end
 

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

@@ -21,6 +21,17 @@ class Note::SKOS::ChangeNote < Note::SKOS::Base
   def self.edit_partial_name(obj)
     "partials/note/skos/edit_change_note"
   end
+  
+  def self.search_result_partial_name
+    'partials/note/skos/change_note/search_result'
+  end
+  
+  def self.single_query(params = {})
+    query_str = build_query_string(params)
+
+    Note::SKOS::ChangeNote.includes(:annotations).
+      merge(Note::Annotated::Base.where(Note::Annotated::Base.arel_table[:value].matches(query_str)))
+  end
 
   def build_rdf(document, subject)
     subject.send(self.rdf_namespace).build_predicate(self.rdf_predicate) do |blank_node|

data/app/models/origin_mapping.rb

@@ -40,7 +40,7 @@ class OriginMapping
   end
 
   def self.handle_numbers_at_beginning(str)
-    str.to_s.gsub(/^[0-9\-].*$/) do |match|
+    str.to_s.gsub(/^[0-9].*$/) do |match|
       "_#{match}"
     end
   end

data/app/views/concepts/_base_data.html.erb

@@ -21,7 +21,7 @@
   </fieldset>
 
   <fieldset>
-    <legend>Labelings</legend>
+    <legend><%= Labeling::Base.model_name.human(:count => 2) %></legend>
     <ol>
       <%- Iqvoc::Concept.labeling_classes.each do |labeling_class, languages| -%>
         <%- languages.each do |language| -%>
@@ -38,7 +38,7 @@
   <% end %>
 
   <fieldset>
-    <legend>Relations</legend>
+    <legend><%= Concept::Relation::Base.model_name.human(:count => 2) %></legend>
     <ol>
       <%- if Iqvoc::Concept.broader_relation_class.narrower_editable -%>
         <%= render Iqvoc::Concept.broader_relation_class.narrower_class.edit_partial_name(@concept),
@@ -55,7 +55,7 @@
   </fieldset>
 
   <fieldset>
-    <legend>Matches</legend>
+    <legend><%= Match::Base.model_name.human(:count => 2) %></legend>
     <ol>
       <% Iqvoc::Concept.match_classes.each do |match_class| %>
         <%= render :partial => match_class.edit_partial_name(@concept),

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

@@ -8,7 +8,7 @@
     <% end %>
   </li>
 
-  <li>
+  <li id="language_selection">
     <a href="javascript:;" class="lang-widget"><%= t("txt.views.lang_widget.caption") %> &#9660;</a>
     <ul class="lang-widget">
       <%- unless Iqvoc::Concept.pref_labeling_languages.reject(&:nil?).length == 0 -%>

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

@@ -14,11 +14,14 @@
     <%= stylesheet_link_tag "iqvoc/iqvoc.css", :media => "all" %>
     <%= stylesheet_link_tag "iqvoc/forms.css" %>
     <%= stylesheet_link_tag "/javascripts/iqvoc/jquery-treeview/jquery.treeview.css" %>
-    <%= stylesheet_link_tag "iqvoc/jquery-ui-1.8.13.custom.css" %>
+    <%= stylesheet_link_tag "iqvoc/jquery-ui-1.8.16.custom.css" %>
     <%= stylesheet_link_tag "iqvoc/widgets.css" %>
     <% Iqvoc.additional_css_files.each do |file| %>
       <%= stylesheet_link_tag file %>
     <% end %>
+		<!--[if (gte IE 6)&(lte IE 8)]>
+		<%= stylesheet_link_tag "iqvoc/ie_fixes.css" %>
+		<![endif]-->
 
     <%= yield :head %>
   </head>
@@ -65,7 +68,7 @@
       }
     </script>
     <%= javascript_include_tag "iqvoc/jquery-1.6.2.min.js" %>
-    <%= javascript_include_tag "iqvoc/jquery-ui-1.8.13.custom.min.js" %>
+    <%= javascript_include_tag "iqvoc/jquery-ui-1.8.16.custom.min.js" %>
     <%= javascript_include_tag "iqvoc/jquery-ui.datepicker-de.js" %>
     <%= javascript_include_tag "iqvoc/jquery-treeview/jquery.treeview.js" %>
     <%= javascript_include_tag "iqvoc/jquery-treeview/jquery.treeview.async.js" %>

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

@@ -1,8 +1,13 @@
-<%- if concept = result.owner -%>
+<%- if owner = result.owner -%>
   <dt>
-    <%= link_to highlight_query(result.target.value, params[:query]), concept_path(:id => concept) %>
-    <%- if concept.additional_info.present? -%>
-      (<%= concept.additional_info %>)
+		<% case owner.class.name %>
+		<% when Iqvoc::Concept.base_class_name %>
+    	<%= link_to highlight_query(result.target.value, params[:query]), concept_path(:id => owner) %>
+		<% when Iqvoc::Collection.base_class_name %>
+			<%= link_to highlight_query(result.target.value, params[:query]), collection_path(:id => owner) %>
+		<% end %>
+    <%- if owner.additional_info.present? -%>
+      (<%= owner.additional_info %>)
     <%- end -%>
   </dt>
   <dd><%= t('txt.views.search_results.type') %>: <%= result.class.model_name.human %></dd>

data/app/views/partials/note/skos/change_note/_search_result.html.erb

@@ -0,0 +1,12 @@
+<dt>
+	<% result.annotations.each do |annotation| %>
+		<% if result.owner.is_a?(Concept::Base) %>
+	    <%= link_to highlight_query("#{annotation.predicate}: #{annotation.value}", params[:query]), concept_path(:id => result.owner) %><br>
+	  <% elsif result.owner.is_a?(Label::Base) %>
+	    <%= link_to highlight_query("#{annotation.predicate}: #{annotation.value}", params[:query]), label_path(:id => result.owner) %><br>
+	  <% elsif result.owner.is_a?(Collection::Base) %>
+			<%= link_to highlight_query("#{annotation.predicate}: #{annotation.value}", params[:query]), collection_path(:id => result.owner) %><br>
+		<% end %>
+	<% end %>
+</dt>
+<dd><%= t('txt.views.search_results.type') %>: <%= result.class.model_name.human %></dd>

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

@@ -40,6 +40,12 @@
           <%= text_field_tag :q, params[:query] %>
         <% end %>
       </li>
+			<li class="result_type_filter">
+				<label><%= t('txt.views.search_results.for') %></label>
+				<%= radio_button_tag 'for', 'concept', params[:for] == "concept" %> <label for="for_concept"><%= Iqvoc::Concept.base_class.model_name.human %></label>
+				<%= radio_button_tag 'for', 'collection', params[:for] == "collection" %> <label for="for_collection"><%= Iqvoc::Collection.base_class.model_name.human %></label>
+				<%= radio_button_tag 'for', 'all', !%w(concept collection).include?(params[:for]) %> <label for="for_all"><%= t("txt.views.search_results.all") %></label>
+			</li>
       <li>
         <label for"c"><%= Iqvoc::Collection.base_class.model_name.human %></label>
         <%= select_tag 'c', options_for_select(@collections.sort { |a, b| a.pref_label.to_s <=> b.pref_label.to_s }.map { |c| [c.pref_label.to_s, c.origin] }, params[:c]), :include_blank => true %>

data/config/database.template.yml

@@ -1,43 +1,29 @@
-<% detect_socket = lambda {
-  ["/tmp/mysql.sock",
-    "/opt/local/var/run/mysql5/mysqld.sock",
-    "/tmp/mysqld.sock",
-    "/var/run/mysqld.sock"
-  ].detect{ |socket| File.exist?(socket) }
-} %>
-
-development: &DEVELOPMENT
+development:
+  adapter: mysql2
   encoding: utf8
-  username: root
-  password:
+  reconnect: false
   database: iqvoc_development
-<% if defined?(JRuby) %>
-  adapter: jdbcmysql
-  hostname: localhost
-<% else %>
-  adapter: mysql2
-  socket: <%= detect_socket.call %>
-<% end %>
-
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.
-test: &TEST
-  adapter: sqlite3
-  database: db/iqvoc_test.sqlite3
   pool: 5
-  timeout: 5000
+  username: root
+  password:
+  hostname: 127.0.0.1
 
-production_internal:
+test:
+  adapter: mysql2
   encoding: utf8
-  username: iqvoc
-  password: iqvoc
-  database: iqvocspez
-  adapter: oracle_enhanced
+  reconnect: false
+  database: iqvoc_test
+  pool: 5
+  username: root
+  password:
+  hostname: 127.0.0.1
 
 production:
+  adapter: mysql2
   encoding: utf8
-  username: iqvoc
-  password: iqvoc
-  database: iqvoc
-  adapter: oracle_enhanced
+  reconnect: false
+  database: iqvoc_production
+  pool: 5
+  username: root
+  password:
+  hostname: 127.0.0.1

data/config/database.yml

@@ -1,40 +1,42 @@
-<% socket = ["/tmp/mysql.sock", 
-           "/opt/local/var/run/mysql5/mysqld.sock", 
-           "/tmp/mysqld.sock", 
-           "/var/run/mysqld.sock"].detect { |socket| File.exist?(socket) } %>
-
-development: &DEVELOPMENT
+# MySQL.  Versions 4.1 and 5.0 are recommended.
+# 
+# Install the MYSQL driver
+#   gem install mysql2
+#
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem 'mysql2'
+#
+# And be sure to use new-style password hashing:
+#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
+development:
+  adapter: mysql2
   encoding: utf8
+  reconnect: false
+  database: iqvoc_development
+  pool: 5
   username: root
   password:
-  database: iqvoc_development
-<% if defined?(JRuby) %>
-  adapter: jdbcmysql
-  hostname: localhost
-<% else %>
-  adapter: mysql2
-  socket: <%= socket %>
-<% end %>
-  
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+  socket: /tmp/mysql.sock
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-test: &TEST
-  adapter: sqlite3
-  # database: ":memory:"
-  database: db/iqvoc_test.sqlite3
-  timeout: 5000
-  
-production_internal:
+test:
+  adapter: mysql2
   encoding: utf8
-  username: iqvoc
-  password: iqvoc
-  database: iqvocspez
-  adapter: oracle_enhanced
+  reconnect: false
+  database: iqvoc_test
+  pool: 5
+  username: root
+  password:
+  socket: /tmp/mysql.sock
 
 production:
+  adapter: mysql2
   encoding: utf8
-  username: iqvoc
-  password: iqvoc
-  database: iqvoc
-  adapter: oracle_enhanced
+  reconnect: false
+  database: iqvoc_production
+  pool: 5
+  username: root
+  password:
+  socket: /tmp/mysql.sock

data/config/database.yml.mysql

@@ -0,0 +1,29 @@
+development:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: iqvoc_development
+  pool: 5
+  username: root
+  password:
+  hostname: 127.0.0.1
+
+test:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: iqvoc_test
+  pool: 5
+  username: root
+  password:
+  hostname: 127.0.0.1
+
+production:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: iqvoc_production
+  pool: 5
+  username: root
+  password:
+  hostname: 127.0.0.1

data/config/database.yml.sqlite

@@ -0,0 +1,17 @@
+development:
+  adapter: sqlite3
+  database: db/iqvoc_development.sqlite3
+  pool: 5
+  timeout: 5000
+
+test:
+  adapter: sqlite3
+  database: db/iqvoc_test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/iqvoc_production.sqlite3
+  pool: 5
+  timeout: 5000

data/config/initializers/secret_token.rb

@@ -24,6 +24,7 @@ if Iqvoc.const_defined?(:Application)
   # no regular words or you'll be exposed to dictionary attacks.
 
   # Run `rake secret` and uncomment the following line
-  Iqvoc::Application.config.secret_token = '79928688c1dd96d767491a06c213bbaa145ef625f0c2bd8bd90aa54157dc936cdf9ab0c9a10f779e2840b661257334fdf18e44b76e6a7b9be7db461f1ab1d1fc'
+  # Replace the secret-placeholder with your generated token
+  Iqvoc::Application.config.secret_token = 'e31dccdf1caecf25fe01b7ef39e38787b2b21c5f3d5b74d9f44e56de699109141ab30206c07bc68948699618fe55c17b1338462ce7691c7559a65bfc69d929de'
 
 end

data/config/initializers/secret_token.rb.template

@@ -24,6 +24,7 @@ if Iqvoc.const_defined?(:Application)
   # no regular words or you'll be exposed to dictionary attacks.
 
   # Run `rake secret` and uncomment the following line
-  #Iqvoc::Application.config.secret_token = '<enter_your_token_here (use `rake secret` to generate one)>'
+  # Replace the secret-placeholder with your generated token
+  Iqvoc::Application.config.secret_token = 'S-E-C-R-E-T'
 
 end

data/config/locales/activerecord.de.yml

@@ -22,6 +22,9 @@ de:
           one:   "Konzept"
           other: "Konzepte"
         relation:
+          base:
+            one: "Relation"
+            other: "Relationen"
           skos:
             broader:
               mono:
@@ -57,6 +60,9 @@ de:
             one:   "Alternatives Label"
             other: "Alternative Labels"
       match:
+        base:
+          one: "Match"
+          other: "Matches"
         skos:
           broad_match:
             one:   "Broader Match"