From 67ed6b1e9a16c4800b6bf14bebedeb8177e2f372 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 16 Apr 2015 14:54:24 +1000
Subject: [PATCH] FIX: missing pluralization, change topic card to use replies

---
 .../templates/components/topic-map.hbs        | 14 ++++++-------
 config/locales/client.en.yml                  | 21 ++++++++++++++-----
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.hbs b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
index bf572caa3..11a5a14b6 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-map.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
@@ -15,33 +15,33 @@
     </li>
     <li>
       <a {{bind-attr href="topic.lastPostUrl"}}>
-      <h4>{{i18n 'last_post_lowercase'}}</h4>
+      <h4>{{i18n 'last_reply_lowercase'}}</h4>
       {{avatar details.last_poster imageSize="tiny"}}
       {{format-date topic.last_posted_at}}
       </a>
     </li>
     <li>
-      {{number topic.posts_count}}
-      <h4>{{i18n 'posts_lowercase'}}</h4>
+      {{number topic.replyCount}}
+      <h4>{{i18n 'replies_lowercase' count=topic.replyCount}}</h4>
     </li>
     <li class='secondary'>
       {{number topic.views class=topic.viewsHeat}}
-      <h4>{{i18n 'views_lowercase'}}</h4>
+      <h4>{{i18n 'views_lowercase' count=topic.views}}</h4>
     </li>
     <li class='secondary'>
       {{number topic.participant_count}}
-      <h4>{{i18n 'users_lowercase'}}</h4>
+      <h4>{{i18n 'users_lowercase' count=topic.participant_count}}</h4>
     </li>
     {{#if topic.like_count}}
       <li class='secondary'>
         {{number topic.like_count}}
-        <h4>{{i18n 'likes_lowercase'}}</h4>
+        <h4>{{i18n 'likes_lowercase' count=topic.like_count}}</h4>
       </li>
     {{/if}}
     {{#if details.links.length}}
       <li class='secondary'>
         {{number details.links.length}}
-        <h4>{{i18n 'links_lowercase'}}</h4>
+        <h4>{{i18n 'links_lowercase' count=details.links.length}}</h4>
       </li>
     {{/if}}
     {{#if showPosterAvatar}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 8bcf0d01c..978929bd4 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -123,7 +123,9 @@ en:
     show_more: "show more"
     show_help: "help"
     links: "Links"
-    links_lowercase: "links"
+    links_lowercase:
+      one: "link"
+      other: "links"
     faq: "FAQ"
     guidelines: "Guidelines"
     privacy_policy: "Privacy Policy"
@@ -628,7 +630,10 @@ en:
     mute: Mute
     unmute: Unmute
     last_post: Last post
-    last_post_lowercase: last post
+    last_reply_lowercase: last reply
+    replies_lowercase:
+      one: reply
+      other: replies
 
     summary:
       enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community."
@@ -1497,15 +1502,21 @@ en:
         other {}}
     original_post: "Original Post"
     views: "Views"
-    views_lowercase: "views"
+    views_lowercase:
+      one: "view"
+      other: "views"
     replies: "Replies"
     views_long: "this topic has been viewed {{number}} times"
     activity: "Activity"
     likes: "Likes"
-    likes_lowercase: "likes"
+    likes_lowercase:
+      one: "like"
+      other: "likes"
     likes_long: "there are {{number}} likes in this topic"
     users: "Users"
-    users_lowercase: "users"
+    users_lowercase:
+      one: "user"
+      other: "users"
     category_title: "Category"
     history: "History"
     changed_by: "by {{author}}"