Fix 1e0c938 by allowing target to be translatable in Activity.content
This commit is contained in:
parent
1e0c938c63
commit
7eac1e6d6b
@ -443,22 +443,30 @@ class ActivityMixin(object):
|
|||||||
|
|
||||||
# Decide what to fill the object with
|
# Decide what to fill the object with
|
||||||
if hasattr(obj, "title") and obj.title.strip(" "):
|
if hasattr(obj, "title") and obj.title.strip(" "):
|
||||||
object = obj.title
|
object_value = obj.title
|
||||||
elif obj.object_type in object_map:
|
elif obj.object_type in object_map:
|
||||||
object = object_map[obj.object_type]
|
object_value = object_map[obj.object_type]
|
||||||
else:
|
else:
|
||||||
object = _("an object")
|
object_value = _("an object")
|
||||||
|
|
||||||
|
# Do we want to add a target (indirect object) to content?
|
||||||
|
if target is not None and "targetted" in content:
|
||||||
|
if hasattr(target, "title") and target.title.strip(" "):
|
||||||
|
target_value = target.title
|
||||||
|
elif target.object_type in object_map:
|
||||||
|
target_value = object_map[target.object_type]
|
||||||
|
else:
|
||||||
|
target_value = _("an object")
|
||||||
|
|
||||||
if target is None or "targetted" not in content:
|
|
||||||
self.content = content["simple"].format(
|
|
||||||
username=actor.username,
|
|
||||||
object=object
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
self.content = content["targetted"].format(
|
self.content = content["targetted"].format(
|
||||||
username=actor.username,
|
username=actor.username,
|
||||||
object=object,
|
object=object_value,
|
||||||
target=target.object_type,
|
target=target_value
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
self.content = content["simple"].format(
|
||||||
|
username=actor.username,
|
||||||
|
object=object_value
|
||||||
)
|
)
|
||||||
|
|
||||||
return self.content
|
return self.content
|
||||||
|
Loading…
x
Reference in New Issue
Block a user