Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
repanier
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chris
repanier
Commits
7a763ee5
Commit
7a763ee5
authored
Jul 05, 2015
by
Patrick Colmant
Committed by
Patrick
Jul 05, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Version 1.7.1
parent
779e2832
Changes
57
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
57 changed files
with
2396 additions
and
2224 deletions
+2396
-2224
mysite/common_settings.py
mysite/common_settings.py
+146
-104
mysite/locale/fr/LC_MESSAGES/django.mo
mysite/locale/fr/LC_MESSAGES/django.mo
+0
-0
mysite/locale/fr/LC_MESSAGES/django.po
mysite/locale/fr/LC_MESSAGES/django.po
+108
-70
mysite/locale/fr/LC_MESSAGES/djangojs.mo
mysite/locale/fr/LC_MESSAGES/djangojs.mo
+0
-0
mysite/locale/fr/LC_MESSAGES/djangojs.po
mysite/locale/fr/LC_MESSAGES/djangojs.po
+70
-44
mysite/templates/base.html
mysite/templates/base.html
+10
-7
mysite/templates/base_wo_cms_toolbar.html
mysite/templates/base_wo_cms_toolbar.html
+38
-25
mysite/templates/cmsplugin_filer_image/plugins/image/default.html
...emplates/cmsplugin_filer_image/plugins/image/default.html
+6
-6
mysite/templates/home.html
mysite/templates/home.html
+4
-39
mysite/templates/password_reset/recovery_done.html
mysite/templates/password_reset/recovery_done.html
+2
-1
mysite/templates/password_reset/recovery_form.html
mysite/templates/password_reset/recovery_form.html
+5
-1
mysite/templates/password_reset/reset.html
mysite/templates/password_reset/reset.html
+14
-2
mysite/templates/registration/login.html
mysite/templates/registration/login.html
+42
-20
mysite/templates/subpage_base_wo_cms_toolbar.html
mysite/templates/subpage_base_wo_cms_toolbar.html
+1
-4
repanier/__init__.py
repanier/__init__.py
+1
-1
repanier/admin.py
repanier/admin.py
+258
-251
repanier/apps.py
repanier/apps.py
+58
-28
repanier/auth_backend.py
repanier/auth_backend.py
+86
-93
repanier/callback.py
repanier/callback.py
+21
-0
repanier/cms_toolbar.py
repanier/cms_toolbar.py
+9
-7
repanier/email/email_alert.py
repanier/email/email_alert.py
+3
-3
repanier/email/email_invoice.py
repanier/email/email_invoice.py
+12
-8
repanier/email/email_offer.py
repanier/email/email_offer.py
+10
-8
repanier/email/email_order.py
repanier/email/email_order.py
+21
-15
repanier/forms.py
repanier/forms.py
+13
-3
repanier/locale/fr/LC_MESSAGES/django.mo
repanier/locale/fr/LC_MESSAGES/django.mo
+0
-0
repanier/locale/fr/LC_MESSAGES/django.po
repanier/locale/fr/LC_MESSAGES/django.po
+833
-1107
repanier/management/commands/move_pictures.py
repanier/management/commands/move_pictures.py
+93
-0
repanier/management/commands/recalculate_order_amount.py
repanier/management/commands/recalculate_order_amount.py
+1
-1
repanier/menu.py
repanier/menu.py
+3
-3
repanier/models.py
repanier/models.py
+93
-79
repanier/picture/__init__.py
repanier/picture/__init__.py
+0
-0
repanier/picture/const.py
repanier/picture/const.py
+6
-0
repanier/picture/views.py
repanier/picture/views.py
+75
-0
repanier/task/task_invoice.py
repanier/task/task_invoice.py
+10
-10
repanier/task/task_order.py
repanier/task/task_order.py
+6
-7
repanier/templates/repanier/cache_part_a.html
repanier/templates/repanier/cache_part_a.html
+4
-4
repanier/templates/repanier/cache_part_b.html
repanier/templates/repanier/cache_part_b.html
+6
-5
repanier/templates/repanier/cache_part_c.html
repanier/templates/repanier/cache_part_c.html
+6
-5
repanier/templates/repanier/cache_part_e.html
repanier/templates/repanier/cache_part_e.html
+14
-10
repanier/templates/repanier/logged_out.html
repanier/templates/repanier/logged_out.html
+3
-1
repanier/templates/repanier/me_form.html
repanier/templates/repanier/me_form.html
+4
-0
repanier/templates/repanier/order_form.html
repanier/templates/repanier/order_form.html
+3
-2
repanier/templates/repanier/pre_order_form.html
repanier/templates/repanier/pre_order_form.html
+14
-8
repanier/templates/repanier/producer_product_description_form.html
...templates/repanier/producer_product_description_form.html
+74
-74
repanier/templates/repanier/who_is_who.html
repanier/templates/repanier/who_is_who.html
+18
-0
repanier/templates/repanier/widget/order_product_preview.html
...nier/templates/repanier/widget/order_product_preview.html
+19
-19
repanier/tools.py
repanier/tools.py
+21
-17
repanier/urls.py
repanier/urls.py
+2
-0
repanier/views.py
repanier/views.py
+42
-26
repanier/widget.py
repanier/widget.py
+52
-50
repanier/xslx/xslx_invoice.py
repanier/xslx/xslx_invoice.py
+9
-9
repanier/xslx/xslx_offer.py
repanier/xslx/xslx_offer.py
+5
-2
repanier/xslx/xslx_order.py
repanier/xslx/xslx_order.py
+16
-16
repanier/xslx/xslx_product.py
repanier/xslx/xslx_product.py
+18
-21
repanier/xslx/xslx_purchase.py
repanier/xslx/xslx_purchase.py
+6
-6
repanier/xslx/xslx_stock.py
repanier/xslx/xslx_stock.py
+2
-2
No files found.
mysite/common_settings.py
View file @
7a763ee5
# -*- coding: utf-8 -*-
import
os
from
settings
import
*
import
os
import
sys
gettext
=
lambda
s
:
s
PROJECT_PATH
=
os
.
path
.
split
(
os
.
path
.
abspath
(
os
.
path
.
dirname
(
__file__
)))[
0
]
PROJECT_DIR
=
os
.
path
.
realpath
(
os
.
path
.
dirname
(
__file__
))
os
.
sys
.
path
.
insert
(
0
,
os
.
path
.
dirname
(
PROJECT_DIR
))
#
##################### DEBUG
###################### DEBUG
# Defined into /etc/uwsgi/apps-available/*.ini
DEBUG
=
True
if
os
.
getenv
(
'DJANGO_SETTINGS_MODULE_DEBUG'
,
''
)
==
'True'
else
False
TEMPLATE_DEBUG
=
DEBUG
DEBUG_PROPAGATE_EXCEPTIONS
=
DEBUG
ADMINS
=
(
(
os
.
getenv
(
'DJANGO_SETTINGS_MODULE_ADMIN_NAME'
,
''
),
...
...
@@ -47,6 +48,10 @@ EMAIL_HOST_USER = os.getenv('DJANGO_SETTINGS_MODULE_EMAIL_HOST_USER', '')
EMAIL_HOST_PASSWORD
=
os
.
getenv
(
'DJANGO_SETTINGS_MODULE_EMAIL_HOST_PASSWORD'
,
''
)
EMAIL_PORT
=
os
.
getenv
(
'DJANGO_SETTINGS_MODULE_EMAIL_PORT'
,
''
)
EMAIL_USE_TLS
=
True
if
os
.
getenv
(
'DJANGO_SETTINGS_MODULE_EMAIL_USE_TLS'
,
''
)
==
'True'
else
False
if
not
EMAIL_USE_TLS
:
EMAIL_USE_SSL
=
True
if
os
.
getenv
(
'DJANGO_SETTINGS_MODULE_EMAIL_USE_SSL'
,
''
)
==
'True'
else
False
else
:
EMAIL_USE_SSL
=
False
# if DEBUG:
# EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
###################### I18N
...
...
@@ -64,10 +69,10 @@ DECIMAL_SEPARATOR = ','
##################### Django & Django CMS
LANGUAGES
=
[
(
'fr'
,
'Français'
),
(
'nl'
,
'Neederlands'
),
(
'en'
,
'English'
),
]
(
'fr'
,
u
'Français'
),
(
'nl'
,
u
'Neederlands'
),
(
'en'
,
u
'English'
),
(
'it'
,
u
'italiano'
),
]
CMS_LANGUAGES
=
{
'default'
:
{
...
...
@@ -82,19 +87,53 @@ LOCALE_PATHS = (
os
.
path
.
join
(
PROJECT_DIR
,
"locale"
),
)
INSTALLED_APPS
=
(
'django.contrib.sites'
,
'django.contrib.auth'
,
'django.contrib.contenttypes'
,
'django.contrib.sessions'
,
'django.contrib.messages'
,
'django.contrib.staticfiles'
,
'django.contrib.sitemaps'
,
'django.contrib.formtools'
,
'djangocms_text_ckeditor'
,
# note this needs to be above the 'cms' entry
'cms'
,
"treebeard"
,
'mptt'
,
'menus'
,
'sekizai'
,
'djangocms_admin_style'
,
# note this needs to be above the 'django.contrib.admin' entry
'django.contrib.admin'
,
'django_mptt_admin'
,
'filer'
,
'easy_thumbnails'
,
'cmsplugin_filer_file'
,
'cmsplugin_filer_folder'
,
'cmsplugin_filer_link'
,
'cmsplugin_filer_image'
,
'cmsplugin_filer_video'
,
'reversion'
,
'password_reset'
,
'parler'
,
)
MIDDLEWARE_CLASSES
=
(
'django.middleware.cache.UpdateCacheMiddleware'
,
'django.contrib.sessions.middleware.SessionMiddleware'
,
'django.middleware.common.CommonMiddleware'
,
'django.middleware.csrf.CsrfViewMiddleware'
,
'django.contrib.auth.middleware.AuthenticationMiddleware'
,
'django.contrib.auth.middleware.SessionAuthenticationMiddleware'
,
'django.middleware.common.BrokenLinkEmailsMiddleware'
,
'django.contrib.messages.middleware.MessageMiddleware'
,
'django.middleware.clickjacking.XFrameOptionsMiddleware'
,
'django.middleware.locale.LocaleMiddleware'
,
'django.middleware.doc.XViewMiddleware'
,
'django.middleware.common.CommonMiddleware'
,
# 'cms.middleware.language.LanguageCookieMiddleware', Disable to avoid cookies advertising requirement
'cms.middleware.user.CurrentUserMiddleware'
,
'cms.middleware.page.CurrentPageMiddleware'
,
'cms.middleware.user.CurrentUserMiddleware'
,
'cms.middleware.toolbar.ToolbarMiddleware'
,
# 'cms.middleware.language.LanguageCookieMiddleware',
'django.middleware.cache.FetchFromCacheMiddleware'
,
)
...
...
@@ -110,85 +149,61 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'sekizai.context_processors.sekizai'
,
)
INSTALLED_APPS
=
(
'django.contrib.sites'
,
'django.contrib.auth'
,
'django.contrib.contenttypes'
,
'django.contrib.sessions'
,
'django.contrib.messages'
,
'django.contrib.staticfiles'
,
'django.contrib.sitemaps'
,
'django.contrib.formtools'
,
'djangocms_text_ckeditor'
,
# note this needs to be above the 'cms' entry
'cms'
,
'mptt'
,
'menus'
,
'south'
,
'sekizai'
,
'djangocms_admin_style'
,
# note this needs to be above
# the 'django.contrib.admin' entry
'django.contrib.admin'
,
'adminsortable'
,
# 'hvad',
'filer'
,
'easy_thumbnails'
,
'cmsplugin_filer_file'
,
'cmsplugin_filer_folder'
,
'cmsplugin_filer_image'
,
'cmsplugin_filer_video'
,
'cmsplugin_filer_link'
,
'reversion'
,
'password_reset'
,
TEMPLATE_LOADERS
=
(
(
'django.template.loaders.cached.Loader'
,
(
'django.template.loaders.filesystem.Loader'
,
'django.template.loaders.app_directories.Loader'
,
)),
)
MIGRATION_MODULES
=
{
'cms'
:
'cms.migrations_django'
,
'menus'
:
'menus.migrations_django'
,
'filer'
:
'filer.migrations_django'
,
'djangocms_text_ckeditor'
:
'djangocms_text_ckeditor.migrations_django'
,
'cmsplugin_filer_file'
:
'cmsplugin_filer_file.migrations_django'
,
'cmsplugin_filer_folder'
:
'cmsplugin_filer_folder.migrations_django'
,
'cmsplugin_filer_link'
:
'cmsplugin_filer_link.migrations_django'
,
'cmsplugin_filer_image'
:
'cmsplugin_filer_image.migrations_django'
,
'cmsplugin_filer_video'
:
'cmsplugin_filer_video.migrations_django'
,
}
CMS_PERMISSION
=
False
# When set to True, don't forget 'cms.middleware.user.CurrentUserMiddleware'
CMS_PUBLIC_FOR
=
'all'
# CMS_PUBLIC_FOR = 'staff'
CMS_SHOW_START_DATE
=
False
CMS_SHOW_END_DATE
=
False
CMS_SEO_FIELDS
=
False
CMS_URL_OVERWRITE
=
True
CMS_MENU_TITLE_OVERWRITE
=
True
CMS_REDIRECTS
=
True
LOGIN_URL
=
"/go_repanier/"
LOGIN_REDIRECT_URL
=
"/"
LOGOUT_URL
=
"/leave_repanier/"
CKEDITOR_SETTINGS
=
{
'language'
:
'{{ language }}'
,
'toolbar_CMS'
:
[
[
'Undo'
,
'Redo'
],
[
'cmsplugins'
,
'-'
,
'ShowBlocks'
],
# ['Format', 'Styles'],
[
'Format'
,
'Templates'
],
[
'TextColor'
,
'BGColor'
,
'-'
,
'PasteText'
],
#, 'PasteFromWord'],
[
'Maximize'
,
''
],
'/'
,
[
'Bold'
,
'Italic'
,
'Underline'
,
'-'
,
'Subscript'
,
'Superscript'
,
'-'
,
'RemoveFormat'
],
[
'JustifyLeft'
,
'JustifyCenter'
,
'JustifyRight'
],
[
'HorizontalRule'
],
[
'NumberedList'
,
'BulletedList'
,
'-'
,
'Outdent'
,
'Indent'
,
'-'
,
'Table'
],
[
'Source'
]
],
'toolbar_HTMLField'
:
[
[
'Undo'
,
'Redo'
],
[
'ShowBlocks'
,
'Format'
],
[
'TextColor'
,
'BGColor'
,
'-'
,
'PasteText'
],
#, 'PasteFromWord'],
[
'Maximize'
,
''
],
'/'
,
[
'Bold'
,
'Italic'
,
'Underline'
,
'-'
,
'Subscript'
,
'Superscript'
,
'-'
,
'RemoveFormat'
],
[
'JustifyLeft'
,
'JustifyCenter'
,
'JustifyRight'
],
[
'HorizontalRule'
],
[
'Link'
,
'Unlink'
],
[
'NumberedList'
,
'BulletedList'
,
'-'
,
'Outdent'
,
'Indent'
,
'-'
,
'Table'
],
[
'Source'
]
],
'toolbar_CMS'
:
[
[
'Undo'
,
'Redo'
],
[
'cmsplugins'
,
'-'
,
'ShowBlocks'
],
[
'Format'
,
'Templates'
],
[
'TextColor'
,
'BGColor'
,
'-'
,
'PasteText'
],
[
'Maximize'
,
''
],
'/'
,
[
'Bold'
,
'Italic'
,
'Underline'
,
'-'
,
'Subscript'
,
'Superscript'
,
'-'
,
'RemoveFormat'
],
[
'JustifyLeft'
,
'JustifyCenter'
,
'JustifyRight'
],
[
'HorizontalRule'
],
[
'NumberedList'
,
'BulletedList'
,
'-'
,
'Outdent'
,
'Indent'
,
'-'
,
'Table'
],
[
'Source'
]
],
'toolbar_HTMLField'
:
[
[
'Format'
,
'Bold'
,
'Italic'
,
'TextColor'
,
'-'
,
'NumberedList'
,
'BulletedList'
,
'RemoveFormat'
],
[
'Preview'
,
'Cut'
,
'Copy'
,
'PasteText'
,
'Link'
,
'-'
,
'Undo'
,
'Redo'
],
[
'Maximize'
,
''
]
],
'forcePasteAsPlainText'
:
'true'
,
'skin'
:
'moono'
,
# 'stylesSet' : 'my_styles:%sjs/ckeditor-styles.js' % STATIC_URL,
# 'stylesSet' : [],
'extraPlugins'
:
'cmsplugins,template
s'
,
'format_tags'
:
'p;h
1;h2;h3;h4;h5;blockquote;mutted;success;info;danger;heart;infosign;warningsign;pushpin;div
'
,
# 'extraPlugins': 'cmsplugin
s',
'format_tags'
:
'p;h
4;h5;blockquote;mutted;success;info;danger;heart;pushpin
'
,
'format_blockquote'
:
{
'element'
:
'blockquote'
,
'name'
:
'Blockquote'
},
'format_heart'
:
{
'element'
:
'span'
,
'attributes'
:
{
'class'
:
'glyphicon glyphicon-heart-empty'
}},
'format_infosign'
:
{
'element'
:
'span'
,
'attributes'
:
{
'class'
:
'glyphicon glyphicon-info-sign'
}},
...
...
@@ -203,15 +218,36 @@ CKEDITOR_SETTINGS = {
# 'contentsCss' : '//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css',
'contentsCss'
:
'%sbootstrap/css/bootstrap.css'
%
STATIC_URL
,
# 'extraAllowedContent' : '*(*)',
# 'removeFormatTags' : 'b,big,code,del,dfn,em,font,i,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,u,var'
'removeFormatTags'
:
'big,code,del,dfn,em,font,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,u,var'
,
'basicEntities'
:
False
,
'entities'
:
False
,
'removePlugins'
:
'elementspath'
,
}
CKEDITOR_SETTINGS_MODEL2
=
{
'language'
:
'{{ language }}'
,
'toolbar_HTMLField'
:
[
[
'Format'
,
'Bold'
,
'Italic'
,
'TextColor'
,
'-'
,
'NumberedList'
,
'BulletedList'
,
'RemoveFormat'
],
[
'Preview'
,
'Cut'
,
'Copy'
,
'PasteText'
,
'Link'
,
'-'
,
'Undo'
,
'Redo'
],
[
'Maximize'
,
''
]
],
'forcePasteAsPlainText'
:
'true'
,
'skin'
:
'moono'
,
'format_tags'
:
'p;h4;h5'
,
'contentsCss'
:
'%sbootstrap/css/bootstrap.css'
%
STATIC_URL
,
'removeFormatTags'
:
'big,code,del,dfn,em,font,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,u,var'
,
'basicEntities'
:
False
,
'entities'
:
False
,
'removePlugins'
:
'elementspath'
,
}
TEXT_ADDITIONAL_TAGS
=
(
'span'
,)
TEXT_ADDITIONAL_ATTRIBUTES
=
(
'class'
,)
# TEXT_HTML_SANITIZE = Fals
e
TEXT_ADDITIONAL_ATTRIBUTES
=
(
'class'
,)
TEXT_HTML_SANITIZE
=
Tru
e
# TEXT_SAVE_IMAGE_FUNCTION = 'cmsplugin_filer_image.integrations.ckeditor.create_image_plugin'
# TEXT_SAVE_IMAGE_FUNCTION = 'djangocms_text_ckeditor.picture_save.create_picture_plugin'
TEXT_SAVE_IMAGE_FUNCTION
=
None
TEXT_PLUGINS_INTEGRATION
=
'buttons'
FILER_ENABLE_LOGGING
=
False
FILER_IMAGE_USE_ICON
=
True
...
...
@@ -219,7 +255,7 @@ FILER_ALLOW_REGULAR_USERS_TO_ADD_ROOT_FOLDERS = True
FILER_ENABLE_PERMISSIONS
=
False
FILER_IS_PUBLIC_DEFAULT
=
True
FILER_SUBJECT_LOCATION_IMAGE_DEBUG
=
True
FILER_DEBUG
=
DEBUG
FILER_DEBUG
=
False
THUMBNAIL_PROCESSORS
=
(
'easy_thumbnails.processors.colorspace'
,
...
...
@@ -228,14 +264,14 @@ THUMBNAIL_PROCESSORS = (
'filer.thumbnail_processors.scale_and_crop_with_subject_location'
,
'easy_thumbnails.processors.filters'
,
)
THUMBNAIL_DEBUG
=
DEBUG
THUMBNAIL_HIGH_RESOLUTION
=
True
THUMBNAIL_DEBUG
=
FILER_DEBUG
# https://docs.djangoproject.com/en/1.5/howto/static-files/
STATIC_ROOT
=
os
.
path
.
join
(
PROJECT_DIR
,
"collect-static"
)
STATIC_URL
=
"/static/"
MEDIA_URL
=
"/media/"
USE_X_FORWARDED_HOST
=
True
SEND_BROKEN_LINK_EMAILS
=
True
SESSION_EXPIRE_AT_BROWSER_CLOSE
=
True
SESSION_ENGINE
=
"django.contrib.sessions.backends.file"
SESSION_COOKIE_HTTPONLY
=
True
...
...
@@ -248,16 +284,20 @@ AUTHENTICATION_BACKENDS = ('repanier.auth_backend.RepanierCustomBackend',)
# ADMIN_LOGIN = 'pise'
# ADMIN_PASSWORD = 'raspberry'
INSTALLED_APPS
+=
(
'repanier'
,
'repanier'
,
)
LOGIN_URL
=
"/repanier/go_repanier/"
LOGIN_REDIRECT_URL
=
"/"
LOGOUT_URL
=
"/repanier/leave_repanier/"
################# Django_crispy_forms
# INSTALLED_APPS += (
# 'crispy_forms',
# )
INSTALLED_APPS
+=
(
'crispy_forms'
,
# 'crispy_forms_foundation',
)
# CRISPY_TEMPLATE_PACK = "bootstrap3"
CRISPY_TEMPLATE_PACK
=
"bootstrap3"
# # CRISPY_TEMPLATE_PACK = "foundation"
# JSON_MODULE = 'ujson'
################# Django_compressor
...
...
@@ -311,33 +351,35 @@ COMPRESS_OFFLINE = False
CACHE_MIDDLEWARE_ALIAS
=
'default'
CACHE_MIDDLEWARE_SECONDS
=
3600
CACHES
=
{
'default'
:
{
'BACKEND'
:
'django.core.cache.backends.filebased.FileBasedCache'
,
'LOCATION'
:
'/var/tmp/django_cache'
,
'TIMEOUT'
:
300
,
'OPTIONS'
:
{
'MAX_ENTRIES'
:
1000
,
'CULL_FREQUENCY'
:
3
}
}
}
#
CACHES = {
#
'default': {
#
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
#
'LOCATION': '/var/tmp/django_cache',
#
'TIMEOUT': 300,
#
'OPTIONS': {
#
'MAX_ENTRIES': 1000,
#
'CULL_FREQUENCY': 3
#
}
#
}
#
}
CMS_CACHE_DURATIONS
=
{
'content'
:
300
,
# default 60
'menus'
:
3600
,
# default 3600
'permissions'
:
3600
# default: 3600
}
CMS_PAGE_CACHE
=
True
CMS_PLACEHOLDER_CACHE
=
True
CMS_PLUGIN_CACHE
=
True
SOUTH_MIGRATION_MODULES
=
{
'easy_thumbnails'
:
'easy_thumbnails.south_migrations'
,
}
#
SOUTH_MIGRATION_MODULES = {
#
'easy_thumbnails': 'easy_thumbnails.south_migrations',
#
}
###################### EASYMAP
#EASY_MAPS_CENTER = ( 50.630545,3.776955 )
##################### DECIMAL
from
decimal
import
getcontext
,
ROUND_HALF_UP
getcontext
().
rounding
=
ROUND_HALF_UP
#INSTALLED_APPS += (
# 'easy_maps',
#)
...
...
@@ -348,8 +390,8 @@ SOUTH_MIGRATION_MODULES = {
# l = logging.getLogger('django.db.backends')
# l.setLevel(logging.DEBUG)
# l.addHandler(logging.StreamHandler())
#
#
# LOGGING = {
# 'version': 1,
# 'disable_existing_loggers': False,
...
...
mysite/locale/fr/LC_MESSAGES/django.mo
View file @
7a763ee5
No preview for this file type
mysite/locale/fr/LC_MESSAGES/django.po
View file @
7a763ee5
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR
<EMAIL@ADDRESS>, YEAR
.
# FIRST AUTHOR
pcolmant@gmail.com, 2014
.
#
msgid ""
msgstr ""
"Project-Id-Version: Repanier\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 201
4-08-14 10:1
5+0200\n"
"PO-Revision-Date: 201
4-06-03 18:24
+0100\n"
"POT-Creation-Date: 201
5-05-20 19:5
5+0200\n"
"PO-Revision-Date: 201
5-05-21 21:19
+0100\n"
"Last-Translator: Patrick Colmant <pcolmant@gmail.com>\n"
"Language-Team:
LANGUAGE <LL@li.org
>\n"
"Language-Team:
Patrick Colmant <pcolmant@gmail.com
>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"
Plural-Forms: nplurals=2; plural=(n > 1);
\n"
"X-
Generator: Poedit 1.6.4
\n"
"
X-Generator: Poedit 1.7.1
\n"
"X-
Poedit-SourceCharset: UTF-8
\n"
#: ptidej_settings.py:
18
#: ptidej_settings.py:
34
msgid "Homepage"
msgstr "Page d'accueil"
#: ptidej_settings.py:
19
#: ptidej_settings.py:
35
msgid "Secondary Page"
msgstr "Page interne"
#: ptidej_settings.py:
25
#: ptidej_settings.py:
41
msgid "French"
msgstr "Fançais"
#: ptidej_settings.py:
34
#: ptidej_settings.py:
76
msgid "Hero"
msgstr "Héro"
#: ptidej_settings.py:
53
#: ptidej_settings.py:
95
msgid "Column 1"
msgstr "Colonne 1"
#: ptidej_settings.py:
7
5
#: ptidej_settings.py:
11
5
msgid "Column 2"
msgstr "Colonne 2"
#: ptidej_settings.py:
97
#: ptidej_settings.py:
135
msgid "Column 3"
msgstr "Colonne 3"
#: ptidej_settings.py:1
22
#: ptidej_settings.py:1
60
msgid "Content"
msgstr "Contenu"
#: ptidej_settings.py:1
37
#: ptidej_settings.py:1
75
msgid "Footer"
msgstr "Pide de page"
#: ptidej_settings.py:153
msgid "info"
msgstr "info"
#: ptidej_settings.py:154
msgid "new"
msgstr "nouveau"
#: ptidej_settings.py:155
msgid "hint"
msgstr "atteindre"
#: ptidej_settings.py:159
msgid "normal"
msgstr "normal"
#: ptidej_settings.py:160
msgid "2x"
msgstr "2x"
#: ptidej_settings.py:161
msgid "3x"
msgstr "3x"
#: ptidej_settings.py:162
msgid "4x"
msgstr "4x"
#: templates/base.html:35 templates/base_wo_cms_toolbar.html:35
#: templates/base.html:36 templates/base_wo_cms_toolbar.html:33
msgid "Skip to main content"
msgstr "Aller au contenu principal"
#: templates/base.html:4
2 templates/base_wo_cms_toolbar.html:41
#: templates/base.html:4
3 templates/base_wo_cms_toolbar.html:39
msgid "Toggle navigation"
msgstr "Basculer la navigation"
#: templates/base.html:6
2 templates/base_wo_cms_toolbar.html:61
#: templates/base.html:6
3 templates/base_wo_cms_toolbar.html:58
msgid "Welkom"
msgstr "Bienvenue"
#: templates/base.html:6
4 templates/base_wo_cms_toolbar.html:63
#: templates/base.html:6
5 templates/base_wo_cms_toolbar.html:60
#: templates/registration/logged_out.html:7
msgid "Logout"
msgstr "Deconnexion"
#: templates/base.html:
69 templates/base_wo_cms_toolbar.html:71
#: templates/registration/login.html:
7 templates/registration/login.html:32
#: templates/base.html:
70 templates/registration/login.html:8
#: templates/registration/login.html:
54
msgid "Login"
msgstr "Connexion"
#: templates/base.html:7
4 templates/base_wo_cms_toolbar.html:76
#: templates/base.html:7
6 templates/base_wo_cms_toolbar.html:71
msgid "Language"
msgstr "Langue"
#: templates/base.html:
87 templates/base_wo_cms_toolbar.html:90
#: templates/base.html:
90 templates/base_wo_cms_toolbar.html:86
msgid ""
"It will be easier for you to crawl this website with a newer browser. For "
"example"
...
...
@@ -116,15 +88,15 @@ msgstr ""
"Votre navigateur est trop ancien pour visiter ce site confortablement. Nous "
"vous recommandons de le mettre à jour ou d'utiliser par exemple "
#: templates/base.html:
87 templates/base_wo_cms_toolbar.html:90
#: templates/base.html:
90 templates/base_wo_cms_toolbar.html:86
msgid "or"
msgstr "ou"
#: templates/base.html:9
5 templates/base_wo_cms_toolbar.html:99
#: templates/base.html:9
8
msgid "Contact"
msgstr "Contact"
#: templates/base.html:9
5 templates/base_wo_cms_toolbar.html:99
#: templates/base.html:9
8
msgid "Participer"
msgstr "Participer"
...
...
@@ -140,11 +112,14 @@ msgstr "Réinitialisation du mot de passe"
#: templates/password_reset/recovery_done.html:11
msgid ""
"Your password has successfully been reset. You can use it right now on the "
"<a href=\"/go_repanier/\">login page</a>."
"Your password has successfully been reset. You can use it right now on the"
msgstr ""
"Votre mote de passe a été mis à jour. Vous pouvez vous <a href=\"/"
"go_repanier/\">connecter</a> dès à présent."
"Votre mot de passe a été réinitialisé avec succès. Vous pouvez l'"
"utiliser dès maintenant sur la"
#: templates/password_reset/recovery_done.html:11
msgid "login page"
msgstr "Page de connexion"
#: templates/password_reset/recovery_email.txt:1
#, python-format
...
...
@@ -179,11 +154,11 @@ msgstr ""
msgid "Password recovery on %(domain)s"
msgstr "Réinitialisation du mot de passe sur %(domain)s"
#: templates/password_reset/recovery_form.html:1
5
#: templates/password_reset/recovery_form.html:1
4
msgid "Username or Email"
msgstr "Nom d'utilisateur ou Email"
#: templates/password_reset/recovery_form.html:1
7
#: templates/password_reset/recovery_form.html:1
6
msgid "Recover my password"
msgstr "Réinitialiser mon mot de passe"
...
...
@@ -204,6 +179,14 @@ msgstr ""
"mot de passe."
#: templates/password_reset/reset.html:18
msgid "New password"
msgstr "Enregistrer le nouveau mot de passe"
#: templates/password_reset/reset.html:22
msgid "New password (confirm)"
msgstr "Confirmer le nouveau mot de passe"
#: templates/password_reset/reset.html:25
msgid "Set new password"
msgstr "Enregistrer le nouveau mot de passe"
...
...
@@ -224,22 +207,77 @@ msgstr ""
"Vous êtes maintenant déconnecté. Vous pouvez vous <a href=\"/go_repanier"
"\">re connecter</a> ou vous rendre à la <a href=\"/\">page d'accueil</a>."
#: templates/registration/login.html:
16
msgid "
Please correct the error below
."
msgstr "
Veuillez corriger l'erreur ci-dessou
s."
#: templates/registration/login.html:
3
msgid "
Too many attempt
."
msgstr "
Trop de tentative
s."
#: templates/registration/login.html:16
msgid "Please correct the errors below."
msgstr "Veuillez corriger les erreurs ci-dessous."
#: templates/registration/login.html:20 templates/registration/login.html:22
#: templates/registration/login.html:23 templates/registration/login.html:31
msgid "Username"
msgstr "Nom d'utilisateur"
#: templates/registration/login.html:
26 templates/registration/login.html:28
#: templates/registration/login.html:
33 templates/registration/login.html:41
msgid "Password"
msgstr "Mot de passe"
#: templates/registration/login.html:33
#: templates/registration/login.html:48
msgid "Validation code (2 latest digits of your phone number)"
msgstr "Code de validation (4 derniers chiffres de votre ✆)"
#: templates/registration/login.html:49
msgid "Validation code"