Merge branch 'master' into experimental

5 files changed, 46 insertions, 47 deletions

diff --git a/forum/models.py b/forum/models.py
index 2df378f7..842121ac 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -186,6 +186,9 @@ class Question(models.Model):
         """Creates a list of Tag names from the ``tagnames`` attribute."""
         return [name for name in self.tagnames.split(u' ')]
 
+    def tagname_meta_generator(self):
+        return ','.join([str(tag) for tag in self.tagname_list()])
+
     def get_absolute_url(self):
         return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-'))
 
diff --git a/settings.py b/settings.py
index 5947617e..fcfdb548 100644
--- a/settings.py
+++ b/settings.py
@@ -17,27 +17,8 @@ ADMINS = (
 )
 MANAGERS = ADMINS
 
-#email server settings (moved to settings_local)
-#SERVER_EMAIL = ''
-#DEFAULT_FROM_EMAIL = 'team@cnprog.com'
-#EMAIL_HOST_USER = ''
-#EMAIL_HOST_PASSWORD = ''
-#EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
-#EMAIL_HOST='smtp.gmail.com'
-#EMAIL_PORT='587'
-#EMAIL_USE_TLS=True
-
-#LOCALIZATIONS (Moved to settings_local)
-#TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
-# LANGUAGE_CODE = 'en-us'
 SITE_ID = 1
 
-#OTHER SETTINGS (Moved to settings_local)
-#APP_TITLE = u'CNProg.com 程序员问答社区'
-#APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
-#APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
-#APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
-#APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
 ADMIN_MEDIA_PREFIX = '/admin/media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 # List of callables that know how to import templates from various sources.
@@ -97,13 +78,3 @@ INSTALLED_APPS = (
 
 # User settings
 from settings_local import *
-
-#Moved to settings_local
-#USE_I18N = True
-#LANGUAGE_CODE = 'en'
-#EMAIL_VALIDATION = 'off'
-#MIN_USERNAME_LENGTH = 1
-#EMAIL_UNIQUE = False
-#APP_URL = 'http://server.com' #used by email notif system and RSS
-#GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
-#GOOGLE_ANALYTICS_KEY = ''
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 2c8f939d..d6273070 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -1,25 +1,47 @@
-SITE_SRC_ROOT = '/Users/sailing/Development/cnprog_beta2'
+# encoding:utf-8
+import os.path
+
+SITE_SRC_ROOT = os.path.dirname(__file__) 
+LOG_FILENAME = 'django.lanai.log'
 
 #for logging
 import logging
-LOG_FILENAME = '/Users/sailing/Development/cnprog_beta2/django.lanai.log'
-logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,)
-
+logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
 
-#Database configuration 
-DATABASE_ENGINE = 'mysql'      
-DATABASE_HOST = ''            
-DATABASE_PORT = ''          
-DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'root'               # Not used with sqlite3.
+DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
+DATABASE_ENGINE = ''  #mysql, etc
+
+#Moved from settings.py for better organization. (please check it up to clean up settings.py)
+
+#email server settings
+SERVER_EMAIL = ''
+DEFAULT_FROM_EMAIL = 'team@cnprog.com'
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
+EMAIL_HOST='smtp.gmail.com'
+EMAIL_PORT='587'
+EMAIL_USE_TLS=True
+
+#LOCALIZATIONS
+TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
+# LANGUAGE_CODE = 'en-us'
 
+#OTHER SETTINGS
+APP_TITLE = u'CNProg.com 程序员问答社区'
+APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
+APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
+APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
+APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
 
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = '/Users/sailing/Development/cnprog_beta2/templates/upfiles/'
+USE_I18N = True
+LANGUAGE_CODE = 'en'
+EMAIL_VALIDATION = 'off'
+MIN_USERNAME_LENGTH = 1
+EMAIL_UNIQUE = False
+APP_URL = 'http://server.com' #used by email notif system and RSS
+GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
+GOOGLE_ANALYTICS_KEY = ''
 
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = 'http://127.0.0.1:8000/upfiles/'
diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index 96f755bf..848ad59e 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -100,7 +100,7 @@ var i18nEs = {
 	'anonymous users cannot flag offensive posts':'usuarios anónimos no pueden marcar publicaciones como ofensivas',
 	'cannot flag message as offensive twice':'no puede marcar mensaje como ofensivo dos veces',
 	'flag offensive cap exhausted':'cuota para marcar ofensivas ha sido excedida',
-	'need >15 points to report spam':"necesita >15 puntos para reportar spam,
+	'need >15 points to report spam':"necesita >15 puntos para reportar spam",
 	'confirm delete':"¿Está seguro que desea borrar esto?",
 	'anonymous users cannot delete/undelete':"usuarios anónimos no pueden borrar o recuperar publicaciones",
 	'post recovered':"publicación recuperada",
diff --git a/templates/question.html b/templates/question.html
index a56a3f24..a4c4da81 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -6,6 +6,9 @@
 {% load i18n %}
 {% block title %}{% spaceless %}{{ question.get_question_title }}{% endspaceless %}{% endblock %}
 {% block forejs %}
+        <meta name="description" content="{{question.summary}}" />
+        <meta name="keywords" content="{{question.tagname_meta_generator}}" />
+        <link rel="canonical" href="{{question.get_absolute_url}}"/>
         {% if not question.closed and request.user.is_authenticated %}
         <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
         <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>