From bc2e7dd954b692984f96be8c98fcd2b6737e32fc Mon Sep 17 00:00:00 2001
From: sailingcai <sailingcai@gmail.com>
Date: Wed, 14 Oct 2009 23:11:41 +0800
Subject: 1. update var setting in blocktrans

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

diff --git a/templates/user_stats.html b/templates/user_stats.html
index 432a5b34..c324ff48 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -40,7 +40,7 @@
                 </a>
                 <div class="answer-link">
                     <a href="/questions/{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> {% if answered_question.comment_count %}<span 
-					title="{% blocktrans %}the answer has been commented {{ answered_question.comment_count }} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %}
+					title="{% blocktrans with answered_question.comment_count as count %}the answer has been commented {{count}} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %}
                 </div>
             </div>
             {% endfor %}
-- 
cgit v1.2.3-1-g7c22


From 5d7cc5c76655e504cf79832acc418d994104c40b Mon Sep 17 00:00:00 2001
From: Mike Chen <mike@vm-ubuntu.(none)>
Date: Thu, 15 Oct 2009 00:27:04 +0800
Subject: update INSTALL_

---
 .gitignore |  2 ++
 INSTALL    | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 05a341b0..975f2e73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 *.swp
 nbproject
 settings_local.py
+log
+*.log
diff --git a/INSTALL b/INSTALL
index 35683147..0c5e76dc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,9 +1,16 @@
 PRE-REQUIREMENTS:
 -----------------------------------------------
-1. Python2.5, MySQL, Django v1.0+
+0. We recommend you to use python-setuptools to install pre-requirement libraries.
+If you haven't installed it, please try to install it first.
+e.g, sudo apt-get install python-setuptools
+
+1. Python2.5/2.6, MySQL, Django v1.0/1.1
+Make sure mysql for python provider has been installed.
+sudo easy_install mysql-python
 
 2. Python-openid v2.2
 http://openidenabled.com/python-openid/
+sudo easy_install python-openid
 
 3. django-authopenid(Included in project already)
 http://code.google.com/p/django-authopenid/
@@ -11,21 +18,29 @@ http://code.google.com/p/django-authopenid/
 4. html5lib
 http://code.google.com/p/html5lib/
 Used for HTML sanitizer
+sudo easy_install html5lib
 
 5. Markdown2
 http://code.google.com/p/python-markdown2/
+sudo easy_install markdown2
 
 6. Django Debug Toolbar
 http://github.com/robhudson/django-debug-toolbar/tree/master
 
 INSTALL STEPS:
 -----------------------------------------------
+0. Make sure you have all above python libraries installed.
+
 1. Copy settings_local.py.dist to settings_local.py and 
 update all your settings. Check settings.py and update 
 it as well if necessory.
 
 2. Prepare your database by using the same database/account 
 configuration from above.
+e.g,
+create database cnprog DEFAULT CHARACTER SET UTF8 COLLATE utf8_general_ci;
+grant all on cnprog.* to 'cnprog'@'localhost';
+And then run "python manage.py syncdb" to synchronize your database.
 
 3. Run "python manager.py runserver" to startup django 
 development environment.
-- 
cgit v1.2.3-1-g7c22