From 6717fd0d3330e6571d1094031ef1fd2a3b8b8611 Mon Sep 17 00:00:00 2001
From: clash99 <clash@cadasta.org>
Date: Thu, 1 Jun 2017 22:43:07 -0500
Subject: [PATCH] Adjusted date picker localization file url

Simplified code
---
 cadasta/templates/party/party_add.html          | 5 +----
 cadasta/templates/party/party_edit.html         | 5 +----
 cadasta/templates/party/relationship_edit.html  | 5 +----
 cadasta/templates/spatial/location_add.html     | 5 +----
 cadasta/templates/spatial/location_edit.html    | 5 +----
 cadasta/templates/spatial/relationship_add.html | 5 +----
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/cadasta/templates/party/party_add.html b/cadasta/templates/party/party_add.html
index c86c5329f..e04fd779c 100644
--- a/cadasta/templates/party/party_add.html
+++ b/cadasta/templates/party/party_add.html
@@ -14,10 +14,7 @@
 {{ form.media }}
 <script src="{% static 'js/jquery-ui.min.js' %}"></script>
 <script src="{% static 'js/form_submit.js' %}"></script>
-{% if get_current_language != "en-us" %}
-{% get_current_language as LANGUAGE_CODE %}
-<script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}.js"></script>
-{% endif %}
+<script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}{% if LANGUAGE_CODE == 'en' %}-GB{% endif %}.js"></script>
 <script>
   $(document).ready(function () {
     $('.datepicker').datepicker({
diff --git a/cadasta/templates/party/party_edit.html b/cadasta/templates/party/party_edit.html
index 2833dfa85..5951d8c61 100644
--- a/cadasta/templates/party/party_edit.html
+++ b/cadasta/templates/party/party_edit.html
@@ -14,10 +14,7 @@
 {{ form.media }}
 <script src="{% static 'js/jquery-ui.min.js' %}"></script>
 <script src="{% static 'js/form_submit.js' %}"></script>
-{% if get_current_language != "en-us" %}
-{% get_current_language as LANGUAGE_CODE %}
-<script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}.js"></script>
-{% endif %}
+<script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}{% if LANGUAGE_CODE == 'en' %}-GB{% endif %}.js"></script>
 <script>
   $(document).ready(function () {
     $('.datepicker').datepicker({
diff --git a/cadasta/templates/party/relationship_edit.html b/cadasta/templates/party/relationship_edit.html
index 78d8f9661..74e0666a6 100644
--- a/cadasta/templates/party/relationship_edit.html
+++ b/cadasta/templates/party/relationship_edit.html
@@ -15,10 +15,7 @@
 {{ block.super }}
 {{ form.media }}
 <script src="{% static 'js/jquery-ui.min.js' %}"></script>
-{% if get_current_language != "en-us" %}
-{% get_current_language as LANGUAGE_CODE %}
-<script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}.js"></script>
-{% endif %}
+<script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}{% if LANGUAGE_CODE == 'en' %}-GB{% endif %}.js"></script>
 <script>
   $(document).ready(function () {
     $('.datepicker').datepicker({
diff --git a/cadasta/templates/spatial/location_add.html b/cadasta/templates/spatial/location_add.html
index e18749c09..b8209eefd 100644
--- a/cadasta/templates/spatial/location_add.html
+++ b/cadasta/templates/spatial/location_add.html
@@ -28,10 +28,7 @@
 <script src="{% static 'js/leaflet.markercluster.js' %}"></script>
 <script src="{% static 'js/L.Map.Deflate.js' %}"></script>
 <script src="{% static 'js/jquery-ui.min.js' %}"></script>
-{% if get_current_language != "en-us" %}
-{% get_current_language as LANGUAGE_CODE %}
-<script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}.js"></script>
-{% endif %}
+<script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}{% if LANGUAGE_CODE == 'en' %}-GB{% endif %}.js"></script>
 <script src="{% static 'js/map_utils.js' %}"></script>
 <script src="{% static 'js/form_submit.js' %}"></script>
 <script>
diff --git a/cadasta/templates/spatial/location_edit.html b/cadasta/templates/spatial/location_edit.html
index b40396e2a..c28186753 100644
--- a/cadasta/templates/spatial/location_edit.html
+++ b/cadasta/templates/spatial/location_edit.html
@@ -25,10 +25,7 @@
 <script src="{% static 'js/leaflet.markercluster.js' %}"></script>
 <script src="{% static 'js/L.Map.Deflate.js' %}"></script>
 <script src="{% static 'js/jquery-ui.min.js' %}"></script>
-{% if get_current_language != "en-us" %}
-{% get_current_language as LANGUAGE_CODE %}
-<script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}.js"></script>
-{% endif %}
+<script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}{% if LANGUAGE_CODE == 'en' %}-GB{% endif %}.js"></script>
 <script src="{% static 'js/map_utils.js' %}"></script>
 <script src="{% static 'js/form_submit.js' %}"></script>
 <script>
diff --git a/cadasta/templates/spatial/relationship_add.html b/cadasta/templates/spatial/relationship_add.html
index 1a7ff345c..0bc87d490 100644
--- a/cadasta/templates/spatial/relationship_add.html
+++ b/cadasta/templates/spatial/relationship_add.html
@@ -20,10 +20,7 @@
   <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.min.js"></script>
   <script src="{% static 'js/form_submit.js' %}"></script>
   <script src="{% static 'js/jquery-ui.min.js' %}"></script>
-  {% if get_current_language != "en-us" %}
-  {% get_current_language as LANGUAGE_CODE %}
-  <script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}.js"></script>
-  {% endif %}
+  <script src="https://cdn.rawgit.com/jquery/jquery-ui/1.12.1/ui/i18n/datepicker-{{ LANGUAGE_CODE }}{% if LANGUAGE_CODE == 'en' %}-GB{% endif %}.js"></script>
   <script>
 $(document).ready(function() {
   var template = function(party) {