mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

number localization format for de set same as en

Browse source
This commit is contained in:
Arvind Tiwari 2018-03-07 19:22:13 +05:30
commit fc659cab9f
5 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

0
dynamicweb/formats/__init__.py Normal file
View file

0
dynamicweb/formats/de/__init__.py Normal file
View file

2
dynamicweb/formats/de/formats.py Normal file
View file

@ -0,0 +1,2 @@
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','

19
dynamicweb/settings/base.py
View file

@ -255,6 +255,12 @@ USE_L10N = True
USE_TZ = True USE_TZ = True
USE_THOUSAND_SEPARATOR = True
FORMAT_MODULE_PATH = [
'dynamicweb.formats'
]
LANGUAGES = ( LANGUAGES = (
('en-us', _('English')), ('en-us', _('English')),
('de', _('Deutsch')), ('de', _('Deutsch')),
@ -262,11 +268,6 @@ LANGUAGES = (
LANGUAGE_CODE = 'en-us' LANGUAGE_CODE = 'en-us'
LOCALE_PATHS = [
os.path.join(PROJECT_DIR, 'digitalglarus/locale'),
]
CMS_PLACEHOLDER_CONF = { CMS_PLACEHOLDER_CONF = {
'logo_image': { 'logo_image': {
'name': 'Logo Image', 'name': 'Logo Image',
@ -334,7 +335,7 @@ CMS_PLACEHOLDER_CONF = {
}, },
} }
CMS_PERMISSION=True CMS_PERMISSION = True
CACHES = { CACHES = {
'default': { 'default': {
@ -522,14 +523,14 @@ if UNGLEICH_SITE_CONFIGS == "":
raise Exception("Please define UNGLEICH_SITE_CONFIGS in your .env") raise Exception("Please define UNGLEICH_SITE_CONFIGS in your .env")
else: else:
try: try:
configs_dict=json.loads(UNGLEICH_SITE_CONFIGS) configs_dict = json.loads(UNGLEICH_SITE_CONFIGS)
except ValueError as verr: except ValueError as verr:
raise Exception("UNGLEICH_SITE_CONFIGS is not a valid JSON: {}".format( raise Exception("UNGLEICH_SITE_CONFIGS is not a valid JSON: {}".format(
str(verr) str(verr)
)) ))
else: else:
MULTISITE_CMS_URLS = { MULTISITE_CMS_URLS = {
k:v['MULTISITE_CMS_URL'] for (k,v) in configs_dict.items() k: v['MULTISITE_CMS_URL'] for (k, v) in configs_dict.items()
} }
MULTISITE_CMS_ALIASES = { MULTISITE_CMS_ALIASES = {
@ -611,7 +612,7 @@ DCL_ERROR_EMAILS_TO_LIST = []
if DCL_ERROR_EMAILS_TO is not None: if DCL_ERROR_EMAILS_TO is not None:
DCL_ERROR_EMAILS_TO_LIST = [x.strip() for x in DCL_ERROR_EMAILS_TO_LIST = [x.strip() for x in
DCL_ERROR_EMAILS_TO.split( DCL_ERROR_EMAILS_TO.split(
',')] \ ',')] \
if "," in DCL_ERROR_EMAILS_TO else [DCL_ERROR_EMAILS_TO.strip()] if "," in DCL_ERROR_EMAILS_TO else [DCL_ERROR_EMAILS_TO.strip()]
if 'info@ungleich.ch' not in DCL_ERROR_EMAILS_TO_LIST: if 'info@ungleich.ch' not in DCL_ERROR_EMAILS_TO_LIST:

2
hosting/templates/hosting/orders.html
View file

@ -30,7 +30,7 @@
<tr> <tr>
<td class="xs-td-inline" data-header="{% trans 'Order Nr.' %}">{{ order.id }}</td> <td class="xs-td-inline" data-header="{% trans 'Order Nr.' %}">{{ order.id }}</td>
<td class="xs-td-bighalf" data-header="{% trans 'Date' %}">{{ order.created_at | date:"M d, Y H:i" }}</td> <td class="xs-td-bighalf" data-header="{% trans 'Date' %}">{{ order.created_at | date:"M d, Y H:i" }}</td>
<td class="xs-td-smallhalf" data-header="{% trans 'Amount' %}">{{ order.price|unlocalize }}</td> <td class="xs-td-smallhalf" data-header="{% trans 'Amount' %}">{{ order.price }}</td>
<td class="text-right last-td"> <td class="text-right last-td">
<a class="btn btn-order-detail" href="{% url 'hosting:orders' order.pk %}">{% trans 'See Invoice' %}</a> <a class="btn btn-order-detail" href="{% url 'hosting:orders' order.pk %}">{% trans 'See Invoice' %}</a>
</td> </td>