IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 11:48:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change "awarded" to "granted".

Browse Source
This commit is contained in:
Vikhyat Korrapati 2014-04-18 09:19:10 +05:30
parent e6eb16ee73
commit 27b62df48b
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/badges/index.js.handlebars
View File

@ -6,7 +6,7 @@
<tr> <tr>
<td class='badge'>{{user-badge badge=this}}</td> <td class='badge'>{{user-badge badge=this}}</td>
<td class='description'>{{description}}</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> </tr>
{{/each}} {{/each}}
</table> </table>

2
app/assets/javascripts/discourse/templates/badges/show.js.handlebars
View File

@ -9,7 +9,7 @@
<tr> <tr>
<td class='badge'>{{user-badge badge=this}}</td> <td class='badge'>{{user-badge badge=this}}</td>
<td class='description'>{{description}}</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> </tr>
</table> </table>

1
app/assets/stylesheets/desktop/user-badges.scss
View File

@ -63,6 +63,7 @@ table.badges-listing {
td.grant-count { td.grant-count {
font-size: 0.8em; font-size: 0.8em;
color: $secondary_text_color; color: $secondary_text_color;
text-align: right;
} }
td.badge, td.grant-count { td.badge, td.grant-count {

6
config/locales/client.en.yml
View File

@ -1776,9 +1776,9 @@ en:
more_badges: more_badges:
one: "+1 More" one: "+1 More"
other: "+%{count} More" other: "+%{count} More"
awarded: granted:
one: "1 awarded" one: "1 granted"
other: "%{count} awarded" other: "%{count} granted"
select_badge_for_title: Select a badge to use as your title select_badge_for_title: Select a badge to use as your title
example_badge: example_badge:
name: Example Badge name: Example Badge