taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor fixes in settings

remotes/origin/enhancement/email-actions
David Barragán Merino 2015-04-20 12:23:06 +02:00
parent 7136966474
commit 36d7c1ab1a
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
settings/common.py
View File

@ -16,11 +16,6 @@
import os.path, sys, os import os.path, sys, os
# This is defined here as a do-nothing function because we can't import
# django.utils.translation -- that module depends on the settings.
gettext_noop = lambda s: s
BASE_DIR = os.path.dirname(os.path.dirname(__file__)) BASE_DIR = os.path.dirname(os.path.dirname(__file__))
APPEND_SLASH = False APPEND_SLASH = False
@ -159,7 +154,10 @@ LANGUAGES = [
# Languages using BiDi (right-to-left) layout # Languages using BiDi (right-to-left) layout
LANGUAGES_BIDI = ["he", "ar", "fa", "ur"] LANGUAGES_BIDI = ["he", "ar", "fa", "ur"]
LOCALE_PATHS = (
os.path.join(BASE_DIR, "locale"),
os.path.join(BASE_DIR, "taiga", "locale"),
)
SITES = { SITES = {
"api": {"domain": "localhost:8000", "scheme": "http", "name": "api"}, "api": {"domain": "localhost:8000", "scheme": "http", "name": "api"},
@ -197,13 +195,11 @@ MEDIA_URL = "http://localhost:8000/media/"
# Static url is not widelly used by taiga (only # Static url is not widelly used by taiga (only
# if admin is activated). # if admin is activated).
STATIC_URL = "http://localhost:8000/static/" STATIC_URL = "http://localhost:8000/static/"
ADMIN_MEDIA_PREFIX = "http://localhost:8000/static/admin/"
# Static configuration. # Static configuration.
MEDIA_ROOT = os.path.join(BASE_DIR, "media") MEDIA_ROOT = os.path.join(BASE_DIR, "media")
STATIC_ROOT = os.path.join(BASE_DIR, "static") STATIC_ROOT = os.path.join(BASE_DIR, "static")
STATICFILES_FINDERS = [ STATICFILES_FINDERS = [
"django.contrib.staticfiles.finders.FileSystemFinder", "django.contrib.staticfiles.finders.FileSystemFinder",
"django.contrib.staticfiles.finders.AppDirectoriesFinder", "django.contrib.staticfiles.finders.AppDirectoriesFinder",
@ -214,16 +210,9 @@ STATICFILES_DIRS = (
# Don't forget to use absolute paths, not relative paths. # Don't forget to use absolute paths, not relative paths.
) )
# Defautl storage # Defautl storage
DEFAULT_FILE_STORAGE = "taiga.base.storage.FileSystemStorage" DEFAULT_FILE_STORAGE = "taiga.base.storage.FileSystemStorage"
LOCALE_PATHS = (
os.path.join(BASE_DIR, "locale"),
os.path.join(BASE_DIR, "taiga", "locale"),
)
SECRET_KEY = "aw3+t2r(8(0kkrhg8)gx6i96v5^kv%6cfep9wxfom0%7dy0m9e" SECRET_KEY = "aw3+t2r(8(0kkrhg8)gx6i96v5^kv%6cfep9wxfom0%7dy0m9e"
TEMPLATE_LOADERS = [ TEMPLATE_LOADERS = [
@ -366,6 +355,7 @@ LOGGING = {
AUTH_USER_MODEL = "users.User" AUTH_USER_MODEL = "users.User"
FORMAT_MODULE_PATH = "taiga.base.formats" FORMAT_MODULE_PATH = "taiga.base.formats"
DATE_INPUT_FORMATS = ( DATE_INPUT_FORMATS = (
"%Y-%m-%d", "%m/%d/%Y", "%d/%m/%Y", "%b %d %Y", "%Y-%m-%d", "%m/%d/%Y", "%d/%m/%Y", "%b %d %Y",
"%b %d, %Y", "%d %b %Y", "%d %b, %Y", "%B %d %Y", "%b %d, %Y", "%d %b %Y", "%d %b, %Y", "%B %d %Y",

1
settings/local.py.example
View File

@ -61,4 +61,3 @@ from .development import *
#GITHUB_API_URL = "https://api.github.com/" #GITHUB_API_URL = "https://api.github.com/"
#GITHUB_API_CLIENT_ID = "yourgithubclientid" #GITHUB_API_CLIENT_ID = "yourgithubclientid"
#GITHUB_API_CLIENT_SECRET = "yourgithubclientsecret" #GITHUB_API_CLIENT_SECRET = "yourgithubclientsecret"