diff options
Diffstat (limited to 'settings_local.py.dist')
-rw-r--r-- | settings_local.py.dist | 54 |
1 files changed, 53 insertions, 1 deletions
diff --git a/settings_local.py.dist b/settings_local.py.dist index 5447e517..136d4bdd 100644 --- a/settings_local.py.dist +++ b/settings_local.py.dist @@ -1,13 +1,24 @@ # encoding:utf-8 import os.path +<<<<<<< HEAD:settings_local.py.dist +======= from django.utils.translation import ugettext as _ +>>>>>>> evgenyfadeev/master:settings_local.py.dist SITE_SRC_ROOT = os.path.dirname(__file__) LOG_FILENAME = 'django.lanai.log' - + #for logging import logging logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,) +<<<<<<< HEAD:settings_local.py.dist + +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 +<<<<<<< HEAD:settings_local.py.dist +======= #ADMINS and MANAGERS ADMINS = (('Forum Admin', 'forum@example.com'),) @@ -22,18 +33,32 @@ DATABASE_NAME = 'cnprog' # Or path to database file if using sqlite3 DATABASE_USER = '' # Not used with sqlite3. DATABASE_PASSWORD = '' # Not used with sqlite3. DATABASE_ENGINE = 'mysql' #mysql, etc +>>>>>>> evgenyfadeev/master:settings_local.py.dist #Moved from settings.py for better organization. (please check it up to clean up settings.py) +======= + +#Moved from settings.py for better organization. (please check it up to clean up settings.py) + +>>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist #email server settings SERVER_EMAIL = '' DEFAULT_FROM_EMAIL = '' EMAIL_HOST_USER = '' EMAIL_HOST_PASSWORD = '' +<<<<<<< HEAD:settings_local.py.dist +EMAIL_SUBJECT_PREFIX = '[cnprog.com]' +EMAIL_HOST='smtp.gmail.com' +EMAIL_PORT='587' +EMAIL_USE_TLS=True +<<<<<<< HEAD:settings_local.py.dist +======= EMAIL_SUBJECT_PREFIX = '[CNPROG] ' EMAIL_HOST='cnprog.com' EMAIL_PORT='25' EMAIL_USE_TLS=False +>>>>>>> evgenyfadeev/master:settings_local.py.dist #LOCALIZATIONS TIME_ZONE = 'America/Tijuana' @@ -47,7 +72,22 @@ TIME_ZONE = 'America/Tijuana' FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string +======= + +#LOCALIZATIONS +TIME_ZONE = 'Asia/Chongqing Asia/Chungking' +# LANGUAGE_CODE = 'en-us' + +>>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist #OTHER SETTINGS +<<<<<<< HEAD:settings_local.py.dist +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' +<<<<<<< HEAD:settings_local.py.dist +======= APP_TITLE = u'CNPROG Q&A Forum' APP_KEYWORDS = u'CNPROG,forum,community' APP_DESCRIPTION = u'Ask and answer questions.' @@ -55,7 +95,11 @@ APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>' APP_COPYRIGHT = 'Copyright CNPROG, 2009. Some rights reserved under creative commons license.' LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/') GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc +>>>>>>> evgenyfadeev/master:settings_local.py.dist +======= + +>>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist USE_I18N = True LANGUAGE_CODE = 'en' EMAIL_VALIDATION = 'off' #string - on|off @@ -63,7 +107,14 @@ MIN_USERNAME_LENGTH = 1 EMAIL_UNIQUE = False APP_URL = 'http://cnprog.com' #used by email notif system and RSS GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA=' +<<<<<<< HEAD:settings_local.py.dist +GOOGLE_ANALYTICS_KEY = '' +<<<<<<< HEAD:settings_local.py.dist +BOOKS_ON = True +======= GOOGLE_ANALYTICS_KEY = '' +>>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist +======= BOOKS_ON = False WIKI_ON = True USE_EXTERNAL_LEGACY_LOGIN = False @@ -83,3 +134,4 @@ SPHINX_SEARCH_INDICES=('cnprog',) #a tuple of index names remember about a comma #last item, especially if you have just one :) SPHINX_SERVER='localhost' SPHINX_PORT=3312 +>>>>>>> evgenyfadeev/master:settings_local.py.dist |