Merge branch 'feature/notifications' into dev
This commit is contained in:
@@ -51,16 +51,16 @@ public class WikiEvent extends Event<WikiPage>{
|
||||
}
|
||||
|
||||
public Translatable describeDelete(){
|
||||
return t("The wiki page '{page}' has been deleted by {user}", "page", payload().id(), USER, initiator().name());
|
||||
return t("The wiki page '{page}' has been deleted by {user}", "page", payload().title(), USER, initiator().name());
|
||||
}
|
||||
|
||||
public Translatable describeMemberAdded(){
|
||||
var head = t("'{name}' has been added to '{object}' by '{user}'.",NAME,newMember.name(), OBJECT,payload().id(),USER,initiator().name());
|
||||
var head = t("'{name}' has been added to '{object}' by '{user}'.",NAME,newMember.name(), OBJECT,payload().title(),USER,initiator().name());
|
||||
return t("{head}\n\n{link}","head",head,"link",link());
|
||||
}
|
||||
|
||||
private Translatable describeUpdate() {
|
||||
var head = t("Changes in wiki page '{id}':\n\n{body}",Field.ID,payload().id(),BODY,diff().orElse(""));
|
||||
var head = t("Changes in wiki page '{id}':\n\n{body}",Field.ID,payload().title(),BODY,diff().orElse(""));
|
||||
return t("{head}\n\n{link}","head",head,"link",link());
|
||||
}
|
||||
|
||||
@@ -72,9 +72,9 @@ public class WikiEvent extends Event<WikiPage>{
|
||||
@Override
|
||||
public Translatable subject() {
|
||||
return switch (eventType()){
|
||||
case CREATE -> t("The wiki page '{name}' has been created", Field.NAME, payload().id());
|
||||
case DELETE -> t("The wiki page '{name}' has been deleted",Field.NAME, payload().id());
|
||||
case MEMBER_ADDED, UPDATE -> t("wiki page '{name}' was edited",Field.NAME,payload().id());
|
||||
case CREATE -> t("The wiki page '{name}' has been created", Field.NAME, payload().title());
|
||||
case DELETE -> t("The wiki page '{name}' has been deleted",Field.NAME, payload().title());
|
||||
case MEMBER_ADDED, UPDATE -> t("wiki page '{name}' was edited",Field.NAME,payload().title());
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user