From 9ffb573262703fb7d26a55759d2a63349ac93418 Mon Sep 17 00:00:00 2001
From: Nick Nicholas <opoudjis@gmail.com>
Date: Fri, 24 Nov 2023 00:12:31 +1100
Subject: [PATCH] refactor organisation contributor metadata, add ITU
 abbreviation to metadata, i18n of ITU name and abbreviation in metadata:
 https://github.com/metanorma/metanorma-nist/issues/103

---
 Gemfile                     |  6 ++-
 Gemfile.devel               |  2 +
 lib/isodoc/itu/i18n-de.yaml |  1 +
 lib/isodoc/itu/i18n-en.yaml |  1 +
 lib/isodoc/itu/i18n-es.yaml |  1 +
 lib/isodoc/itu/i18n-fr.yaml |  1 +
 lib/isodoc/itu/i18n-ru.yaml |  1 +
 lib/metanorma/itu/front.rb  | 10 ++++-
 spec/metanorma/base_spec.rb | 19 ++++++++-
 spec/metanorma/i18n_spec.rb | 77 +++++++++++++++++++++++++------------
 spec/spec_helper.rb         |  3 ++
 11 files changed, 95 insertions(+), 27 deletions(-)
 create mode 100644 Gemfile.devel

diff --git a/Gemfile b/Gemfile
index 11d79ae7..6afa08ee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,8 +4,12 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-gemspec
+group :development, :test do
+  gem "rspec"
+end
 
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
+
+gemspec
diff --git a/Gemfile.devel b/Gemfile.devel
new file mode 100644
index 00000000..0b68a228
--- /dev/null
+++ b/Gemfile.devel
@@ -0,0 +1,2 @@
+gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "features/logos"
+
diff --git a/lib/isodoc/itu/i18n-de.yaml b/lib/isodoc/itu/i18n-de.yaml
index ec5ccd46..2c72b166 100644
--- a/lib/isodoc/itu/i18n-de.yaml
+++ b/lib/isodoc/itu/i18n-de.yaml
@@ -52,6 +52,7 @@ annex_to_itu_ob: Anhang zum ITU Operational Bulletin
 number_abbrev: Nr.
 annex_to_itu_ob_abbrev: Anhang zum ITU OB %
 international_telecommunication_union: Internationale Fernmeldeunion
+ITU: ITU
 position_on: (Position auf %)
 revision_abbreviation: Rev.
 tsb: TSB
diff --git a/lib/isodoc/itu/i18n-en.yaml b/lib/isodoc/itu/i18n-en.yaml
index 84de0635..91625aa3 100644
--- a/lib/isodoc/itu/i18n-en.yaml
+++ b/lib/isodoc/itu/i18n-en.yaml
@@ -53,6 +53,7 @@ annex_to_itu_ob: Annex to ITU Operational Bulletin
 number_abbrev: No.
 annex_to_itu_ob_abbrev: Annex to ITU OB %
 international_telecommunication_union: International Telecommunication Union
+ITU: ITU
 position_on: (Position on %)
 revision_abbreviation: Rev.
 tsb: TSB
diff --git a/lib/isodoc/itu/i18n-es.yaml b/lib/isodoc/itu/i18n-es.yaml
index ad7fb758..c39b86ae 100755
--- a/lib/isodoc/itu/i18n-es.yaml
+++ b/lib/isodoc/itu/i18n-es.yaml
@@ -53,6 +53,7 @@ annex_to_itu_ob: Anexo al Boletín de Explotación de la UIT
 number_abbrev: N.°
 annex_to_itu_ob_abbrev: Anexo al BE de la UIT %
 international_telecommunication_union: Unión Internacional de Telecomunicaciones
+ITU: UIT
 position_on: (Posición en %)
 revision_abbreviation: Rev.
 tsb: TSB
diff --git a/lib/isodoc/itu/i18n-fr.yaml b/lib/isodoc/itu/i18n-fr.yaml
index cf324053..8cc1aceb 100644
--- a/lib/isodoc/itu/i18n-fr.yaml
+++ b/lib/isodoc/itu/i18n-fr.yaml
@@ -53,6 +53,7 @@ annex_to_itu_ob: Annexe au Bulletin d’exploitation de l’UIT
 number_abbrev: Nº
 annex_to_itu_ob_abbrev: Annexe au BE de l’UIT %
 international_telecommunication_union: Union internationale des télécommunications
+ITU: UIT
 position_on: (Position sur %)
 revision_abbreviation: Rev.
 tsb: TSB
diff --git a/lib/isodoc/itu/i18n-ru.yaml b/lib/isodoc/itu/i18n-ru.yaml
index ca6a7899..4ff793d2 100755
--- a/lib/isodoc/itu/i18n-ru.yaml
+++ b/lib/isodoc/itu/i18n-ru.yaml
@@ -53,6 +53,7 @@ annex_to_itu_ob: Приложение к Оперативному бюллете
 number_abbrev: №.
 annex_to_itu_ob_abbrev: Приложение к ОБ МСЭ %
 international_telecommunication_union: Международный Союз Электросвязи
+ITU: МСЭ
 position_on: (Позиция по %)
 revision_abbreviation: Ред.
 tsb: БСЭ
diff --git a/lib/metanorma/itu/front.rb b/lib/metanorma/itu/front.rb
index 99bf2d36..6f93ec7e 100644
--- a/lib/metanorma/itu/front.rb
+++ b/lib/metanorma/itu/front.rb
@@ -75,7 +75,15 @@ def other_title_otherlangs(node, xml, type)
       end
 
       def default_publisher
-        "International Telecommunication Union"
+        @i18n.get["ITU"] || @i18n.international_telecommunication_union
+      end
+
+      def org_abbrev
+        if @i18n.get["ITU"]
+          { @i18n.international_telecommunication_union => @i18n.get["ITU"] }
+        else
+          {}
+        end
       end
 
       def metadata_committee(node, xml)
diff --git a/spec/metanorma/base_spec.rb b/spec/metanorma/base_spec.rb
index 274ba806..36d451bd 100644
--- a/spec/metanorma/base_spec.rb
+++ b/spec/metanorma/base_spec.rb
@@ -110,12 +110,14 @@
             <role type="author"/>
             <organization>
               <name>International Telecommunication Union</name>
+              <abbreviation>ITU</abbreviation>
             </organization>
           </contributor>
           <contributor>
             <role type="publisher"/>
             <organization>
               <name>International Telecommunication Union</name>
+              <abbreviation>ITU</abbreviation>
             </organization>
           </contributor>
           <version>
@@ -132,6 +134,7 @@
             <owner>
               <organization>
                 <name>International Telecommunication Union</name>
+                <abbreviation>ITU</abbreviation>
               </organization>
             </owner>
           </copyright>
@@ -263,6 +266,7 @@
               <role type='author'/>
               <organization>
                 <name>International Telecommunication Union</name>
+                <abbreviation>ITU</abbreviation>
               </organization>
             </contributor>
             <contributor>
@@ -286,6 +290,7 @@
               <role type='publisher'/>
               <organization>
                 <name>International Telecommunication Union</name>
+                <abbreviation>ITU</abbreviation>
               </organization>
             </contributor>
             <edition>2</edition>
@@ -302,6 +307,7 @@
               <owner>
                 <organization>
                   <name>International Telecommunication Union</name>
+                  <abbreviation>ITU</abbreviation>
                 </organization>
               </owner>
             </copyright>
@@ -709,7 +715,7 @@
           <contributor>
             <role type='author'/>
             <organization>
-              <name>International Telecommunication Union</name>
+              <name>International Telecommunication Union</name><abbreviation>ITU</abbreviation>
             </organization>
           </contributor>
           <contributor>
@@ -754,6 +760,7 @@
             <role type='publisher'/>
             <organization>
               <name>International Telecommunication Union</name>
+              <abbreviation>ITU</abbreviation>
             </organization>
           </contributor>
           <edition>2</edition>
@@ -771,6 +778,7 @@
             <owner>
               <organization>
                 <name>International Telecommunication Union</name>
+                <abbreviation>ITU</abbreviation>
               </organization>
             </owner>
           </copyright>
@@ -875,12 +883,14 @@
             <role type='author'/>
             <organization>
               <name>International Telecommunication Union</name>
+              <abbreviation>ITU</abbreviation>
             </organization>
           </contributor>
           <contributor>
             <role type='publisher'/>
             <organization>
               <name>International Telecommunication Union</name>
+              <abbreviation>ITU</abbreviation>
             </organization>
           </contributor>
           <edition>2</edition>
@@ -898,6 +908,7 @@
             <owner>
               <organization>
                 <name>International Telecommunication Union</name>
+                <abbreviation>ITU</abbreviation>
               </organization>
             </owner>
           </copyright>
@@ -1014,6 +1025,7 @@
             <role type='author'/>
             <organization>
               <name>International Telecommunication Union</name>
+              <abbreviation>ITU</abbreviation>
             </organization>
           </contributor>
           <contributor>
@@ -1058,6 +1070,7 @@
             <role type='publisher'/>
             <organization>
               <name>International Telecommunication Union</name>
+              <abbreviation>ITU</abbreviation>
             </organization>
           </contributor>
           <edition>2</edition>
@@ -1075,6 +1088,7 @@
             <owner>
               <organization>
                 <name>International Telecommunication Union</name>
+                <abbreviation>ITU</abbreviation>
               </organization>
             </owner>
           </copyright>
@@ -1154,12 +1168,14 @@
           <role type="author"/>
           <organization>
           <name>International Telecommunication Union</name>
+          <abbreviation>ITU</abbreviation>
           </organization>
         </contributor>
         <contributor>
           <role type="publisher"/>
           <organization>
           <name>International Telecommunication Union</name>
+          <abbreviation>ITU</abbreviation>
           </organization>
         </contributor>
         <language>en</language>
@@ -1172,6 +1188,7 @@
           <owner>
             <organization>
             <name>International Telecommunication Union</name>
+            <abbreviation>ITU</abbreviation>
             </organization>
           </owner>
         </copyright>
diff --git a/spec/metanorma/i18n_spec.rb b/spec/metanorma/i18n_spec.rb
index c070888e..b6c8db88 100644
--- a/spec/metanorma/i18n_spec.rb
+++ b/spec/metanorma/i18n_spec.rb
@@ -71,7 +71,8 @@
           <contributor>
             <role type='author'/>
             <organization>
-              <name>International Telecommunication Union</name>
+                           <name>Union internationale des télécommunications</name>
+                <abbreviation>UIT</abbreviation>
             </organization>
           </contributor>
           <contributor>
@@ -115,7 +116,8 @@
           <contributor>
             <role type='publisher'/>
             <organization>
-              <name>International Telecommunication Union</name>
+                           <name>Union internationale des télécommunications</name>
+                <abbreviation>UIT</abbreviation>
             </organization>
           </contributor>
           <edition>2</edition>
@@ -132,7 +134,8 @@
             <from>2001</from>
             <owner>
               <organization>
-                <name>International Telecommunication Union</name>
+               <name>Union internationale des télécommunications</name>
+                <abbreviation>UIT</abbreviation>
               </organization>
             </owner>
           </copyright>
@@ -311,7 +314,10 @@
     output = <<~OUTPUT
             #{@blank_hdr.sub('<status>', '<abstract> <p>Text</p> </abstract><status>')
               .sub('<title language="en"', '<title language="fr"')
-              .sub('<language>en</language>', '<language>fr</language>')}
+              .sub('<language>en</language>', '<language>fr</language>')
+              .gsub('<name>International Telecommunication Union</name>', '<name>Union internationale des télécommunications</name>')
+              .gsub('<abbreviation>ITU</abbreviation>', '<abbreviation>UIT</abbreviation>')
+            }
                <preface>
         <abstract id='_'>
           <title>R&#233;sum&#233;</title>
@@ -517,7 +523,7 @@
           <contributor>
             <role type='author'/>
             <organization>
-              <name>International Telecommunication Union</name>
+            <name>国际电信联盟</name>
             </organization>
           </contributor>
           <contributor>
@@ -561,7 +567,7 @@
           <contributor>
             <role type='publisher'/>
             <organization>
-              <name>International Telecommunication Union</name>
+            <name>国际电信联盟</name>
             </organization>
           </contributor>
           <edition>2</edition>
@@ -578,7 +584,7 @@
             <from>2001</from>
             <owner>
               <organization>
-                <name>International Telecommunication Union</name>
+                <name>国际电信联盟</name>
               </organization>
             </owner>
           </copyright>
@@ -732,7 +738,10 @@
       #{@blank_hdr.sub('<status>', '<abstract> <p>Text</p> </abstract><status>')
         .sub('<language>en</language>', '<language>zh</language>')
         .sub('<title language="en"', '<title language="zh"')
-        .sub('<script>Latn</script>', '<script>Hans</script>')}
+        .sub('<script>Latn</script>', '<script>Hans</script>')
+        .gsub('<name>International Telecommunication Union</name>', '<name>国际电信联盟</name>')
+        .gsub('<abbreviation>ITU</abbreviation>', '')
+      }
       <preface>
           <abstract id='_'>
             <title>摘要</title>
@@ -944,7 +953,7 @@
         <contributor>
           <role type='author'/>
           <organization>
-            <name>International Telecommunication Union</name>
+          <name>الاتحاد الدولي للاتصالات</na
           </organization>
         </contributor>
         <contributor>
@@ -988,7 +997,7 @@
         <contributor>
           <role type='publisher'/>
           <organization>
-            <name>International Telecommunication Union</name>
+          <name>الاتحاد الدولي للاتصالات</na
           </organization>
         </contributor>
         <edition>2</edition>
@@ -1005,7 +1014,7 @@
           <from>2001</from>
           <owner>
             <organization>
-              <name>International Telecommunication Union</name>
+              <name>الاتحاد الدولي للاتصالات</na
             </organization>
           </owner>
         </copyright>
@@ -1160,7 +1169,10 @@
             #{@blank_hdr.sub('<status>', '<abstract> <p>Text</p> </abstract><status>')
               .sub('<language>en</language>', '<language>ar</language>')
               .sub('<title language="en"', '<title language="ar"')
-              .sub('<script>Latn</script>', '<script>Arab</script>')}
+              .sub('<script>Latn</script>', '<script>Arab</script>')
+              .gsub('<name>International Telecommunication Union</name>', '<name>الاتحاد الدولي للاتصالات</name>')
+              .gsub('<abbreviation>ITU</abbreviation>', '')
+              }
                <preface>
         <abstract id='_'>
           <title>&#1605;&#1604;&#1582;&#1589;</title>
@@ -1378,7 +1390,8 @@
         <contributor>
           <role type='author'/>
           <organization>
-            <name>International Telecommunication Union</name>
+                  <name>Unión Internacional de Telecomunicaciones</name>
+        <abbreviation>UIT</abbreviation>
           </organization>
         </contributor>
         <contributor>
@@ -1422,7 +1435,8 @@
         <contributor>
           <role type='publisher'/>
           <organization>
-            <name>International Telecommunication Union</name>
+                  <name>Unión Internacional de Telecomunicaciones</name>
+        <abbreviation>UIT</abbreviation>
           </organization>
         </contributor>
         <edition>2</edition>
@@ -1439,7 +1453,8 @@
           <from>2001</from>
           <owner>
             <organization>
-              <name>International Telecommunication Union</name>
+                    <name>Unión Internacional de Telecomunicaciones</name>
+        <abbreviation>UIT</abbreviation>
             </organization>
           </owner>
         </copyright>
@@ -1592,7 +1607,10 @@
     output = <<~OUTPUT
              #{@blank_hdr.sub('<status>', '<abstract> <p>Text</p> </abstract><status>')
                .sub('<title language="en"', '<title language="es"')
-               .sub('<language>en</language>', '<language>es</language>')}
+               .sub('<language>en</language>', '<language>es</language>')
+               .gsub('<name>International Telecommunication Union</name>', '<name>Unión Internacional de Telecomunicaciones</name>')
+               .gsub('<abbreviation>ITU</abbreviation>', '<abbreviation>UIT</abbreviation>')
+            }
                <preface>
         <abstract id='_'>
           <title>Resumen</title>
@@ -1792,7 +1810,8 @@
         <contributor>
           <role type='author'/>
           <organization>
-            <name>International Telecommunication Union</name>
+                  <name>Internationale Fernmeldeunion</name>
+        <abbreviation>ITU</abbreviation>
           </organization>
         </contributor>
         <contributor>
@@ -1836,7 +1855,8 @@
         <contributor>
           <role type='publisher'/>
           <organization>
-            <name>International Telecommunication Union</name>
+                  <name>Internationale Fernmeldeunion</name>
+        <abbreviation>ITU</abbreviation>
           </organization>
         </contributor>
         <edition>2</edition>
@@ -1853,7 +1873,8 @@
           <from>2001</from>
           <owner>
             <organization>
-              <name>International Telecommunication Union</name>
+                    <name>Internationale Fernmeldeunion</name>
+        <abbreviation>ITU</abbreviation>
             </organization>
           </owner>
         </copyright>
@@ -2007,7 +2028,9 @@
     output = <<~OUTPUT
              #{@blank_hdr.sub('<status>', '<abstract> <p>Text</p> </abstract><status>')
                .sub('<title language="en"', '<title language="de"')
-               .sub('<language>en</language>', '<language>de</language>')}
+               .sub('<language>en</language>', '<language>de</language>')
+               .gsub('<name>International Telecommunication Union</name>', '<name>Internationale Fernmeldeunion</name>')
+              }
                <preface>
         <abstract id='_'>
           <title>Abstrakt</title>
@@ -2213,7 +2236,8 @@
            <contributor>
              <role type='author'/>
              <organization>
-               <name>International Telecommunication Union</name>
+                <name>Международный Союз Электросвязи</name>
+                <abbreviation>МСЭ</abbreviation>
              </organization>
            </contributor>
            <contributor>
@@ -2257,7 +2281,8 @@
            <contributor>
              <role type='publisher'/>
              <organization>
-               <name>International Telecommunication Union</name>
+                <name>Международный Союз Электросвязи</name>
+                <abbreviation>МСЭ</abbreviation>
              </organization>
            </contributor>
            <edition>2</edition>
@@ -2274,7 +2299,8 @@
              <from>2001</from>
              <owner>
                <organization>
-                 <name>International Telecommunication Union</name>
+                 <name>Международный Союз Электросвязи</name>
+                 <abbreviation>МСЭ</abbreviation>
                </organization>
              </owner>
            </copyright>
@@ -2428,7 +2454,10 @@
       #{@blank_hdr.sub('<status>', '<abstract> <p>Text</p> </abstract><status>')
         .sub('<language>en</language>', '<language>ru</language>')
         .sub('<script>Latn</script>', '<script>Cyrl</script>')
-        .sub('<title language="en"', '<title language="ru"')}
+        .sub('<title language="en"', '<title language="ru"')
+        .gsub('<name>International Telecommunication Union</name>', '<name>Международный Союз Электросвязи</name>')
+        .gsub('<abbreviation>ITU</abbreviation>', '<abbreviation>МСЭ</abbreviation>')
+        }
         <preface>
           <abstract id='_'>
             <title>Реферат</title>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 648cfef7..d6b7452b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -223,12 +223,14 @@ def itudoc(lang)
       <role type="author"/>
       <organization>
         <name>International Telecommunication Union</name>
+        <abbreviation>ITU</abbreviation>
       </organization>
     </contributor>
     <contributor>
       <role type="publisher"/>
       <organization>
         <name>International Telecommunication Union</name>
+        <abbreviation>ITU</abbreviation>
       </organization>
     </contributor>
 
@@ -243,6 +245,7 @@ def itudoc(lang)
       <owner>
         <organization>
         <name>International Telecommunication Union</name>
+        <abbreviation>ITU</abbreviation>
         </organization>
       </owner>
     </copyright>