Merge pull request sshwsfc#152 from JoveYu/master

add app_label trans and fixed sshwsfc#143

Author: sshwsfc

xadmin/static/xadmin/js/xadmin.widget.select-transfer.js

@@ -182,7 +182,7 @@
         this.btn_add_all.toggleClass('disabled', this.from_box.find('option').length == 0);
         this.btn_remove_all.toggleClass('disabled', this.to_box.find('option').length == 0);
     },
-    filter_key_up: function(e) {
+    filter_key_up: function(event) {
       var from = this.from_box[0];
       // don't submit form if user pressed Enter
       if ((event.which && event.which == 13) || (event.keyCode && event.keyCode == 13)) {
@@ -196,7 +196,7 @@
       from.selectedIndex = temp;
       return true;
     },
-    filter_key_down: function(e) {
+    filter_key_down: function(event) {
       var from = this.from_box[0];
       if ((event.which && event.which == 13) || (event.keyCode && event.keyCode == 13)) {
         return false;
@@ -238,4 +238,4 @@
     f.find('.select-transfer').select_transfer();
   });
 
-})(jQuery)
+})(jQuery)

xadmin/templates/xadmin/includes/sitemenu_accordion.html

@@ -14,7 +14,7 @@ <h6 class="panel-title">
           {% if item.icon %}<i class="fa-fw {{item.icon}}"></i>
           {% elif item.first_icon %}<i class="fa-fw {{item.first_icon}}"></i>
           {%else%}<i class="fa-fw fa fa-circle-o"></i>{% endif %}
-          {{ item.title }}
+          {% trans item.title %}
           {% if item.url %}</a>{% endif %}
         </a>
       </h6>
@@ -30,4 +30,4 @@ <h6 class="panel-title">
   </div>
   {% endfor %}
 </div>
-{% endblock navbar_md %}
+{% endblock navbar_md %}