From 8be9a4b2e311de9e833f3a6f4e7d82a0fdf04649 Mon Sep 17 00:00:00 2001 From: Daniel Roschka Date: Thu, 26 Mar 2015 22:13:42 +0100 Subject: [PATCH] Renaming all templates from *.htm to *.html When using Djangos "makemessages" command to collect strings for i18n it only considers templates with a file extenions of .txt and .html by default. For more details see: https://docs.djangoproject.com/en/dev/topics/i18n/translation/#message-files Also when Django is refering to default template names (e.g. for error handling or accounts) it always refers to file names with .html as file extension. To avoid hassle in the future this commit aligns the file extension used for templates to Djangos default of .html. --- binder/templates/{base.htm => base.html} | 0 ...rd_form.htm => add_cname_record_form.html} | 2 +- ...d_record_form.htm => add_record_form.html} | 2 +- ...initial.htm => delete_record_initial.html} | 2 +- ...erver_zones.htm => list_server_zones.html} | 2 +- .../{list_servers.htm => list_servers.html} | 2 +- .../bcommon/{list_zone.htm => list_zone.html} | 2 +- ...sponse_result.htm => response_result.html} | 2 +- binder/templates/{index.htm => index.html} | 2 +- binder/views.py | 26 +++++++++---------- 10 files changed, 21 insertions(+), 21 deletions(-) rename binder/templates/{base.htm => base.html} (100%) rename binder/templates/bcommon/{add_cname_record_form.htm => add_cname_record_form.html} (98%) rename binder/templates/bcommon/{add_record_form.htm => add_record_form.html} (99%) rename binder/templates/bcommon/{delete_record_initial.htm => delete_record_initial.html} (98%) rename binder/templates/bcommon/{list_server_zones.htm => list_server_zones.html} (96%) rename binder/templates/bcommon/{list_servers.htm => list_servers.html} (95%) rename binder/templates/bcommon/{list_zone.htm => list_zone.html} (98%) rename binder/templates/bcommon/{response_result.htm => response_result.html} (92%) rename binder/templates/{index.htm => index.html} (77%) diff --git a/binder/templates/base.htm b/binder/templates/base.html similarity index 100% rename from binder/templates/base.htm rename to binder/templates/base.html diff --git a/binder/templates/bcommon/add_cname_record_form.htm b/binder/templates/bcommon/add_cname_record_form.html similarity index 98% rename from binder/templates/bcommon/add_cname_record_form.htm rename to binder/templates/bcommon/add_cname_record_form.html index b21f269..acc3485 100644 --- a/binder/templates/bcommon/add_cname_record_form.htm +++ b/binder/templates/bcommon/add_cname_record_form.html @@ -1,4 +1,4 @@ -{% extends "base.htm" %} +{% extends "base.html" %} {% block pageheader %}Add CNAME record for {{ originating_record }}{% endblock pageheader %} diff --git a/binder/templates/bcommon/add_record_form.htm b/binder/templates/bcommon/add_record_form.html similarity index 99% rename from binder/templates/bcommon/add_record_form.htm rename to binder/templates/bcommon/add_record_form.html index 5017019..912eb6f 100644 --- a/binder/templates/bcommon/add_record_form.htm +++ b/binder/templates/bcommon/add_record_form.html @@ -1,4 +1,4 @@ -{% extends "base.htm" %} +{% extends "base.html" %} {% block pageheader %}Add record in {{ zone_name }}{% endblock pageheader %} diff --git a/binder/templates/bcommon/delete_record_initial.htm b/binder/templates/bcommon/delete_record_initial.html similarity index 98% rename from binder/templates/bcommon/delete_record_initial.htm rename to binder/templates/bcommon/delete_record_initial.html index e29760b..9d05e74 100644 --- a/binder/templates/bcommon/delete_record_initial.htm +++ b/binder/templates/bcommon/delete_record_initial.html @@ -1,4 +1,4 @@ -{% extends "base.htm" %} +{% extends "base.html" %} {% block pageheader %}Delete record(s) in {{ zone_name }}{% endblock pageheader %} diff --git a/binder/templates/bcommon/list_server_zones.htm b/binder/templates/bcommon/list_server_zones.html similarity index 96% rename from binder/templates/bcommon/list_server_zones.htm rename to binder/templates/bcommon/list_server_zones.html index 4522f1f..c21f713 100644 --- a/binder/templates/bcommon/list_server_zones.htm +++ b/binder/templates/bcommon/list_server_zones.html @@ -1,4 +1,4 @@ -{% extends "base.htm" %} +{% extends "base.html" %} {% block pageheader %}Server Zone List for {{ dns_server.hostname }}{% endblock pageheader %} diff --git a/binder/templates/bcommon/list_servers.htm b/binder/templates/bcommon/list_servers.html similarity index 95% rename from binder/templates/bcommon/list_servers.htm rename to binder/templates/bcommon/list_servers.html index 70181c9..9156d1f 100644 --- a/binder/templates/bcommon/list_servers.htm +++ b/binder/templates/bcommon/list_servers.html @@ -1,4 +1,4 @@ -{% extends "base.htm" %} +{% extends "base.html" %} {% block pageheader %}Server List{% endblock pageheader %} diff --git a/binder/templates/bcommon/list_zone.htm b/binder/templates/bcommon/list_zone.html similarity index 98% rename from binder/templates/bcommon/list_zone.htm rename to binder/templates/bcommon/list_zone.html index 68f7cfb..e00547d 100644 --- a/binder/templates/bcommon/list_zone.htm +++ b/binder/templates/bcommon/list_zone.html @@ -1,4 +1,4 @@ -{% extends "base.htm" %} +{% extends "base.html" %} {% block pageheader %}Zone listing for {{ zone_name }} on {{ dns_server.hostname }}{% endblock pageheader %} diff --git a/binder/templates/bcommon/response_result.htm b/binder/templates/bcommon/response_result.html similarity index 92% rename from binder/templates/bcommon/response_result.htm rename to binder/templates/bcommon/response_result.html index e499ffb..f52cbbd 100644 --- a/binder/templates/bcommon/response_result.htm +++ b/binder/templates/bcommon/response_result.html @@ -1,4 +1,4 @@ -{% extends "base.htm" %} +{% extends "base.html" %} {% block pageheader %}Record Result{% endblock pageheader %} diff --git a/binder/templates/index.htm b/binder/templates/index.html similarity index 77% rename from binder/templates/index.htm rename to binder/templates/index.html index a67a5c6..87b781b 100644 --- a/binder/templates/index.htm +++ b/binder/templates/index.html @@ -1,4 +1,4 @@ -{% extends "base.htm" %} +{% extends "base.html" %} {% block pageheader %}Home{% endblock pageheader %} diff --git a/binder/views.py b/binder/views.py index 9ac1c7e..7047df1 100644 --- a/binder/views.py +++ b/binder/views.py @@ -9,7 +9,7 @@ import local_settings def home_index(request): """ List the main index page for Binder. """ - return render(request, "index.htm") + return render(request, "index.html") def view_server_list(request): @@ -19,7 +19,7 @@ def view_server_list(request): for current in server_list: server_info.append({"host_name" : current, "ip_address" : helpers.ip_info(current.hostname)}) - return render(request, "bcommon/list_servers.htm", + return render(request, "bcommon/list_servers.html", { "server_info" : server_info}) @@ -37,7 +37,7 @@ def view_server_zones(request, dns_server): except exceptions.ZoneException, err: errors = "Unable to list server zones. Error: %s" % err - return render(request, "bcommon/list_server_zones.htm", + return render(request, "bcommon/list_server_zones.html", { "errors" : errors, "dns_server" : this_server, "zone_array" : zone_array}) @@ -51,14 +51,14 @@ def view_zone_records(request, dns_server, zone_name): try: zone_array = this_server.list_zone_records(zone_name) except exceptions.TransferException, err: - return render(request, "bcommon/list_zone.htm", + return render(request, "bcommon/list_zone.html", { "errors" : err, "zone_name" : zone_name, "dns_server" : this_server}) except models.BindServer.DoesNotExist: errors = "Requesting a zone listing for a Bind server that is not configured: %s" % dns_server - return render(request, "bcommon/list_zone.htm", + return render(request, "bcommon/list_zone.html", { "zone_array" : zone_array, "dns_server" : this_server, "zone_name" : zone_name, @@ -69,7 +69,7 @@ def view_add_record(request, dns_server, zone_name): """ View to provide form to add a DNS record. """ this_server = models.BindServer.objects.get(hostname=dns_server) - return render(request, "bcommon/add_record_form.htm", + return render(request, "bcommon/add_record_form.html", { "dns_server" : this_server, "zone_name" : zone_name, "tsig_keys" : models.Key.objects.all(), @@ -109,13 +109,13 @@ def view_add_record_result(request): # What would cause this? errors = err - return render(request, "bcommon/response_result.htm", + return render(request, "bcommon/response_result.html", { "errors" : errors, "response" : response }) dns_server = models.BindServer.objects.get(hostname=request.POST["dns_server"]) - return render(request, "bcommon/add_record_form.htm", + return render(request, "bcommon/add_record_form.html", { "dns_server" : dns_server, "zone_name" : request.POST["zone_name"], "tsig_keys" : models.Key.objects.all(), @@ -130,7 +130,7 @@ def view_add_cname_record(request, dns_server, zone_name, record_name): this_server = models.BindServer.objects.get(hostname=dns_server) - return render(request, "bcommon/add_cname_record_form.htm", + return render(request, "bcommon/add_cname_record_form.html", { "dns_server" : this_server, "originating_record" : "%s.%s" % (record_name, zone_name), "zone_name" : zone_name, @@ -159,13 +159,13 @@ def view_add_cname_result(request): except exceptions.RecordException, err: errors = err - return render(request, "bcommon/response_result.htm", + return render(request, "bcommon/response_result.html", {"response" : add_cname_response, "errors" : errors }) dns_server = models.BindServer.objects.get(hostname=request.POST["dns_server"]) - return render(request, "bcommon/add_cname_record_form.htm", + return render(request, "bcommon/add_cname_record_form.html", { "dns_server" : dns_server, "zone_name" : request.POST["zone_name"], "record_name" : request.POST["cname"], @@ -185,7 +185,7 @@ def view_delete_record(request): zone_name = request.POST["zone_name"] rr_list = request.POST.getlist("rr_list") - return render(request, "bcommon/delete_record_initial.htm", + return render(request, "bcommon/delete_record_initial.html", { "dns_server" : dns_server, "zone_name" : zone_name, "rr_list" : rr_list, @@ -210,5 +210,5 @@ def view_delete_result(request): clean_form["rr_list"], clean_form["key_name"]) - return render(request, "bcommon/response_result.htm", + return render(request, "bcommon/response_result.html", { "response" : delete_result })