Merge pull request #570 from YennyQ/django2

Fix Django2.0 issue #449

Author: wgbbiao

xadmin/templates/xadmin/blocks/comm.top.setlang.html

@@ -3,7 +3,7 @@
 <li class="dropdown g-setlang">
   <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
   <i class="fa fa-globe"></i> <span class="hide-sm">
-    {% get_language_info for LANGUAGE_CODE as l %}{{ l.name_local }}
+    {% get_current_language as l %}{{ l.name_local }}
     <i class="caret"></i></span></a>
   <form id="setlang-form" action="{% url 'xadmin:set_language' %}" method="post" style="display:none;">
     {% csrf_token %}

xadmin/widgets.py

@@ -72,7 +72,7 @@ def __init__(self, attrs=None):
         forms.MultiWidget.__init__(self, widgets, attrs)
 
     def render(self, name, value, attrs=None):
-        input_html = [ht for ht in super(AdminSplitDateTime, self).render(name, value, attrs).split('\n') if ht != '']
+        input_html = [ht for ht in super(AdminSplitDateTime, self).render(name, value, attrs).replace('/><input', '/>\n<input').split('\n') if ht != '']
         # return input_html
         return mark_safe('<div class="datetime clearfix"><div class="input-group date bootstrap-datepicker"><span class="input-group-addon"><i class="fa fa-calendar"></i></span>%s'
                          '<span class="input-group-btn"><button class="btn btn-default" type="button">%s</button></span></div>'