Merge remote-tracking branch 'origin/master'

weblate/media/js/loader.js

@@ -300,6 +300,9 @@ $(function() {
             if ($panel.is(":empty")) {
                 $panel.append("<div class='tab-loading'>" + gettext("Loading…") + "</div>");
             }
+            ui.jqXHR.error(function() {
+                $panel.find('.tab-loading').html(gettext("AJAX request to load this content has failed!"));
+            });
         },
         load: function (e, ui) {
             $('a.mergebutton').button({text: true, icons: { primary: "ui-icon-check" }});
@@ -349,6 +352,10 @@ $(function() {
             if ($panel.is(":empty")) {
                 $panel.append("<div class='tab-loading'>" + gettext("Loading…") + "</div>");
             }
+            ui.jqXHR.error(function() {
+                $panel.find('.tab-loading').html(gettext("AJAX request to load this content has failed!"));
+            });
+
         },
     });
     $("#id_date").datepicker();

weblate/trans/models.py

@@ -1132,6 +1132,12 @@ class SubProject(models.Model):
         if (self.id):
             old = SubProject.objects.get(pk=self.id)
             changed_git = (old.repo != self.repo) or (old.branch != self.branch) or (old.filemask != self.filemask)
+            # Detect slug changes and rename git repo
+            if old.slug != self.slug:
+                os.rename(
+                    old.get_path(),
+                    self.get_path()
+                )
 
         # Configure git repo if there were changes
         if changed_git: