jekyll-open-sdg-plugins 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8804fc2db82ffef8783b42cebef72fcf9ad2293bfb249a2a3ed411cf9c6517d0
-  data.tar.gz: 8a706f0c5e87c53b85ec2f35ff692b14d2a66c6cdf95a4d70fab819042553111
+  metadata.gz: a90eda21a79655067f6d99cbfe719c5a007f7797a8513ddbbb292ed64513ed17
+  data.tar.gz: 1d8ece9fd6206caf59839d79da3d1ebd7a890a32f92466be9233588c2358613b
 SHA512:
-  metadata.gz: c958e70e0ff05db0a32c81278c92c10a6283e3aeed1db568f55006cf5599295e7baae7ac83d8912904476551a6c2cac75814651a2317d12b8fe67480abf90956
-  data.tar.gz: 4b9cb24ef6688502c646ac1187f7aa89d0f4ad257d9dfe925de5f2d672e7363385c3143b6676d31bfba1d1e5c2e504ffa502fe37455e95679aa60e2f5efaee91
+  metadata.gz: 25485625bf21860d2a01a02129f786abac71e9629a440f2141539cb9f0a9a0ecfd8854fb70470d5386d03de73c9c9987e09100d0651e89081b143d3e110512d8
+  data.tar.gz: 92511bd4e3fe27fd6eda3544d3f8afc42da9f704e04abf9855f3199c4ccdc6f0e53627db68f6c51b9bd1daa9902f1925d7370a5abdde44a82df4cada161f59a2

data/lib/jekyll-open-sdg-plugins/get_indicator_name.rb

@@ -10,11 +10,15 @@ module Jekyll
     #
     # The order of preference in the lookup is:
     #
-    # 1. "indicator_name" in translated metadata
-    # 2. If the default language, "indicator_name" in non-translated metadata
-    # 3. if global, translated global indicator name
-    # 4. "indicator_name" in non-translated metadata
-    # 5. indicator ID
+    # 1. "indicator_name_national" in translated metadata - subfolder approach
+    # 2. "indicator_name_national" in translated metadata - translation key approach
+    # 3. If the default language, "indicator_name_national" in non-translated metadata
+    # 4. If a global indicator, translated global indicator name
+    # 5. "indicator_name" in translated metadata - subfolder approach
+    # 6. "indicator_name" in translated metadata - translation key approach
+    # 7. "indicator_name" in non-translated metadata
+    # 8. Finally, fall back to the indicator ID
+
     def get_indicator_name(inid)
 
       # Safety code - abort now if id is nil.
@@ -42,21 +46,24 @@ module Jekyll
       data = @context.registers[:site].data
       translations = data['translations']
       meta = data['meta'][inid]
-      field = 'indicator_name'
+
+      # The metadata fields that we'll seek, first "override" then "default".
+      override_field = 'indicator_name_national'
+      default_field = 'indicator_name'
 
       name = false
 
-      # First choice, is there a subfolder translation of the name?
+      # 1. Is there a subfolder translation of the override field?
       if meta and meta.has_key? language
-        if !name and meta[language].has_key? field
+        if !name and meta[language].has_key? override_field
           name = meta[language][field]
         end
       end
 
-      # Next choice, is the name actually a "translation key"?
+      # 2. Is the override field actually a "translation key"?
       if !name
-        if meta and meta.has_key? field
-          untranslated = meta[field]
+        if meta and meta.has_key? override_field
+          untranslated = meta[override_field]
           translated = opensdg_translate_key(untranslated, translations, language)
           if untranslated != translated
             # If the opensdg_translate_key() function returned something else,
@@ -66,17 +73,17 @@ module Jekyll
         end
       end
 
-      # Next, if this is the default language, use the non-translated name
-      # if available.
+      # 3. If this is the default language, use the non-translated override
+      # field, if available.
       if !name
         if language == languages[0]
-          if meta and meta.has_key? field
-            name = meta[field]
+          if meta and meta.has_key? override_field
+            name = meta[override_field]
           end
         end
       end
 
-      # Next, is this a global indicator with a translation? For this we actually
+      # 4. Is this a global indicator with a translation? For this we actually
       # need the inid dot-delimited.
       if !name
         inid_dots = inid.gsub('-', '.')
@@ -89,14 +96,36 @@ module Jekyll
         end
       end
 
-      # Next just return the non-translated name, if available.
+      # 5. Is there a subfolder translation of the default field?
+      if !name
+        if meta and meta.has_key? language
+          if !name and meta[language].has_key? default_field
+            name = meta[language][default_field]
+          end
+        end
+      end
+
+      # 6. Is the default field actually a "translation key"?
+      if !name
+        if meta and meta.has_key? default_field
+          untranslated = meta[default_field]
+          translated = opensdg_translate_key(untranslated, translations, language)
+          if untranslated != translated
+            # If the opensdg_translate_key() function returned something else,
+            # that means it was an actual "translation key".
+            name = translated
+          end
+        end
+      end
+
+      # 7. Use the non-translated default field, if available.
       if !name
-        if meta and meta.has_key? field
-          name = meta[field]
+        if meta and meta.has_key? default_field
+          name = meta[default_field]
         end
       end
 
-      # Still here? Just return the inid.
+      # 8. Still here? Just return the inid.
       if !name
         name = inid
       end

data/lib/jekyll-open-sdg-plugins/version.rb

@@ -1,3 +1,3 @@
 module JekyllOpenSdgPlugins
-  VERSION = "0.0.10".freeze
+  VERSION = "0.0.11".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-open-sdg-plugins
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Brock Fanning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll