From bb801f2bbd9f26bebca846b71e8947a1951f86a5 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:11:34 -0400
Subject: english translation

---
 templates/badge.html | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'templates/badge.html')

diff --git a/templates/badge.html b/templates/badge.html
index 4ffedfa6..d0906918 100644
--- a/templates/badge.html
+++ b/templates/badge.html
@@ -1,7 +1,9 @@
+<!-- template badge.html -->
 {% extends "base_content.html" %}
+{% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
-{% block title %}{% spaceless %}{{ badge.name }}-奖牌{% endspaceless %}{% endblock %}
+{% block title %}{% spaceless %}{{ badge.name }} - {% trans "Badge" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
         $().ready(function(){
@@ -12,7 +14,7 @@
 {% endblock %}
 {% block content %}
 <div id="main-bar" class="headNormal">
-    奖牌
+	{% trans "Badge" %}
 </div>
 <div id="main-body" style="width:100%;margin-bottom:20px">
     <p>
@@ -21,7 +23,7 @@
     <div>
         {% if badge.awarded_count %}
         <p style="float:left"><span class="count">{{ awards|length|intcomma }}</span>
-        <strong>用户已被授予该奖牌：</strong></p>
+        <strong>{% trans "The users have been awarded with badges:" %}</strong></p>
         {% endif %}
     </div>
     <div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
@@ -32,7 +34,4 @@
 
 </div>
 {% endblock %}
-
-
-
-
+<!-- end template badge.html -->
-- 
cgit v1.2.3-1-g7c22


From 5b45e526c74faf55110ff0afdcba19797d7e0f4d Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:14:09 -0400
Subject: deleted all

---
 templates/badge.html | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 templates/badge.html

(limited to 'templates/badge.html')

diff --git a/templates/badge.html b/templates/badge.html
deleted file mode 100644
index d0906918..00000000
--- a/templates/badge.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- template badge.html -->
-{% extends "base_content.html" %}
-{% load i18n %}
-{% load extra_tags %}
-{% load humanize %}
-{% block title %}{% spaceless %}{{ badge.name }} - {% trans "Badge" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $("#nav_badges").attr('className',"on");
-        });
-         
-        </script>
-{% endblock %}
-{% block content %}
-<div id="main-bar" class="headNormal">
-	{% trans "Badge" %}
-</div>
-<div id="main-body" style="width:100%;margin-bottom:20px">
-    <p>
-        <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a> {{ badge.description }}
-    </p>
-    <div>
-        {% if badge.awarded_count %}
-        <p style="float:left"><span class="count">{{ awards|length|intcomma }}</span>
-        <strong>{% trans "The users have been awarded with badges:" %}</strong></p>
-        {% endif %}
-    </div>
-    <div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
-        {% for award in awards %}
-        <p style="width:185px;float:left"><a href="/users/{{ award.id }}/{{ award.name }}">{{ award.name }}</a> {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}</p>
-        {% endfor %}
-    </div>
-
-</div>
-{% endblock %}
-<!-- end template badge.html -->
-- 
cgit v1.2.3-1-g7c22


From 35b666224a05fbd249b1c51a0a48fb95b246fe9a Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:15:28 -0400
Subject: adding all files again

---
 templates/badge.html | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 templates/badge.html

(limited to 'templates/badge.html')

diff --git a/templates/badge.html b/templates/badge.html
new file mode 100644
index 00000000..d0906918
--- /dev/null
+++ b/templates/badge.html
@@ -0,0 +1,37 @@
+<!-- template badge.html -->
+{% extends "base_content.html" %}
+{% load i18n %}
+{% load extra_tags %}
+{% load humanize %}
+{% block title %}{% spaceless %}{{ badge.name }} - {% trans "Badge" %}{% endspaceless %}{% endblock %}
+{% block forejs %}
+       <script type="text/javascript">
+        $().ready(function(){
+            $("#nav_badges").attr('className',"on");
+        });
+         
+        </script>
+{% endblock %}
+{% block content %}
+<div id="main-bar" class="headNormal">
+	{% trans "Badge" %}
+</div>
+<div id="main-body" style="width:100%;margin-bottom:20px">
+    <p>
+        <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a> {{ badge.description }}
+    </p>
+    <div>
+        {% if badge.awarded_count %}
+        <p style="float:left"><span class="count">{{ awards|length|intcomma }}</span>
+        <strong>{% trans "The users have been awarded with badges:" %}</strong></p>
+        {% endif %}
+    </div>
+    <div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
+        {% for award in awards %}
+        <p style="width:185px;float:left"><a href="/users/{{ award.id }}/{{ award.name }}">{{ award.name }}</a> {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}</p>
+        {% endfor %}
+    </div>
+
+</div>
+{% endblock %}
+<!-- end template badge.html -->
-- 
cgit v1.2.3-1-g7c22


From ef8f66ba6c7a22c277c6315df8040365b5684e6c Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 5 Aug 2009 22:50:08 -0400
Subject: added anonymous posting, per-question subscription and fixes by
 Pothers and some more, see development.log

---
 templates/badge.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/badge.html')

diff --git a/templates/badge.html b/templates/badge.html
index d0906918..029ba0d9 100644
--- a/templates/badge.html
+++ b/templates/badge.html
@@ -1,5 +1,5 @@
-<!-- template badge.html -->
 {% extends "base_content.html" %}
+<!-- template badge.html -->
 {% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
-- 
cgit v1.2.3-1-g7c22