X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f98d5c205ae1f16fdd3990a0bd82c0827f1cdd28..ec5b493bff5efa683aadf5f78aa891eff3550156:/apps/dvcs/models.py diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py index f4cb5197..ec647946 100644 --- a/apps/dvcs/models.py +++ b/apps/dvcs/models.py @@ -6,8 +6,8 @@ from django.core.files.base import ContentFile from django.core.files.storage import FileSystemStorage from django.db import models, transaction from django.db.models.base import ModelBase -from django.utils.translation import ugettext_lazy as _ -from mercurial import mdiff, simplemerge +from django.utils.translation import string_concat, ugettext_lazy as _ +from mercurial import simplemerge from django.conf import settings from dvcs.signals import post_commit, post_publishable @@ -26,8 +26,6 @@ class Tag(models.Model): class Meta: abstract = True ordering = ['ordering'] - verbose_name = _("tag") - verbose_name_plural = _("tags") def __unicode__(self): return self.name @@ -99,8 +97,6 @@ class Change(models.Model): abstract = True ordering = ('created_at',) unique_together = ['tree', 'revision'] - verbose_name = _("change") - verbose_name_plural = _("changes") def __unicode__(self): return u"Id: %r, Tree %r, Parent %r, Data: %s" % (self.id, self.tree_id, self.parent_id, self.data) @@ -175,6 +171,10 @@ def create_tag_model(model): class Meta(Tag.Meta): app_label = model._meta.app_label + verbose_name = string_concat(_("tag"), " ", _("for:"), " ", + model._meta.verbose_name) + verbose_name_plural = string_concat(_("tags"), " ", _("for:"), " ", + model._meta.verbose_name) attrs = { '__module__': model.__module__, @@ -189,6 +189,10 @@ def create_change_model(model): class Meta(Change.Meta): app_label = model._meta.app_label + verbose_name = string_concat(_("change"), " ", _("for:"), " ", + model._meta.verbose_name) + verbose_name_plural = string_concat(_("changes"), " ", _("for:"), " ", + model._meta.verbose_name) attrs = { '__module__': model.__module__,