lib/adiwg/mdtranslator/writers/html/sections/html_metadataInfo.rb in adiwg-mdtranslator-1.2.1 vs lib/adiwg/mdtranslator/writers/html/sections/html_metadataInfo.rb in adiwg-mdtranslator-1.3.0

@@ -2,15 +2,16 @@
 # metadata information section
 
 # History:
 # 	Stan Smith 2015-03-24 original script
 #   Stan Smith 2016-06-12 added metadata character set
+#   Stan Smith 2015-07-16 refactored to remove global namespace $HtmlNS
 
-require 'html_citation'
-require 'html_responsibleParty'
-require 'html_dateTime'
-require 'html_resourceMaint'
+require_relative 'html_citation'
+require_relative 'html_responsibleParty'
+require_relative 'html_dateTime'
+require_relative 'html_resourceMaint'
 
 module ADIWG
     module Mdtranslator
         module Writers
             module Html
@@ -21,14 +22,14 @@
                     end
 
                     def writeHtml(hMetaInfo)
 
                         # classes used
-                        htmlCitation = $HtmlNS::MdHtmlCitation.new(@html)
-                        htmlResParty = $HtmlNS::MdHtmlResponsibleParty.new(@html)
-                        htmlDateTime = $HtmlNS::MdHtmlDateTime.new(@html)
-                        htmlResMaint = $HtmlNS::MdHtmlResourceMaintenance.new(@html)
+                        htmlCitation = MdHtmlCitation.new(@html)
+                        htmlResParty = MdHtmlResponsibleParty.new(@html)
+                        htmlDateTime = MdHtmlDateTime.new(@html)
+                        htmlResMaint = MdHtmlResourceMaintenance.new(@html)
 
                         # metadata identifier
                         id = hMetaInfo[:metadataId][:identifier]
                         if id
                             @html.details do
@@ -82,10 +83,22 @@
                                     @html.em('Metadata character set: ')
                                     @html.text!(s)
                                     @html.br
                                 end
 
+                                # metadata locale
+                                aLocale = hMetaInfo[:metadataLocales]
+                                aLocale.each do |hLocale|
+                                    @html.em('Metadata language: ')
+                                    @html.text!(hLocale[:languageCode])
+                                    @html.em(' country: ')
+                                    @html.text!(hLocale[:countryCode])
+                                    @html.em(' characterSet encoding: ')
+                                    @html.text!(hLocale[:characterEncoding])
+                                    @html.br
+                                end
+
                                 # metadata status
                                 s = hMetaInfo[:metadataStatus]
                                 if s
                                     @html.em('Metadata status: ')
                                     @html.text!(s)
@@ -113,10 +126,10 @@
                             end
                         end
 
                         # parent metadata - citation
                         hParent = hMetaInfo[:parentMetadata]
-                        if !hParent.empty?
+                        unless hParent.empty?
                             @html.details do
                                 @html.summary('Parent Metadata Citation', {'id'=>'metadata-parentInfo', 'class'=>'h3'})
                                 @html.section(:class=>'block') do
                                     htmlCitation.writeHtml(hMetaInfo[:parentMetadata])
                                 end