Merge pull request #580 from tiwariav/task/3842/de_number_formatting_2
task/3842 de number formatting
This commit is contained in:
commit
ba8719269e
6 changed files with 11 additions and 8 deletions
0
dynamicweb/formats/__init__.py
Normal file
0
dynamicweb/formats/__init__.py
Normal file
0
dynamicweb/formats/de/__init__.py
Normal file
0
dynamicweb/formats/de/__init__.py
Normal file
2
dynamicweb/formats/de/formats.py
Normal file
2
dynamicweb/formats/de/formats.py
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
DECIMAL_SEPARATOR = '.'
|
||||||
|
THOUSAND_SEPARATOR = ','
|
|
@ -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',
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "hosting/base_short.html" %}
|
{% extends "hosting/base_short.html" %}
|
||||||
{% load staticfiles bootstrap3 i18n %}
|
{% load staticfiles bootstrap3 i18n l10n %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="dashboard-container">
|
<div class="dashboard-container">
|
||||||
<div class="dashboard-container-head">
|
<div class="dashboard-container-head">
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for vm in vms %}
|
{% for vm in vms %}
|
||||||
<tr>
|
<tr>
|
||||||
<td data-header="ID">{{vm.vm_id}}</td>
|
<td data-header="ID">{{vm.vm_id|unlocalize}}</td>
|
||||||
<td data-header="IPv4">{% if vm.ipv4 %}{{vm.ipv4}}{% endif %}</td>
|
<td data-header="IPv4">{% if vm.ipv4 %}{{vm.ipv4}}{% endif %}</td>
|
||||||
<td data-header="IPv6">{% if vm.ipv6 %}{{vm.ipv6}}{% endif %}</td>
|
<td data-header="IPv6">{% if vm.ipv6 %}{{vm.ipv6}}{% endif %}</td>
|
||||||
<td data-header="{% trans 'Status' %}">
|
<td data-header="{% trans 'Status' %}">
|
||||||
|
|
Loading…
Reference in a new issue