Fix plural/singular name in search. Remove duplicated plugin closes #83…

…, closes #84
cdapio · Apr 19, 2019 · efe3ade · efe3ade
1 parent 441925e
commit efe3ade
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/data/en/plugins_list.json b/data/en/plugins_list.json
diff --git a/layouts/plugins/single.html b/layouts/plugins/single.html
@@ -60,7 +60,7 @@
     <div class="row">
       <div class="col-12">
         <div class="plugins__quantity-wrapper" style="display: none">
-          <span class="plugins__quantity"></span>&nbsp;plugins displayed
+          <span class="plugins__quantity"></span>&nbsp;displayed
         </div>
       </div>
     </div>

diff --git a/layouts/videos/single.html b/layouts/videos/single.html
@@ -48,7 +48,7 @@
     <div class="row">
       <div class="col-12">
         <div class="plugins__quantity-wrapper" style="display: none">
-          <span class="plugins__quantity"></span>&nbsp;videos displayed
+          <span class="plugins__quantity"></span>&nbsp;displayed
         </div>
       </div>
     </div>

diff --git a/themes/cdap/assets/js/base.js b/themes/cdap/assets/js/base.js
@@ -22,6 +22,8 @@ const showTeamButton = $('#showTeamBtn');
 const heroDescription = $('#heroDescription');
 const hero = $('#hero');
 const heroTeam = $('#heroTeam');
+let singularName;
+let pluralName
 
 $(document).ready(() => {
     if (window.location.hash === "#premises") {
@@ -69,9 +71,10 @@ function displayQuantityInformation(items) {
   if (searchResult !== null && quantityWrapper !== null) {
     searchResult.style.display = items.length > 0 ? 'none' : '';
     quantityWrapper.style.display = items.length > 0 ? '' : 'none';
+    const entityName = items.length > 1 ? pluralName : singularName;
 
     if (items.length !== 0) {
-      quantity.innerHTML = items.length;
+      quantity.innerHTML = items.length + ' ' + entityName;
     }
   }
 }
@@ -241,9 +244,13 @@ function searchVideos() {
 }
 
 if (window.location.href.match('plugins')) {
+  singularName = 'plugin';
+  pluralName = 'plugins';
   displayQuantityInformation(plugins);
 }
 
 if (window.location.href.match('videos')) {
+  singularName = 'video';
+  pluralName = 'videos';
   displayQuantityInformation(videosByDisplayShow);
 }