Merge pull request #611 from whakama/master

dm overhaul
dimdenGD · Nov 23, 2023 · e842d11 · e842d11
2 parents 86cd1ae + 5545889
commit e842d11
Show file tree

Hide file tree

Showing 3 changed files with 511 additions and 197 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -582,5 +582,49 @@
     "uploaded": { "message": "Uploaded" },
     "hide_unfollowers_page": { "message": "Hide unfollowers page" },
 	"custom_font": { "message": "<CUSTOM>" },
-	"current_font": { "message": "Current font: $FONT$", "placeholders": { "font": { "content": "Arial" } } }
+	"current_font": { "message": "Current font: $FONT$", "placeholders": { "font": { "content": "Arial" } } },
+    "user_sent_photo": { "message": "$NAME$ sent a photo", "placeholders": { "name": { "content": "Display Name" } } },
+    "user_sent_video": { "message": "$NAME$ sent a video", "placeholders": { "name": { "content": "Display Name" } } },
+    "user_reacted_message": { "message": "$NAME$ reacted to message", "placeholders": { "name": { "content": "Display Name" } } },
+    "you_sent_photo": { "message": "You sent a photo" },
+    "you_sent_video": { "message": "You sent a video" },
+    "you_reacted_message": { "message": "You reacted to message" },
+    "user_added": { "message": "$A1$$USER_WHO_ADDED$$A_END$ added $A2$$USER_WHO_JOINED$$A_END$", "description": "This is used when a group admin adds a user to the group chat (display names)", "placeholders": {
+        "user_who_added": { "content": "Group Admin" },
+        "user_who_joined": { "content": "Group Admin's Friend" },
+        "a1": { "content": "<a href=\"/GroupAdmin\">" },
+        "a2": { "content": "<a href=\"/GroupAdminsFriend\">" },
+        "a_end": { "content": "</a>" }
+    } },
+    "user_left": { "message": "$A_START$$NAME$$A_END$ left", "description": "This is used when a user in a group leaves (display name)", "placeholders": {
+        "name": { "content": "Group Admin's Friend" },
+        "a_start": { "content": "<a href=\"/@GroupAdminsFriend\">" },
+        "a_end": { "content": "</a>" }
+    } },
+    "user_changed_group_photo": { "message": "$A_START$$NAME$$A_END$ changed the group photo", "description": "This is used when a user in a group changes the group photo (display name)", "placeholders": {
+        "name": { "content": "Group Admin" },
+        "a_start": { "content": "<a href=\"/GroupAdmin\">" },
+        "a_end": { "content": "</a>" }
+    } },
+    "user_changed_group_name": { "message": "$A_START$$NAME$$A_END$ changed the group name to $GROUP_NAME$", "description": "This is used when a user in a group changes the group name (display name)", "placeholders": {
+        "name": { "content": "Group Admin" },
+        "group_name": { "content": "Example Group" },
+        "a_start": { "content": "<a href=\"/GroupAdmin\">" },
+        "a_end": { "content": "</a>" }
+    } },
+    "user_added_you_inbox": { "message": "$NAME$ added you", "description": "This is used when a group admin adds you to the group chat (display names, inbox list only)", "placeholders": {
+        "name": { "content": "Group Admin" }
+    } },
+    "user_added_you_msg": {
+        "message": "$A_START$$NAME$$A_END$ added you<br>There are $NUMBER$ other people in this group",
+        "description": "This is used when a group admin adds you to the group chat (display names, messages only)",
+        "example": "<a href=\"/GroupAdmin\">Group Admin</a> added you<br>There are 6 other people in this group",
+        "placeholders": {
+            "name": { "content": "Group Admin" },
+            "number": { "content": "6" },
+            "a_start": { "content": "<a href=\"/GroupAdmin\">" },
+            "a_end": { "content": "</a>" }
+        }
+    },
+    "accepted_conversation": { "message": "Accepted conversation" }
 }