Spell out jurisdictions

kemitchell · kemitchell · commit b980ca9586c3 · 2019-10-03T21:16:53.000-07:00
diff --git a/routes/id.js b/routes/id.js
@@ -11,6 +11,7 @@ var jurisdictionOptions = require('./partials/jurisdiction-options')
 var nav = require('./partials/nav')
 var notFound = require('./not-found')
 var readProject = require('../data/read-project')
+var renderJurisdiction = require('./partials/jurisdiction')
 var sanitizeProject = require('../data/sanitize-project')
 
 module.exports = function (request, response) {
@@ -24,7 +25,6 @@ module.exports = function (request, response) {
     if (error) return notFound(request, response, error)
     sanitizeProject(project)
     var licensor = project.licensor
-    var jurisdiction = iso31662.subdivision(licensor.jurisdiction)
     response.setHeader('Content-Type', 'text/html; charset=UTf-8')
     response.end(html`
 <!doctype html>
@@ -61,10 +61,7 @@ module.exports = function (request, response) {
           <dt>Name</dt>
           <dd>${escape(licensor.name)}</dd>
           <dt>Jurisdiction</dt>
-          <dd>
-            ${escape(jurisdiction.name)},
-            ${escape(jurisdiction.countryName)}
-          </dd>
+          <dd>${renderJurisdiction(licensor.jurisdiction)}</dd>
           <dt>Public Signing Key</dt>
           <dd>
             <pre><code>${
diff --git a/routes/partials/jurisdiction.js b/routes/partials/jurisdiction.js
@@ -0,0 +1,7 @@
+var escape = require('../escape')
+var iso31662 = require('iso-3166-2')
+
+module.exports = function (code) {
+  var data = iso31662.subdivision(code)
+  return escape(data.name + ', ' + data.countryName)
+}
diff --git a/routes/pay.js b/routes/pay.js
@@ -33,6 +33,7 @@ var readJSONFile = require('../data/read-json-file')
 var recordAcceptance = require('../data/record-acceptance')
 var recordSignature = require('../data/record-signature')
 var relicenseAgreement = require('../forms/relicense-agreement')
+var renderJurisdiction = require('./partials/jurisdiction')
 var runParallel = require('run-parallel')
 var runSeries = require('run-series')
 var runWaterfall = require('run-waterfall')
@@ -115,8 +116,8 @@ ${head(action)}
   <h2>Licensee</h2>
   <dl>
     <dt>Legal Name</dt><dd>${escape(order.licensee)}</dd>
-    <dt>Jurisdiction</dt><dd>[${escape(order.jurisdiction)}]</dd>
-    <dt>E-Mail</dt><dd>[${escape(order.email)}]</dd>
+    <dt>Jurisdiction</dt><dd>${renderJurisdiction(order.jurisdiction)}</dd>
+    <dt>E-Mail</dt><dd>${escape(order.email)}</dd>
   </dl>
 </section>
 <section>
@@ -142,7 +143,7 @@ ${head(action)}
             </p>
             <p>
               ${escape(project.licensor.name)}
-              [${escape(project.licensor.jurisdiction)}]
+              (${renderJurisdiction(project.licensor.jurisdiction)})
             </p>
             <p>
               Terms:
@@ -177,8 +178,8 @@ ${head(action)}
   <h2>Sponsor</h2>
   <dl>
     <dt>Legal Name</dt><dd>${escape(order.sponsor)}</dd>
-    <dt>Jurisdiction</dt><dd>[${escape(order.jurisdiction)}]</dd>
-    <dt>E-Mail</dt><dd>[${escape(order.email)}]</dd>
+    <dt>Jurisdiction</dt><dd>${renderJurisdiction(order.jurisdiction)}</dd>
+    <dt>E-Mail</dt><dd>${escape(order.email)}</dd>
   </dl>
 </section>
 <section>
@@ -202,7 +203,7 @@ ${head(action)}
           </p>
           <p>
             ${escape(project.licensor.name)}
-            [${escape(project.licensor.jurisdiction)}]
+            (${renderJurisdiction(project.licensor.jurisdiction)})
           </p>
           <p>
             Terms: <a
