From 27b62df48bbe4053dccc2da0d2c9004393c0e0ae Mon Sep 17 00:00:00 2001
From: Vikhyat Korrapati <vikhyatk@gmail.com>
Date: Fri, 18 Apr 2014 09:19:10 +0530
Subject: [PATCH] Change "awarded" to "granted".
---
.../discourse/templates/badges/index.js.handlebars | 2 +-
.../discourse/templates/badges/show.js.handlebars | 2 +-
app/assets/stylesheets/desktop/user-badges.scss | 1 +
config/locales/client.en.yml | 6 +++---
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/assets/javascripts/discourse/templates/badges/index.js.handlebars b/app/assets/javascripts/discourse/templates/badges/index.js.handlebars
index 39af8480a..2317de8a9 100644
--- a/app/assets/javascripts/discourse/templates/badges/index.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/badges/index.js.handlebars
@@ -6,7 +6,7 @@
<tr>
<td class='badge'>{{user-badge badge=this}}</td>
<td class='description'>{{description}}</td>
- <td class='grant-count'>{{i18n badges.awarded count=grant_count}}</td>
+ <td class='grant-count'>{{i18n badges.granted count=grant_count}}</td>
</tr>
{{/each}}
</table>
diff --git a/app/assets/javascripts/discourse/templates/badges/show.js.handlebars b/app/assets/javascripts/discourse/templates/badges/show.js.handlebars
index 22681594e..3c0a0d84f 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/badges/show.js.handlebars
@@ -9,7 +9,7 @@
<tr>
<td class='badge'>{{user-badge badge=this}}</td>
<td class='description'>{{description}}</td>
- <td class='grant-count'>{{i18n badges.awarded count=grant_count}}</td>
+ <td class='grant-count'>{{i18n badges.granted count=grant_count}}</td>
</tr>
</table>
diff --git a/app/assets/stylesheets/desktop/user-badges.scss b/app/assets/stylesheets/desktop/user-badges.scss
index 2be02acb1..632ccf650 100644
--- a/app/assets/stylesheets/desktop/user-badges.scss
+++ b/app/assets/stylesheets/desktop/user-badges.scss
@@ -63,6 +63,7 @@ table.badges-listing {
td.grant-count {
font-size: 0.8em;
color: $secondary_text_color;
+ text-align: right;
}
td.badge, td.grant-count {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b4f8745c8..11ee52929 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1776,9 +1776,9 @@ en:
more_badges:
one: "+1 More"
other: "+%{count} More"
- awarded:
- one: "1 awarded"
- other: "%{count} awarded"
+ granted:
+ one: "1 granted"
+ other: "%{count} granted"
select_badge_for_title: Select a badge to use as your title
example_badge:
name: Example Badge