diff options
Diffstat (limited to 'mediagoblin/db')
| -rw-r--r-- | mediagoblin/db/mixin.py | 2 | ||||
| -rw-r--r-- | mediagoblin/db/models.py | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index aec35fc7..39690cfc 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -410,7 +410,7 @@ class ActivityMixin(object): "like": {"simple": _("{username} liked {object}")}, "post": { "simple": _("{username} posted {object}"), - "targetted": _("{username} posted {object} to {targetted}"), + "targetted": _("{username} posted {object} to {target}"), }, "share": {"simple": _("{username} shared {object}")}, "unfavorite": {"simple": _("{username} unfavorited {object}")}, diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 4d7830d2..ffd7b4f1 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -1070,6 +1070,12 @@ class Generator(Base): updated = Column(DateTime, default=datetime.datetime.now) object_type = Column(Unicode, nullable=False) + def __repr__(self): + return "<{klass} {name}>".format( + klass=self.__class__.__name__, + name=self.name + ) + def serialize(self, request): return { "id": self.id, @@ -1168,6 +1174,18 @@ class Activity(Base, ActivityMixin): foreign_keys="Activity.actor", post_update=True) get_generator = relationship(Generator) + def __repr__(self): + if self.content is None: + return "<{klass} verb:{verb}>".format( + klass=self.__class__.__name__, + verb=self.verb + ) + else: + return "<{klass} {content}>".format( + klass=self.__class__.__name__, + content=self.content + ) + @property def get_object(self): if self.object is None: |