From b1490922346df017a408ee37a1b4aa2e7583304c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Mon, 27 Nov 2017 23:26:56 -0200
Subject: [PATCH] Remove templates/display/import/charset.twig
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move display/import/charset template into display/import/file_option template.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 templates/display/import/charset.twig     | 26 -----------------
 templates/display/import/file_option.twig | 34 ++++++++++++++++++-----
 2 files changed, 27 insertions(+), 33 deletions(-)
 delete mode 100644 templates/display/import/charset.twig

diff --git a/templates/display/import/charset.twig b/templates/display/import/charset.twig
deleted file mode 100644
index 8f2d3b0c1c..0000000000
--- a/templates/display/import/charset.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="formelementrow" id="charaset_of_file">
-    {# Charset of file #}
-    <label for="charset_of_file">{% trans 'Character set of the file:' %}</label>
-    {% if is_encoding_supported %}
-        <select id="charset_of_file" name="charset_of_file" size="1">
-            {% for charset in encodings %}
-                <option value="{{ charset }}"
-                    {% if (import_charset is empty and charset == 'utf-8')
-                        or charset == import_charset %}
-                        selected="selected"
-                    {% endif %}>
-                    {{ charset }}
-                </option>
-            {% endfor %}
-        </select>
-    {% else %}
-        {{ Charsets_getCharsetDropdownBox(
-            dbi,
-            disable_is,
-            'charset_of_file',
-            'charset_of_file',
-            'utf8',
-            false
-        ) }}
-    {% endif %}
-</div>
diff --git a/templates/display/import/file_option.twig b/templates/display/import/file_option.twig
index ca5d68a7b0..b703595ba4 100644
--- a/templates/display/import/file_option.twig
+++ b/templates/display/import/file_option.twig
@@ -34,11 +34,31 @@
             ) }}
         {% endif %}
     </div>
-    {% include 'display/import/charset.twig' with {
-        'is_encoding_supported': is_encoding_supported,
-        'encodings': encodings,
-        'import_charset': import_charset,
-        'dbi': dbi,
-        'disable_is': disable_is
-    } only %}
+
+    <div class="formelementrow" id="charaset_of_file">
+        {# Charset of file #}
+        <label for="charset_of_file">{% trans 'Character set of the file:' %}</label>
+        {% if is_encoding_supported %}
+            <select id="charset_of_file" name="charset_of_file" size="1">
+                {% for charset in encodings %}
+                    <option value="{{ charset }}"
+                        {% if (import_charset is empty and charset == 'utf-8')
+                            or charset == import_charset %}
+                            selected="selected"
+                        {% endif %}>
+                        {{ charset }}
+                    </option>
+                {% endfor %}
+            </select>
+        {% else %}
+            {{ Charsets_getCharsetDropdownBox(
+                dbi,
+                disable_is,
+                'charset_of_file',
+                'charset_of_file',
+                'utf8',
+                false
+            ) }}
+        {% endif %}
+    </div>
 </div>