From 84e6c390187480debc3927de52b0a8072beda0a9 Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Fri, 3 Mar 2017 15:12:55 +0200
Subject: [PATCH 1/8] Remove APIs count from Filtered By template

---
 api_filter/client/filtered_by/filtered_by.html | 5 -----
 api_filter/client/filtered_by/filtered_by.js   | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/api_filter/client/filtered_by/filtered_by.html b/api_filter/client/filtered_by/filtered_by.html
index 7de7b9e8fa..f3196ef966 100644
--- a/api_filter/client/filtered_by/filtered_by.html
+++ b/api_filter/client/filtered_by/filtered_by.html
@@ -1,11 +1,6 @@
 <template name="apiFilteredBy">
   {{# if selectedOption }}
     <span>
-      {{# if showApisCount }}
-        <strong>
-          {{_ 'apiFilteredBy_text.apiCount' count=apisCount }}&nbsp;
-        </strong>
-      {{/ if }}
       <i>
         {{_ 'apiFilteredBy_text_filteredBy' tag=selectedOption }}
       </i>
diff --git a/api_filter/client/filtered_by/filtered_by.js b/api_filter/client/filtered_by/filtered_by.js
index 5805f9a116..a59ac45a7b 100644
--- a/api_filter/client/filtered_by/filtered_by.js
+++ b/api_filter/client/filtered_by/filtered_by.js
@@ -29,11 +29,6 @@ Template.apiFilteredBy.helpers({
 
     return instance.selectedOption.get();
   },
-  showApisCount () {
-    const apisCount = Template.instance().data.apisCount;
-    // Return true if apisCount was set
-    return apisCount > -1;
-  },
 });
 
 Template.apiFilteredBy.events({

From 610b77423dddb8879f589d7f6689b5e92dc70dd4 Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Fri, 3 Mar 2017 15:40:40 +0200
Subject: [PATCH 2/8] Pluralize apisCount strings; Add apiCatalog apisCount

---
 core/lib/i18n/en.i18n.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index 1cdb80ac38..2e82bb668b 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -60,6 +60,8 @@
   "apiBacklogItems_priorityText_None": "None",
   "apiCard_labelText_private": "private",
   "apiCard_tooltipTitle_averageRating": "Average Rating",
+  "apiCatalog_apisCount": "(__count__ api)",
+  "apiCatalog_apisCount_plural": "(__count__ apis)",
   "apiSettingsDelete_deleteButton": "Delete",
   "apiDetails_baseUrl_headingText": "API URL",
   "apiDetails_description_headingText": "Description",
@@ -439,7 +441,8 @@
   "organizationProfileHeader_editButton_text": "Edit",
   "organizationProfileHeader_tabs_apis": "APIs",
   "organizationProfileHeader_tabs_settings": "Settings",
-  "organizationProfile_smallText_apisCount": "(%s apis)",
+  "organizationProfile_smallText_apisCount": "(__count__ api)",
+  "organizationProfile_smallText_apisCount_plural": "(__count__ apis)",
   "organizationProfile_buttonText_connectApi": "Connect API to organization",
   "organizationProfile_buttonText_clear": "Clear all",
   "organizationProfile_text_error": "Connection button doesn't work. Please inform administrator about the problem",

From 5ebbe36de2c0786dfbd0a96deb64a39dfb87cf1e Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Fri, 3 Mar 2017 15:40:46 +0200
Subject: [PATCH 3/8]

---
 api_catalog/client/api_catalog.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/api_catalog/client/api_catalog.html b/api_catalog/client/api_catalog.html
index 2586e29bbe..0778bab88e 100644
--- a/api_catalog/client/api_catalog.html
+++ b/api_catalog/client/api_catalog.html
@@ -1,7 +1,10 @@
 <template name="apiCatalog">
   <div class="container">
     <h1 class="page-header">
-      {{_ "catalogue_Title" }}
+      {{_ "catalogue_Title" }}&nbsp;
+      <small>
+        {{_ 'apiCatalog_apisCount' count=apisCount }}
+      </small>
     </h1>
     {{> apiCatalogToolbar apis=apis }}
 

From e4970347850233643f7c601d66ad64dc1632d7ce Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Fri, 3 Mar 2017 15:41:03 +0200
Subject: [PATCH 4/8] Pass in named count for pluralization

---
 organizations/client/profile/apis/show_apis/show_apis.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/organizations/client/profile/apis/show_apis/show_apis.html b/organizations/client/profile/apis/show_apis/show_apis.html
index a9ee8e359e..230af8c885 100644
--- a/organizations/client/profile/apis/show_apis/show_apis.html
+++ b/organizations/client/profile/apis/show_apis/show_apis.html
@@ -4,7 +4,7 @@
     <h3 class="apis-block-title">
       {{_ 'organizationProfile_bigText_apisCount'  }}
       <small>
-        {{_ 'organizationProfile_smallText_apisCount' apis.length }}
+        {{_ 'organizationProfile_smallText_apisCount' count=apis.length }}
       </small>
     </h3>
     {{> apiFilteredBy }}

From f2239d30071c8d24eee6deeea8615b13a850b7b7 Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Fri, 3 Mar 2017 15:41:44 +0200
Subject: [PATCH 5/8] Capitalize 'Filtered by' text

---
 core/lib/i18n/en.i18n.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index 2e82bb668b..f07f4007a0 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -94,7 +94,7 @@
     "apiCount": " __count__ API",
     "apiCount_plural": "__count__ APIs"
   },
-  "apiFilteredBy_text_filteredBy": "filtered by \"__tag__\"",
+  "apiFilteredBy_text_filteredBy": "Filtered by \"__tag__\"",
   "apiFilteredBy_buttonText_clear": "Clear all",
   "apisFilterForm_buttonText_filter": "Filter",
   "apisFilterForm_buttonText_clear": "Clear",

From 94aacf8955d84466f1039b28c4b5e073bec2b8de Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Fri, 3 Mar 2017 15:42:06 +0200
Subject: [PATCH 6/8] Clean up unused string

---
 core/lib/i18n/en.i18n.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index f07f4007a0..24a975af8d 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -446,7 +446,6 @@
   "organizationProfile_buttonText_connectApi": "Connect API to organization",
   "organizationProfile_buttonText_clear": "Clear all",
   "organizationProfile_text_error": "Connection button doesn't work. Please inform administrator about the problem",
-  "organizationProfile_text_filteredBy": "Filtered by",
   "organizationRemoveManagers_cancelButton": "Cancel",
   "organizationRemoveManagers_description": "Are you sure you want to remove this user as a manager?",
   "organizationRemoveManagers_removeButton": "Remove",

From 24d63f09983d37bd639b7341e0483ef32236231e Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Fri, 3 Mar 2017 15:44:27 +0200
Subject: [PATCH 7/8] Remove unneeded space

---
 api_catalog/client/api_catalog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api_catalog/client/api_catalog.html b/api_catalog/client/api_catalog.html
index 0778bab88e..ebe637d4de 100644
--- a/api_catalog/client/api_catalog.html
+++ b/api_catalog/client/api_catalog.html
@@ -1,7 +1,7 @@
 <template name="apiCatalog">
   <div class="container">
     <h1 class="page-header">
-      {{_ "catalogue_Title" }}&nbsp;
+      {{_ "catalogue_Title" }}
       <small>
         {{_ 'apiCatalog_apisCount' count=apisCount }}
       </small>

From 0b7494861b3258a2c1f2ff719554b87736031120 Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Fri, 3 Mar 2017 15:48:50 +0200
Subject: [PATCH 8/8] Ensure apisCount exists before rendering

---
 api_catalog/client/api_catalog.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api_catalog/client/api_catalog.html b/api_catalog/client/api_catalog.html
index ebe637d4de..caa577fef9 100644
--- a/api_catalog/client/api_catalog.html
+++ b/api_catalog/client/api_catalog.html
@@ -2,9 +2,11 @@
   <div class="container">
     <h1 class="page-header">
       {{_ "catalogue_Title" }}
+      {{# if apisCount }}
       <small>
         {{_ 'apiCatalog_apisCount' count=apisCount }}
       </small>
+      {{/ if }}
     </h1>
     {{> apiCatalogToolbar apis=apis }}