From ba15cbf23c196d0f8f0036e488a67b52b248a6e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bel=C3=A9n=20Curcio?= <curciobelen@gmail.com>
Date: Fri, 12 Oct 2018 14:28:59 -0300
Subject: [PATCH] [next] Pluralization for the comment count (#1983)

* Pluralization comment count

* Adding updated snapshots

* fix: snapshots
---
 .../__snapshots__/editComment.spec.tsx.snap        | 14 +++++++-------
 .../comments/__snapshots__/loadMore.spec.tsx.snap  |  4 ++--
 .../__snapshots__/permalinkView.spec.tsx.snap      |  4 ++--
 .../permalinkViewCommentNotFound.spec.tsx.snap     |  4 ++--
 .../permalinkViewLoadMoreParents.spec.tsx.snap     |  4 ++--
 .../__snapshots__/postComment.spec.tsx.snap        |  6 +++---
 .../__snapshots__/postLocalReply.spec.tsx.snap     |  8 ++++----
 .../comments/__snapshots__/postReply.spec.tsx.snap |  8 ++++----
 .../__snapshots__/renderReplies.spec.tsx.snap      |  2 +-
 .../__snapshots__/renderStream.spec.tsx.snap       |  2 +-
 .../__snapshots__/showAllReplies.spec.tsx.snap     |  4 ++--
 .../__snapshots__/showConversation.spec.tsx.snap   |  4 ++--
 src/locales/en-US/stream.ftl                       |  6 +++++-
 13 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap
index d5426a89a..098a86e06 100644
--- a/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`cancel edit: edit canceled 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
     <li
@@ -474,7 +474,7 @@ exports[`edit a comment: edit form 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
     <li
@@ -977,7 +977,7 @@ exports[`edit a comment: optimistic response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
     <li
@@ -1480,7 +1480,7 @@ exports[`edit a comment: render stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
     <li
@@ -1927,7 +1927,7 @@ exports[`edit a comment: server response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
     <li
@@ -2383,7 +2383,7 @@ exports[`shows expiry message: edit form closed 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
     <li
@@ -2830,7 +2830,7 @@ exports[`shows expiry message: edit time expired 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
     <li
diff --git a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
index 5f318e2bb..23392923f 100644
--- a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`loads more comments 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
@@ -490,7 +490,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
index 0aec18559..0a322ecfc 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders permalink view 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
@@ -669,7 +669,7 @@ exports[`show all comments 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
index fa96a0137..eac6fefd4 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders permalink view with unknown comment 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
@@ -137,7 +137,7 @@ exports[`show all comments 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkViewLoadMoreParents.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewLoadMoreParents.spec.tsx.snap
index d3b65965f..42f3d3044 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkViewLoadMoreParents.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkViewLoadMoreParents.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders permalink view 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
@@ -348,7 +348,7 @@ exports[`views pervious comments 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap
index 5760fd0d6..6d51bfe34 100644
--- a/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`post a comment: optimistic response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨3⁩ Comments
+        ⁨3⁩ ⁨Comments⁩
       </button>
     </li>
     <li
@@ -561,7 +561,7 @@ exports[`post a comment: server response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨3⁩ Comments
+        ⁨3⁩ ⁨Comments⁩
       </button>
     </li>
     <li
@@ -1085,7 +1085,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
     <li
diff --git a/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap
index 92fc9bc6f..10ab06efe 100644
--- a/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`post a reply: open reply form 1`] = `
         role="tab"
         type="button"
       >
-        ⁨1⁩ Comments
+        ⁨1⁩ ⁨Comment⁩
       </button>
     </li>
     <li
@@ -1003,7 +1003,7 @@ exports[`post a reply: optimistic response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨1⁩ Comments
+        ⁨1⁩ ⁨Comment⁩
       </button>
     </li>
     <li
@@ -2072,7 +2072,7 @@ exports[`post a reply: server response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨1⁩ Comments
+        ⁨1⁩ ⁨Comment⁩
       </button>
     </li>
     <li
@@ -3004,7 +3004,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨1⁩ Comments
+        ⁨1⁩ ⁨Comment⁩
       </button>
     </li>
     <li
diff --git a/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap
index 0504e7650..12c5afd2a 100644
--- a/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`post a reply: open reply form 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
     <li
@@ -585,7 +585,7 @@ exports[`post a reply: optimistic response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨3⁩ Comments
+        ⁨3⁩ ⁨Comments⁩
       </button>
     </li>
     <li
@@ -1252,7 +1252,7 @@ exports[`post a reply: server response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨3⁩ Comments
+        ⁨3⁩ ⁨Comments⁩
       </button>
     </li>
     <li
@@ -1782,7 +1782,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
     <li
diff --git a/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
index 5dd201997..08b120943 100644
--- a/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
index 2a9640831..f7e09c91a 100644
--- a/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
index dd986d07c..5bc55cc6b 100644
--- a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
@@ -427,7 +427,7 @@ exports[`show all replies 1`] = `
         role="tab"
         type="button"
       >
-        ⁨2⁩ Comments
+        ⁨2⁩ ⁨Comments⁩
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/showConversation.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/showConversation.spec.tsx.snap
index 22cc8c869..bfd55a363 100644
--- a/src/core/client/stream/test/comments/__snapshots__/showConversation.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/showConversation.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨1⁩ Comments
+        ⁨1⁩ ⁨Comment⁩
       </button>
     </li>
   </ul>
@@ -815,7 +815,7 @@ exports[`shows conversation 1`] = `
         role="tab"
         type="button"
       >
-        ⁨1⁩ Comments
+        ⁨1⁩ ⁨Comment⁩
       </button>
     </li>
   </ul>
diff --git a/src/locales/en-US/stream.ftl b/src/locales/en-US/stream.ftl
index 7797ad1b0..04d414abb 100644
--- a/src/locales/en-US/stream.ftl
+++ b/src/locales/en-US/stream.ftl
@@ -12,7 +12,11 @@ general-userBoxAuthenticated-signedInAs =
 general-userBoxAuthenticated-notYou =
   Not you? <button>Sign Out</button>
 
-general-app-commentsTab = {$commentCount} Comments
+general-app-commentsTab = {$commentCount} { $commentCount ->
+        [0] Comments
+        [1] Comment
+        *[other] Comments
+    }
 general-app-myProfileTab = My Profile
 
 ## Comments Tab