jekyll-geolexica 1.8.4 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fad6a24e360f3645f7b5045502c0aba3eb9ab66845a12a2b52833cf621bcabf7
-  data.tar.gz: 1ffe82fa1f282cf166d075577d7785e5bbcbba94626df0c1f2cde4ab8509d956
+  metadata.gz: 953781d4af25bb0fddf2369620b0eb6f80dbe78b5ed0513a2ccb936cb4766fcd
+  data.tar.gz: 92a2f81efd01b51138ad95e3c2a3821688684ec2bc544f188b558999b35d91d8
 SHA512:
-  metadata.gz: 62285c54a481761fb7f6e58177efd4558b408682cecc4e88494ae8f5da056aebc7412eddecd062f2ba68f3ddaa48bfb6b1e93ecb9005fc25919f82dcf00e6c1c
-  data.tar.gz: c34b102dc55691f538d33aab7a082d84af743a6819a8ad72009e6a3eea915f56f51a69ada1b6e38f58fe4e1b14ca8a0138445e094e5018779f29f3cb586ce49e
+  metadata.gz: 9eb581e4730853549c2560c406370a849638db0019f3da67d3893a14e9e356bf44d4ce9e0253cf87ffaac85b4edf523ee639c0129236010c284bd952a695ebeb
+  data.tar.gz: 17c3fabebc23db2294405d7ee8914dd0bd895759fc33c582345ade2807a5c85660fa6c4af44abda90642d0154b0f3789d0784d3c6f8f94bed966a4ddfc3ee881

data/_includes/concept-header.html

@@ -1,6 +1,28 @@
 <header>
-  <h2 class="section-title">
-    Concept
-    <span class="term-name">{{ page.term | escape }}</span>
-  </h2>
+  <div class="header-row">
+    <h2>
+      Concept
+      <span class="term-name">{{ page.term | escape }}</span>
+    </h2>
+
+    <div class="links">
+      {%- assign current_url = site.url | append: page.url -%}
+
+      {% if site.suggest_translation_url %}
+        <div>
+        <a href="{{ site.suggest_translation_url }}<{{ current_url }}>" target="_blank">
+          Suggest translation
+        </a>
+        </div>
+      {% endif %}
+
+      {% if site.suggest_translation_url %}
+        <div>
+        <a href="{{ site.report_issue_url }}<{{ current_url }}>" target="_blank">
+          Report an issue
+        </a>
+        </div>
+      {% endif %}
+    </div>
+  </div>
 </header>

data/_sass/concept.scss

@@ -195,10 +195,25 @@ body.concept > main {
     margin-left: $sideOffsetBase;
     margin-right: $sideOffsetBase;
   }
+
   .field {
     margin: 0 15vw 0 15vw;
   }
 
+  .header-row {
+    margin: 0 15vw 0 0;
+    display: flex;
+  }
+
+  .links {
+    margin-left: auto;
+
+    > div a {
+      color: $warningColor;
+      border-bottom: none;
+    }
+  }
+
   @media screen and (min-width: $bigscreenBreakpoint) {
     .field {
       margin-left: calc(#{$sideOffsetBase} - #{$logoOffset});

data/lib/jekyll/geolexica/configuration.rb

@@ -9,6 +9,17 @@ module Jekyll
         File.expand_path(glob_string, site.source)
       end
 
+      def localized_concepts_path
+        path = glossary_config["localized_concepts_path"]
+        return nil if path.nil? || path.empty?
+
+        File.expand_path(path, site.source)
+      end
+
+      def glossary_format
+        glossary_config["format"]
+      end
+
       def images_path
         glossary_path = glossary_config["glossary_path"]
         return nil if glossary_path.nil? || glossary_path.empty?
@@ -30,6 +41,14 @@ module Jekyll
         File.expand_path("#{glossary_path}/bibliography.yaml", site.source)
       end
 
+      def suggest_translation_url
+        glossary_config["suggest_translation_url"]
+      end
+
+      def report_issue_url
+        glossary_config["report_issue_url"]
+      end
+
       def term_languages
         glossary_config["term_languages"]
       end

data/lib/jekyll/geolexica/glossary.rb

@@ -40,7 +40,13 @@ module Jekyll
       def load_concept(concept_file_path)
         Jekyll.logger.debug("Geolexica:",
           "reading concept from file #{concept_file_path}")
-        concept_hash = read_concept_file(concept_file_path)
+
+        concept_hash = if glossary_format == "paneron"
+                         read_paneron_concept_file(concept_file_path)
+                       else
+                         read_concept_file(concept_file_path)
+                       end
+
         preprocess_concept_hash(concept_hash)
         store Concept.new(concept_hash)
       rescue
@@ -54,6 +60,23 @@ module Jekyll
         YAML.safe_load(File.read(path), permitted_classes: [Time])
       end
 
+      def read_paneron_concept_file(path)
+        safe_load_options = { permitted_classes: [Date, Time] }
+        concept = YAML.safe_load(File.read(path), **safe_load_options)
+        concept["termid"] = concept["data"]["identifier"]
+
+        concept["data"]["localizedConcepts"].each do |lang, local_concept_id|
+          localized_concept_path = File.join(localized_concepts_path, "#{local_concept_id}.yaml")
+          concept[lang] = YAML.safe_load(File.read(localized_concept_path), **safe_load_options)["data"]
+
+          if lang == "eng" && concept[lang]
+            concept["term"] = concept[lang]["terms"].first["designation"]
+          end
+        end
+
+        concept
+      end
+
       # Does nothing, but some sites may replace this method.
       def preprocess_concept_hash(concept_hash)
       end

data/lib/jekyll/geolexica/version.rb

@@ -3,6 +3,6 @@
 
 module Jekyll
   module Geolexica
-    VERSION = "1.8.4".freeze
+    VERSION = "1.8.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-geolexica
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Geolexica plugin for Jekyll