Merge remote-tracking branch 'origin/master'

weblate/html/admin/report.html

@@ -14,10 +14,10 @@
   {% for sp in subprojects %}
     <h3 id="{{ sp.get_full_slug }}"><a href="{{ sp.get_absolute_url }}">{{ sp }}</a></h3>
 {% if sp.is_repo_link %}
-<p>{% blocktrans with sp.repo as repo and sp.get_linked_repo.get_full_slug as slug %}Not showing status of linked repository. Check <a href="#{{ slug }}">{{ repo }}</a> instead.{% endblocktrans %}</p>
+<p>{% blocktrans with sp.repo as repo and sp.linked_subproject.get_full_slug as slug %}Not showing status of linked repository. Check <a href="#{{ slug }}">{{ repo }}</a> instead.{% endblocktrans %}</p>
 {% else %}
     <pre>
-{{ sp.get_repo.git.status }}
+{{ sp.git_repo.git.status }}
     </pre>
 {% endif %}
   {% endfor %}

weblate/html/js/git-status.html

@@ -51,12 +51,12 @@
 {% for sp in object.subproject_set.all %}
 <h4>{{ sp }}</h3>
 <pre>
-{{ sp.get_repo.git.status }}
+{{ sp.git_repo.git.status }}
 </pre>
 {% endfor %}
 {% else %}
 <pre>
-{{ object.get_repo.git.status }}
+{{ object.git_repo.git.status }}
 </pre>
 {% endif %}
 </div>

weblate/html/subproject_info.html

@@ -4,9 +4,9 @@
 {% include "project_info.html" %}
 {% endwith %}
 <p>{% trans "Git repository:" %} 
-<code>{% if object.is_repo_link %}{{ object.get_linked_repo.repo }}{% else %}{{ object.repo }}{% endif %}</code> (
+<code>{% if object.is_repo_link %}{{ object.linked_subproject.repo }}{% else %}{{ object.repo }}{% endif %}</code> (
 {% if object.is_repo_link %}
-{% blocktrans with object.get_linked_repo.branch as branch %}{{ branch }} branch{% endblocktrans %}
+{% blocktrans with object.linked_subproject.branch as branch %}{{ branch }} branch{% endblocktrans %}
 {% else %}
 {% blocktrans with object.branch as branch %}{{ branch }} branch{% endblocktrans %}
  @ 

weblate/trans/management/commands/checkgit.py

@@ -29,6 +29,5 @@ class Command(WeblateCommand):
         Shows status of git repository in given projects.
         '''
         for subproject in self.get_subprojects(*args, **options):
-            repo = subproject.get_repo()
             print '%s:' % subproject
-            print repo.git.status()
+            print subproject.git_repo.git.status()