diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py
index c5483a1..eedbec2 100644
--- a/apimanager/apimanager/settings.py
+++ b/apimanager/apimanager/settings.py
@@ -153,8 +153,7 @@ AUTH_PASSWORD_VALIDATORS = [
# Internationalization
# https://docs.djangoproject.com/en/1.10/topics/i18n/
-#LANGUAGE_CODE = 'en-gb'
-LANGUAGE_CODE = 'fr'
+LANGUAGE_CODE = 'en-gb'
TIME_ZONE = 'Europe/Berlin'
diff --git a/apimanager/atms/forms.py b/apimanager/atms/forms.py
index 23cdc87..c082421 100644
--- a/apimanager/atms/forms.py
+++ b/apimanager/atms/forms.py
@@ -55,7 +55,7 @@ class CreateAtmForm(forms.Form):
label='Latitude',
widget=forms.TextInput(
attrs={
- 'placeholder': 37.0,
+ 'placeholder': " ",
'class': 'form-control',
}
),
@@ -66,7 +66,7 @@ class CreateAtmForm(forms.Form):
label='Longitude',
widget=forms.TextInput(
attrs={
- 'placeholder': 110.0,
+ 'placeholder': " ",
'class': 'form-control',
}
),
diff --git a/apimanager/atms/templates/atms/index.html b/apimanager/atms/templates/atms/index.html
index c3662a0..22589fe 100644
--- a/apimanager/atms/templates/atms/index.html
+++ b/apimanager/atms/templates/atms/index.html
@@ -28,7 +28,7 @@
{% if form.name.errors %}
{{ form.name.errors }}
{% endif %}
- {% trans "name" %} {{ form.name }}
+ {% trans "Name" %} {{ form.name }}
@@ -37,7 +37,7 @@
{% if form.services.errors %}
{{ form.services.errors }}
{% endif %}
- {% trans "services" %} {{ form.services }}
+ {% trans "Services" %} {{ form.services }}
@@ -45,7 +45,7 @@
{{ form.location_latitude.errors }}
{% endif %}
- {% trans "location_latitude" %} {{ form.location_latitude }}
+ {% trans "Location Latitude" %} {{ form.location_latitude }}
@@ -53,7 +53,7 @@
{{ form.location_longitude.errors }}
{% endif %}
- {% trans "location_longitude" %} {{ form.location_longitude }}
+ {% trans "Location Longitude" %} {{ form.location_longitude }}
@@ -63,21 +63,21 @@
{{ form.meta_license_name.errors }}
{% endif %}
- {% trans "meta_license_name" %} {{ form.meta_license_name }}
+ {% trans "Meta License Name" %} {{ form.meta_license_name }}
{% if form.located_at.errors %}
{{ form.located_at.errors }}
{% endif %}
- {% trans "located_at" %} {{ form.located_at }}
+ {% trans "Located At" %} {{ form.located_at }}
{% if form.has_deposit_capability.errors %}
{{ form.has_deposit_capability.errors }}
{% endif %}
- {% trans "has_deposit_capability" %} {{ form.has_deposit_capability }}
+ {% trans "Has Deposit Capability" %} {{ form.has_deposit_capability }}
@@ -87,7 +87,7 @@
{{ form.is_accessible.errors }}
{% endif %}
- {% trans "is_accessible" %} {{ form.is_accessible }}
+ {% trans "Is Accessible" %} {{ form.is_accessible }}
@@ -95,14 +95,14 @@
{{ form.accessibility_features.errors }}
{% endif %}
- {% trans "accessibility_features" %} {{ form.accessibility_features }}
+ {% trans "Accessibility Features" %} {{ form.accessibility_features }}
{% if form.more_info.errors %}
{{ form.more_info.errors }}
{% endif %}
- {% trans "more_info" %} {{ form.more_info }}
+ {% trans "More Info" %} {{ form.more_info }}
@@ -111,21 +111,21 @@
{% if form.notes.errors %}
{{ form.notes.errors }}
{% endif %}
- {% trans "notes" %} {{ form.notes }}
+ {% trans "Notes" %} {{ form.notes }}
{% if form.supported_languages.errors %}
{{ form.supported_languages.errors }}
{% endif %}
- {% trans "supported_languages" %} {{ form.supported_languages }}
+ {% trans "Supported Languages" %} {{ form.supported_languages }}
{% if form.supported_currencies.errors %}
{{ form.supported_currencies.errors }}
{% endif %}
- {% trans "supported_currencies" %} {{ form.supported_currencies }}
+ {% trans "Supported Currencies" %} {{ form.supported_currencies }}
@@ -134,7 +134,7 @@
{% if form.location_categories.errors %}
{{ form.location_categories.errors }}
{% endif %}
- {% trans "location_categories" %} {{ form.location_categories }}
+ {% trans "Location Categories" %} {{ form.location_categories }}
@@ -142,14 +142,14 @@
{{ form.minimum_withdrawal.errors }}
{% endif %}
- {% trans "minimum_withdrawal" %} {{ form.minimum_withdrawal }}
+ {% trans "Minimum Withdrawal" %} {{ form.minimum_withdrawal }}
{% if form.site_name.errors %}
{{ form.site_name.errors }}
{% endif %}
- {% trans "site_name" %} {{ form.site_name }}
+ {% trans "Site Name" %} {{ form.site_name }}
@@ -158,19 +158,19 @@
{% if form.branch_identification.errors %}
{{ form.branch_identification.errors }}
{% endif %}
- {% trans "branch_identification" %} {{ form.branch_identification }}
+ {% trans "Branch Identification" %} {{ form.branch_identification }}
{% if form.site_identification.errors %}
{{ form.site_identification.errors }}
{% endif %}
- {% trans "site_identification" %} {{ form.site_identification }}
+ {% trans "Site Identification" %} {{ form.site_identification }}
{% if form.cash_withdrawal_national_fee.errors %}
{{ form.cash_withdrawal_national_fee.errors }}
{% endif %}
-
@@ -180,14 +180,14 @@
{% if form.balance_inquiry_fee.errors %}
{{ form.balance_inquiry_fee.errors }}
{% endif %}
- {% trans "balance_inquiry_fee" %} {{ form.balance_inquiry_fee }}
+ {% trans "Balance Inquiry Fee" %} {{ form.balance_inquiry_fee }}
{% if form.cash_withdrawal_international_fee.errors %}
{{ form.cash_withdrawal_international_fee.errors }}
{% endif %}
- {% trans "cash_withdrawal_international_fee" %} {{ form.cash_withdrawal_international_fee }}
+ {% trans "Cash Withdrawal International Fee" %} {{ form.cash_withdrawal_international_fee }}
@@ -196,14 +196,14 @@
{% if form.address.errors %}
{{ form.address.errors }}
{% endif %}
- {% trans "address" %} {{ form.address }}
+ {% trans "Address" %} {{ form.address }}
{% if form.lobby.errors %}
{{ form.lobby.errors }}
{% endif %}
- {% trans "lobby" %} {{ form.lobby }}
+ {% trans "Lobby" %} {{ form.lobby }}
@@ -223,7 +223,7 @@
{% trans "Bank Id" %} |
{% trans "ATM Name" %} |
{% trans "More info" %} |
- {% trans "Update Button" %} |
+
{% for atm in atms_list %}
@@ -272,7 +272,7 @@
- Update |
+ View |
{% endfor %}
diff --git a/apimanager/atms/templates/atms/update.html b/apimanager/atms/templates/atms/update.html
index 9fac196..8fda4b8 100644
--- a/apimanager/atms/templates/atms/update.html
+++ b/apimanager/atms/templates/atms/update.html
@@ -1,6 +1,6 @@
{% extends 'base.html' %} {% load static %} {% block page_title %}{{ block.super }} / Atms{% endblock page_title %} {% block content %}
-
Update Atm
+
ATM Detail
{{ bank_id }} : {{ atm_id }}
diff --git a/apimanager/base/templates/home.html b/apimanager/base/templates/home.html
index d725a8e..6f0b13d 100644
--- a/apimanager/base/templates/home.html
+++ b/apimanager/base/templates/home.html
@@ -7,7 +7,7 @@
- {% trans "This app gives you access to management functionality for the sandbox at" %} {{ API_HOST }}. {% trans "You have to" %}{% trans "register" %} {% trans "an account before being able to proceed. The logged-in user needs to have specific roles granted to use the functionality." %}
+ {% trans "This app gives you access to management functionality for the OBP instance at" %} {{ API_HOST }}. {% trans "You have to" %}{% trans "register" %} {% trans "an account before being able to proceed. The logged-in user needs to have specific roles granted to use the functionality." %}
diff --git a/apimanager/customers/templates/customers/create.html b/apimanager/customers/templates/customers/create.html
index 991c31d..1eaf1a3 100644
--- a/apimanager/customers/templates/customers/create.html
+++ b/apimanager/customers/templates/customers/create.html
@@ -1,12 +1,13 @@
{% extends 'base.html' %}
{% load static %}
+{% load i18n %}
{% block page_title %}{{ block.super }} / Customers{% endblock page_title %}
{% block content %}
-
Create Customer
+
{% trans "Create Customer" %}