moving settings values from settings.py to settings_local.py for better

organization

1 files changed, 26 insertions, 25 deletions

diff --git a/settings.py b/settings.py
index fb594676..5947617e 100644
--- a/settings.py
+++ b/settings.py
@@ -17,27 +17,27 @@ ADMINS = (
 )
 MANAGERS = ADMINS
 
-#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
+#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
-TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
+#LOCALIZATIONS (Moved to settings_local)
+#TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
 # LANGUAGE_CODE = 'en-us'
 SITE_ID = 1
 
-#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'
+#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.
@@ -98,11 +98,12 @@ INSTALLED_APPS = (
 # User settings
 from settings_local import *
 
-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 = ''
+#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 = ''