From cd5a61e06f396c3c8ac179270472dac662662886 Mon Sep 17 00:00:00 2001
From: Mat Kelly <me@matkelly.com>
Date: Mon, 27 Aug 2018 12:17:58 -0400
Subject: [PATCH 1/5] Fix plurality of mementos and resources on main replay
 page. Closes #534

---
 ipwb/assets/webui.js      | 4 ----
 ipwb/replay.py            | 6 +++++-
 ipwb/templates/index.html | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ipwb/assets/webui.js b/ipwb/assets/webui.js
index 6ad4c841..4a8c70f7 100644
--- a/ipwb/assets/webui.js
+++ b/ipwb/assets/webui.js
@@ -131,12 +131,8 @@ function setShowURIsVisibility () {
 }
 
 function setPlurality () {
-  const urimCount = document.getElementById('memCountInt').innerHTML
   const htmlFilesPlurality = document.getElementById('htmlPages').innerHTML
 
-  if (urimCount === '1') {
-    document.getElementById('plural').classList.add('hidden')
-  }
   if (htmlFilesPlurality === '1') {
     document.getElementById('htmlPagesPlurality').classList.add('hidden')
   }
diff --git a/ipwb/replay.py b/ipwb/replay.py
index 52859d74..a996594a 100755
--- a/ipwb/replay.py
+++ b/ipwb/replay.py
@@ -552,9 +552,13 @@ def showAdmin():
 def showLandingPage():
     iFile = ipwbUtils.getIPWBReplayIndexPath()
     (mCount, uniqueURIRs) = retrieveMemCount(iFile)
+    urimPlurality = 'memento' if mCount == 1 else 'mementos'
+    urirPlurality = 'resource' if uniqueURIRs == 1 else 'resources'
     summary = {'indexPath': iFile,
                'urimCount': mCount,
-               'urirCount': uniqueURIRs}
+               'urirCount': uniqueURIRs,
+               'urimPlurality': urimPlurality,
+               'urirPlurality': urirPlurality}
     uris = getURIsAndDatetimesInCDXJ(iFile)
     return render_template('index.html', summary=summary, uris=uris)
 
diff --git a/ipwb/templates/index.html b/ipwb/templates/index.html
index b4f94055..a975a2da 100644
--- a/ipwb/templates/index.html
+++ b/ipwb/templates/index.html
@@ -49,7 +49,7 @@ <h1><img src="/ipwbassets/logo.png" alt="ipwb" /></h1>
   </footer>
     <div id="uris" class="hidden">
     <h3 id="urisHeader"><abbr title="Uniform Resource Identifiers">URIs</abbr> locally available</h3>
-    <h4 id="htmlCountHeader">{{ summary.urimCount }} mementos of {{ summary.urirCount }} resources with <span id="htmlPages">0</span>
+    <h4 id="htmlCountHeader">{{ summary.urimCount }} {{ summary.urimPlurality }} of {{ summary.urirCount }} {{ summary.urirPlurality }} with <span id="htmlPages">0</span>
         HTML page<span id="htmlPagesPlurality">s</span> listed
         <button id="showEmbeddedURI" data-defaultValue="Show All" data-activatedValue="Show Only HTML Pages">Show All</button></h4>
     <ul id="uriList"></ul>

From 6a3237459b0d7836d85dd80dce33fb42975d81ba Mon Sep 17 00:00:00 2001
From: Mat Kelly <me@matkelly.com>
Date: Mon, 27 Aug 2018 14:23:44 -0400
Subject: [PATCH 2/5] Add context processor for plurality

---
 ipwb/replay.py            | 18 +++++++++++++-----
 ipwb/templates/index.html |  6 ++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ipwb/replay.py b/ipwb/replay.py
index a996594a..3d72c293 100755
--- a/ipwb/replay.py
+++ b/ipwb/replay.py
@@ -548,17 +548,25 @@ def showAdmin():
                            summary=summary)
 
 
+@app.context_processor
+def pluralityProcessor():
+    def correctPlural(word, count):
+        if count == 1:
+            return word
+        addS = word in ['memento', 'resource']
+        addEs = word in []
+        return word + 's' if addS else word + 'es'
+    return dict(correctPlural=correctPlural)
+
+
 @app.route('/', strict_slashes=False)
 def showLandingPage():
     iFile = ipwbUtils.getIPWBReplayIndexPath()
     (mCount, uniqueURIRs) = retrieveMemCount(iFile)
-    urimPlurality = 'memento' if mCount == 1 else 'mementos'
-    urirPlurality = 'resource' if uniqueURIRs == 1 else 'resources'
+
     summary = {'indexPath': iFile,
                'urimCount': mCount,
-               'urirCount': uniqueURIRs,
-               'urimPlurality': urimPlurality,
-               'urirPlurality': urirPlurality}
+               'urirCount': uniqueURIRs}
     uris = getURIsAndDatetimesInCDXJ(iFile)
     return render_template('index.html', summary=summary, uris=uris)
 
diff --git a/ipwb/templates/index.html b/ipwb/templates/index.html
index a975a2da..af1de9a2 100644
--- a/ipwb/templates/index.html
+++ b/ipwb/templates/index.html
@@ -49,8 +49,10 @@ <h1><img src="/ipwbassets/logo.png" alt="ipwb" /></h1>
   </footer>
     <div id="uris" class="hidden">
     <h3 id="urisHeader"><abbr title="Uniform Resource Identifiers">URIs</abbr> locally available</h3>
-    <h4 id="htmlCountHeader">{{ summary.urimCount }} {{ summary.urimPlurality }} of {{ summary.urirCount }} {{ summary.urirPlurality }} with <span id="htmlPages">0</span>
-        HTML page<span id="htmlPagesPlurality">s</span> listed
+    <h4 id="htmlCountHeader">
+        {{ summary.urimCount }} {{ correctPlural('memento', summary.urimCount) }} of
+        {{ summary.urirCount }} {{ correctPlural('resource', summary.urirCount) }} with
+        <span id="htmlPages">0</span> HTML page<span id="htmlPagesPlurality">s</span> listed
         <button id="showEmbeddedURI" data-defaultValue="Show All" data-activatedValue="Show Only HTML Pages">Show All</button></h4>
     <ul id="uriList"></ul>
   </div>

From 81c14ebb73d00f5cd7a74019e4e787d05850accf Mon Sep 17 00:00:00 2001
From: Mat Kelly <me@matkelly.com>
Date: Mon, 27 Aug 2018 14:31:14 -0400
Subject: [PATCH 3/5] Rv for Sawood's lambda plurality function.

---
 ipwb/replay.py            | 18 +++++-------------
 ipwb/templates/index.html |  6 ++----
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/ipwb/replay.py b/ipwb/replay.py
index 3d72c293..a996594a 100755
--- a/ipwb/replay.py
+++ b/ipwb/replay.py
@@ -548,25 +548,17 @@ def showAdmin():
                            summary=summary)
 
 
-@app.context_processor
-def pluralityProcessor():
-    def correctPlural(word, count):
-        if count == 1:
-            return word
-        addS = word in ['memento', 'resource']
-        addEs = word in []
-        return word + 's' if addS else word + 'es'
-    return dict(correctPlural=correctPlural)
-
-
 @app.route('/', strict_slashes=False)
 def showLandingPage():
     iFile = ipwbUtils.getIPWBReplayIndexPath()
     (mCount, uniqueURIRs) = retrieveMemCount(iFile)
-
+    urimPlurality = 'memento' if mCount == 1 else 'mementos'
+    urirPlurality = 'resource' if uniqueURIRs == 1 else 'resources'
     summary = {'indexPath': iFile,
                'urimCount': mCount,
-               'urirCount': uniqueURIRs}
+               'urirCount': uniqueURIRs,
+               'urimPlurality': urimPlurality,
+               'urirPlurality': urirPlurality}
     uris = getURIsAndDatetimesInCDXJ(iFile)
     return render_template('index.html', summary=summary, uris=uris)
 
diff --git a/ipwb/templates/index.html b/ipwb/templates/index.html
index af1de9a2..a975a2da 100644
--- a/ipwb/templates/index.html
+++ b/ipwb/templates/index.html
@@ -49,10 +49,8 @@ <h1><img src="/ipwbassets/logo.png" alt="ipwb" /></h1>
   </footer>
     <div id="uris" class="hidden">
     <h3 id="urisHeader"><abbr title="Uniform Resource Identifiers">URIs</abbr> locally available</h3>
-    <h4 id="htmlCountHeader">
-        {{ summary.urimCount }} {{ correctPlural('memento', summary.urimCount) }} of
-        {{ summary.urirCount }} {{ correctPlural('resource', summary.urirCount) }} with
-        <span id="htmlPages">0</span> HTML page<span id="htmlPagesPlurality">s</span> listed
+    <h4 id="htmlCountHeader">{{ summary.urimCount }} {{ summary.urimPlurality }} of {{ summary.urirCount }} {{ summary.urirPlurality }} with <span id="htmlPages">0</span>
+        HTML page<span id="htmlPagesPlurality">s</span> listed
         <button id="showEmbeddedURI" data-defaultValue="Show All" data-activatedValue="Show Only HTML Pages">Show All</button></h4>
     <ul id="uriList"></ul>
   </div>

From 10091ed1b760b1c0e7de92a75d6f5bd68895352c Mon Sep 17 00:00:00 2001
From: Sawood Alam <ibnesayeed@gmail.com>
Date: Mon, 27 Aug 2018 14:24:32 -0400
Subject: [PATCH 4/5] Add pluralization context processor for templates

---
 ipwb/replay.py            | 12 +++++++-----
 ipwb/templates/index.html |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ipwb/replay.py b/ipwb/replay.py
index a996594a..556aae07 100755
--- a/ipwb/replay.py
+++ b/ipwb/replay.py
@@ -68,6 +68,12 @@
 IPFS_API = ipfsapi.Client(IPFSAPI_HOST, IPFSAPI_PORT)
 
 
+@app.context_processor
+def formatters():
+    pluralize = lambda x, s, p: "{} {}".format(x, s if x == 1 else p)
+    return dict(pluralize=pluralize)
+
+
 @app.after_request
 def setServerHeader(response):
     response.headers['Server'] = 'InterPlanetary Wayback Replay/' + ipwbVersion
@@ -552,13 +558,9 @@ def showAdmin():
 def showLandingPage():
     iFile = ipwbUtils.getIPWBReplayIndexPath()
     (mCount, uniqueURIRs) = retrieveMemCount(iFile)
-    urimPlurality = 'memento' if mCount == 1 else 'mementos'
-    urirPlurality = 'resource' if uniqueURIRs == 1 else 'resources'
     summary = {'indexPath': iFile,
                'urimCount': mCount,
-               'urirCount': uniqueURIRs,
-               'urimPlurality': urimPlurality,
-               'urirPlurality': urirPlurality}
+               'urirCount': uniqueURIRs}
     uris = getURIsAndDatetimesInCDXJ(iFile)
     return render_template('index.html', summary=summary, uris=uris)
 
diff --git a/ipwb/templates/index.html b/ipwb/templates/index.html
index a975a2da..f4c3a40b 100644
--- a/ipwb/templates/index.html
+++ b/ipwb/templates/index.html
@@ -49,7 +49,7 @@ <h1><img src="/ipwbassets/logo.png" alt="ipwb" /></h1>
   </footer>
     <div id="uris" class="hidden">
     <h3 id="urisHeader"><abbr title="Uniform Resource Identifiers">URIs</abbr> locally available</h3>
-    <h4 id="htmlCountHeader">{{ summary.urimCount }} {{ summary.urimPlurality }} of {{ summary.urirCount }} {{ summary.urirPlurality }} with <span id="htmlPages">0</span>
+    <h4 id="htmlCountHeader">{{ pluralize(summary.urimCount, 'memento', 'mementos') }} of {{ pluralize(summary.urirCount, 'resource', 'resources') }} with <span id="htmlPages">0</span>
         HTML page<span id="htmlPagesPlurality">s</span> listed
         <button id="showEmbeddedURI" data-defaultValue="Show All" data-activatedValue="Show Only HTML Pages">Show All</button></h4>
     <ul id="uriList"></ul>

From e2cfaaa4afd5c3c3ef6c0b4c7bff0fe410559a71 Mon Sep 17 00:00:00 2001
From: Sawood Alam <ibnesayeed@gmail.com>
Date: Mon, 27 Aug 2018 14:45:00 -0400
Subject: [PATCH 5/5] Make lambda inline, fix pycodestyle

---
 ipwb/replay.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ipwb/replay.py b/ipwb/replay.py
index 556aae07..9bc125ab 100755
--- a/ipwb/replay.py
+++ b/ipwb/replay.py
@@ -70,8 +70,7 @@
 
 @app.context_processor
 def formatters():
-    pluralize = lambda x, s, p: "{} {}".format(x, s if x == 1 else p)
-    return dict(pluralize=pluralize)
+    return {'pluralize': lambda x, s, p: "{} {}".format(x, s if x == 1 else p)}
 
 
 @app.after_request