From 58745368497e9d7f76b8e9b3ef416348c514f9c5 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 2 Aug 2018 18:18:26 +0100
Subject: [PATCH] Remove spurious uses of unlocalize filter on widget ID

These were added in #3478 to ensure that numeric object IDs would not be affected by local number formatting; however, within widget templates, attrs.id refers to a string identifier, not a numeric ID.
---
 .../admin/templates/wagtailadmin/widgets/chooser.html |  4 +---
 .../templates/table_block/widgets/table.html          | 11 +++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/wagtail/admin/templates/wagtailadmin/widgets/chooser.html b/wagtail/admin/templates/wagtailadmin/widgets/chooser.html
index c24b12b4e..c3c970081 100644
--- a/wagtail/admin/templates/wagtailadmin/widgets/chooser.html
+++ b/wagtail/admin/templates/wagtailadmin/widgets/chooser.html
@@ -1,5 +1,3 @@
-{% load i18n %}
-{% load l10n %}
 {% comment %}
     Either the chosen or unchosen div will be shown, depending on the presence
     of the 'blank' class on the container.
@@ -8,7 +6,7 @@
     when clicked.
 {% endcomment %}
 
-<div id="{{ attrs.id|unlocalize }}-chooser" class="chooser {% block chooser_class %}page-chooser{% endblock %} {% if not value %}blank{% endif %}">
+<div id="{{ attrs.id }}-chooser" class="chooser {% block chooser_class %}page-chooser{% endblock %} {% if not value %}blank{% endif %}">
 
     <div class="chosen">
         {% block chosen_state_view %}{% endblock %}
diff --git a/wagtail/contrib/table_block/templates/table_block/widgets/table.html b/wagtail/contrib/table_block/templates/table_block/widgets/table.html
index 3d3c6007e..96b59905e 100644
--- a/wagtail/contrib/table_block/templates/table_block/widgets/table.html
+++ b/wagtail/contrib/table_block/templates/table_block/widgets/table.html
@@ -1,24 +1,23 @@
 {% load i18n %}
-{% load l10n %}
 <div class="field boolean_field widget-checkbox_input">
-    <label for="{{ attrs.id|unlocalize }}-handsontable-header">{%  trans 'Row header' %}</label>
+    <label for="{{ attrs.id }}-handsontable-header">{%  trans 'Row header' %}</label>
     <div class="field-content">
         <div class="input">
-            <input type="checkbox" id="{{ attrs.id|unlocalize }}-handsontable-header" name="handsontable-header"/>
+            <input type="checkbox" id="{{ attrs.id }}-handsontable-header" name="handsontable-header"/>
         </div>
         <p class="help">{% trans 'Display the first row as a header.' %}</p>
     </div>
 </div>
 <br/>
 <div class="field boolean_field widget-checkbox_input">
-    <label for="{{ attrs.id|unlocalize }}-handsontable-col-header">{%  trans 'Column header' %}</label>
+    <label for="{{ attrs.id }}-handsontable-col-header">{%  trans 'Column header' %}</label>
     <div class="field-content">
         <div class="input">
-            <input type="checkbox" id="{{ attrs.id|unlocalize }}-handsontable-col-header" name="handsontable-col-header"/>
+            <input type="checkbox" id="{{ attrs.id }}-handsontable-col-header" name="handsontable-col-header"/>
         </div>
         <p class="help">{% trans 'Display the first column as a header.' %}</p>
     </div>
 </div>
 <br/>
-<div id="{{ attrs.id|unlocalize }}-handsontable-container"></div>
+<div id="{{ attrs.id }}-handsontable-container"></div>
 {{ original_field_html }}