From 8c7519df8630c4ebca4f97129a0c3e2cf58aeb34 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 17 Jun 2013 15:37:46 +1000
Subject: [PATCH] missing pluralization
---
.../discourse/templates/featured_topics.js.handlebars | 4 ++--
.../templates/list/topic_list_item.js.handlebars | 4 ++--
.../discourse/templates/suggested_topic.js.handlebars | 4 ++--
config/locales/client.en.yml | 8 ++++++--
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars b/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars
index 818978286..8b6188320 100644
--- a/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars
@@ -29,10 +29,10 @@
{{{topicLink this}}}
{{#if unread}}
- <a href="{{unbound lastReadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts unread="unread"}}'>{{unbound unread}}</a>
+ <a href="{{unbound lastReadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unbound unread}}</a>
{{/if}}
{{#if new_posts}}
- <a href="{{unbound lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts new_posts="new_posts"}}'>{{unbound new_posts}}</a>
+ <a href="{{unbound lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{unbound new_posts}}</a>
{{/if}}
{{#if unseen}}
<a href="{{unbound lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
index 1e5f0a302..b85d8db51 100644
--- a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
@@ -19,10 +19,10 @@
{{topicStatus topic=this}}
{{{topicLink this}}}
{{#if unread}}
- <a href="{{lastReadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts unread="unread"}}'>{{unread}}</a>
+ <a href="{{lastReadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unread}}</a>
{{/if}}
{{#if displayNewPosts}}
- <a href="{{lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts new_posts="displayNewPosts"}}'>{{displayNewPosts}}</a>
+ <a href="{{lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="displayNewPosts"}}'>{{displayNewPosts}}</a>
{{/if}}
{{#if unseen}}
<a href="{{lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
diff --git a/app/assets/javascripts/discourse/templates/suggested_topic.js.handlebars b/app/assets/javascripts/discourse/templates/suggested_topic.js.handlebars
index 25e5672bc..50138c885 100644
--- a/app/assets/javascripts/discourse/templates/suggested_topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/suggested_topic.js.handlebars
@@ -3,10 +3,10 @@
<td class='main-link'>
<a class='title' href="{{unbound lastReadUrl}}">{{{unbound fancy_title}}}</a>
{{#if unread}}
- <a href="{{unbound lastReadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts unread="unread"}}'>{{unbound unread}}</a>
+ <a href="{{unbound lastReadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unbound unread}}</a>
{{/if}}
{{#if new_posts}}
- <a href="{{unbound lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts new_posts="new_posts"}}'>{{unbound new_posts}}</a>
+ <a href="{{unbound lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{unbound new_posts}}</a>
{{/if}}
{{#if unseen}}
<a href="{{lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 54169cc20..b926db8cb 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -549,8 +549,12 @@ en:
not_found:
title: "Topic not found"
description: "Sorry, we couldn't find that topic. Perhaps it was removed by a moderator?"
- unread_posts: "you have {{unread}} unread old posts in this topic"
- new_posts: "there are {{new_posts}} new posts in this topic since you last read it"
+ unread_posts:
+ one: "you have 1 unread old post in this topic"
+ other: "you have {{count}} unread old posts in this topic"
+ new_posts:
+ one: "there is 1 new posts in this topic since you last read it"
+ other: "there are {{count}} new posts in this topic since you last read it"
likes:
one: "there is 1 like in this topic"