fix: Return orgnization for orgnization only contacts (#837)

ietf-tools · Aug 28, 2022 · 2c9dfaf · 2c9dfaf
1 parent 20cdb44
commit 2c9dfaf
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 8 deletions.
diff --git a/tests/input/elements.xml b/tests/input/elements.xml
@@ -1397,7 +1397,9 @@ for opt, value in opts:
             </contact>
             <t>
                Reviews and helpful comments have also been received from
-               <contact asciiFullname="Ana Kikabidze" fullname="ანა კიკაბიძე"/>.
+              <contact asciiFullname="Ana Kikabidze" fullname="ანა კიკაბიძე"/>
+              and
+              Org: <contact><organization>TEST</organization></contact>
             </t>
          </section>
          <section>

diff --git a/tests/valid/elements.bom.text b/tests/valid/elements.bom.text
@@ -1466,7 +1466,7 @@ Internet-Draft       Xml2rfc Vocabulary V3 Elements            July 2018
 
 
    Reviews and helpful comments have also been received from ანა
-   კიკაბიძე (Ana Kikabidze).
+   კიკაბიძე (Ana Kikabidze) and Org: TEST
 
 A.2.  Arbitrary^superscript in section _title_
 

diff --git a/tests/valid/elements.pages.text b/tests/valid/elements.pages.text
@@ -1466,7 +1466,7 @@ Internet-Draft       Xml2rfc Vocabulary V3 Elements            July 2018
 
 
    Reviews and helpful comments have also been received from ანა
-   კიკაბიძე (Ana Kikabidze).
+   კიკაბიძე (Ana Kikabidze) and Org: TEST
 
 A.2.  Arbitrary^superscript in section _title_
 

diff --git a/tests/valid/elements.prepped.xml b/tests/valid/elements.prepped.xml
@@ -1785,7 +1785,11 @@ for opt, value in opts:
         </contact>
         <t indent="0" pn="section-appendix.a.1-2">
                Reviews and helpful comments have also been received from
-               <contact asciiFullname="Ana Kikabidze" fullname="ანა კიკაბიძე"/>.
+              <contact asciiFullname="Ana Kikabidze" fullname="ანა კიკაბიძე"/>
+              and
+              Org: <contact>
+            <organization showOnFrontPage="true">TEST</organization>
+          </contact>
         </t>
       </section>
       <section numbered="true" removeInRFC="false" toc="include" pn="section-appendix.a.2">

diff --git a/tests/valid/elements.text b/tests/valid/elements.text
@@ -1202,7 +1202,7 @@ A.1.  Contributors
 
 
    Reviews and helpful comments have also been received from ანა
-   კიკაბიძე (Ana Kikabidze).
+   კიკაბიძე (Ana Kikabidze) and Org: TEST
 
 A.2.  Arbitrary^superscript in section _title_
 

diff --git a/tests/valid/elements.v3.html b/tests/valid/elements.v3.html
@@ -1825,7 +1825,9 @@ <h3 id="name-contributors">
 </address>
 <p id="appendix-A.1-2">
                Reviews and helpful comments have also been received from
-               <span class="contact-name"><span class="non-ascii">ანა კიკაბიძე</span> (<span class="ascii">Ana Kikabidze</span>)</span>.<a href="#appendix-A.1-2" class="pilcrow">¶</a></p>
+              <span class="contact-name"><span class="non-ascii">ანა კიკაბიძე</span> (<span class="ascii">Ana Kikabidze</span>)</span>
+              and
+              Org: <span class="contact-name">TEST</span><a href="#appendix-A.1-2" class="pilcrow">¶</a></p>
 </section>
 <section id="appendix-A.2">
         <h3 id="name-arbitrary-superscript-in-se">

diff --git a/tests/valid/elements.wip.text b/tests/valid/elements.wip.text
@@ -1466,7 +1466,7 @@ Internet-Draft       Xml2rfc Vocabulary V3 Elements            July 2018
 
 
    Reviews and helpful comments have also been received from ანა
-   კიკაბიძე (Ana Kikabidze).
+   კიკაბიძე (Ana Kikabidze) and Org: TEST
 
 A.2.  Arbitrary^superscript in section _title_
 

diff --git a/xml2rfc/util/name.py b/xml2rfc/util/name.py
@@ -168,7 +168,8 @@ def full_author_name_set(a):
         else:
             ascii = full_author_ascii_name(a)
     else:
-        ascii = None
+        name = full_org_name(a)
+        ascii = full_org_ascii_name(a)
     if name == ascii:
         ascii = None
     return name, ascii