isodoc-i18n 1.1.4 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2995acc039a84f2046a7dd94885f6645db44c003e13e3c2d03acc080df6ccf46
-  data.tar.gz: 10aaebe352a542028a9e6bf1d69b3e6d1309416a0fc4329aa34053a520bdc982
+  metadata.gz: 12cac5aeb35b5ef95804ecb4ccde36d048613feb1120030518f7b2cc1d8c92b5
+  data.tar.gz: e91952a59254cc33d11339955ee050f6bc8761d80fa59d91d8c1e0c7f4889cdd
 SHA512:
-  metadata.gz: f9aa2d2786ef223580b0cd832dd08d9821e06553975a369abda5e03b947cff9c5d44ad20ace189937e3707c536ffa99b5090b8cdc8ccf6cbf1dfc429ed0df623
-  data.tar.gz: bd0b5bc0c703ae8ffeeeea6d8df3df34d004bc478b4e8e0ec61c450da83b7c1571954e538bd43a3e7af320035496baa96a27e3d6f564dc7ea5afa58c3244638a
+  metadata.gz: 61311452a113779cbe5c0e5971d5bca2b5f1f14fbfda11056abd073ebcf188aa21cef54620a64ef15f896df0b3016e22df76a1474ba5d71c3fddea8fb2fea16d
+  data.tar.gz: 84c4275111d86ff51c6547e821e976910766a0803ff38685b8c053197da8259c2ebbb4031e5dc89aeb86ed9fe8f4be9c8bf92c4baab3ae4cc5e5f8b2404a8adf

data/isodoc-i18n.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-utils", "~> 1.4.0"
+  spec.add_dependency "metanorma-utils", ">= 1.5.0"
   spec.add_dependency "twitter_cldr"
 
   spec.add_development_dependency "debug"

data/lib/isodoc/i18n/version.rb

@@ -1,5 +1,5 @@
 module IsoDoc
   class I18n
-    VERSION = "1.1.4".freeze
+    VERSION = "1.1.7".freeze
   end
 end

data/lib/isodoc/i18n.rb

@@ -78,7 +78,7 @@ module IsoDoc
     # function localising spaces and punctuation.
     # Not clear if period needs to be localised for zh
     def l10n(text, lang = @lang, script = @script, locale = @locale)
-      lang == "zh" && script == "Hans" and text = l10n_zh(text)
+      lang == "zh" and text = l10n_zh(text, script)
       lang == "fr" && text = l10n_fr(text, locale || "FR")
       bidiwrap(text, lang, script)
     end
@@ -101,12 +101,12 @@ module IsoDoc
          .default_script(@lang))]
     end
 
-    def l10n_zh(text)
+    def l10n_zh(text, script = "Hans")
       xml = Nokogiri::XML::DocumentFragment.parse(text)
       xml.traverse do |n|
         next unless n.text?
 
-        n.replace(cleanup_entities(l10_zh1(n.text), is_xml: false))
+        n.replace(l10_zh1(cleanup_entities(n.text, is_xml: false), script))
       end
       xml.to_xml(encoding: "UTF-8").gsub(/<b>/, "").gsub("</b>", "")
         .gsub(/<\?[^>]+>/, "")
@@ -117,7 +117,7 @@ module IsoDoc
       xml.traverse do |n|
         next unless n.text?
 
-        n.replace(cleanup_entities(l10n_fr1(n.text, locale), is_xml: false))
+        n.replace(l10n_fr1(cleanup_entities(n.text, is_xml: false), locale))
       end
       xml.to_xml(encoding: "UTF-8")
     end
@@ -126,17 +126,16 @@ module IsoDoc
               "\\p{In Halfwidth And Fullwidth Forms}".freeze
 
     # note: we can't differentiate comma from enumeration comma 、
-    def l10_zh1(text)
+    def l10_zh1(text, _script)
       l10n_zh_remove_space(l10n_zh_punct(text))
     end
 
     def l10n_zh_punct(text)
-      [":：", ",，", ".。", ")）", "]】", ":：", ";；", "?？", "!！"].each do |m|
-        text = text.gsub(/(?<=#{ZH_CHAR})#{Regexp.quote m[0]}/, m[1])
-        text = text.gsub(/^#{Regexp.quote m[0]}/, m[1])
+      [":：", ",，", ".．", ")）", "]］", ":：", ";；", "?？", "!！", "–～"].each do |m|
+        text = text.gsub(/#{Regexp.quote m[0]}/, m[1])
       end
-      ["(（", "[【"].each do |m|
-        text = text.gsub(/#{Regexp.quote m[0]}(?=#{ZH_CHAR})/, m[1])
+      ["(（", "[［"].each do |m|
+        text = text.gsub(/#{Regexp.quote m[0]}/, m[1])
       end
       text
     end
@@ -167,11 +166,16 @@ module IsoDoc
         .sub(/%2/, list[1])
       else
         @labels["multiple_#{conn}"]
-          .sub(/%1/, l10n(list[0..-2].join(", "), @lang, @script))
+          .sub(/%1/, l10n(list[0..-2].join(enum_comma), @lang, @script))
           .sub(/%2/, list[-1])
       end
     end
 
+    def enum_comma
+      %w(Hans Hant).include?(@script) and return "、"
+      ", "
+    end
+
     def cleanup_entities(text, is_xml: true)
       c = HTMLEntities.new
       if is_xml
@@ -186,12 +190,13 @@ module IsoDoc
 
     # ord class is either SpelloutRules or OrdinalRules
     def inflect_ordinal(num, term, ord_class)
-      if @labels["ordinal_keys"].nil? || @labels["ordinal_keys"].empty?
-        tw_cldr_localize(num).to_rbnf_s(ord_class, @labels[ord_class])
-      else
-        tw_cldr_localize(num)
-          .to_rbnf_s(ord_class, @labels[ord_class][ordinal_key(term)])
-      end
+      lbl = if @labels["ordinal_keys"].nil? || @labels["ordinal_keys"].empty?
+              @labels[ord_class]
+            else @labels[ord_class][ordinal_key(term)]
+            end
+      tw_cldr_localize(num).to_rbnf_s(ord_class, lbl)
+    rescue StandardError
+      num.localize(@lang.to_sym).to_rbnf_s(ord_class, lbl)
     end
 
     def tw_cldr_localize(num)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc-i18n
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2023-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -28,16 +28,16 @@ dependencies:
   name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: isodoc-i18n