Merge pull request #478 from metanorma/fix/itu-abbrev-i18n

refactor organisation contributor metadata, add ITU abbreviation to m…
metanorma · Nov 24, 2023 · a5688b1 · a5688b1
2 parents 679b48f + 9ffb573
commit a5688b1
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>