[IMPROVE] System messages' consistency

apps/meteor/app/channel-settings/server/functions/saveRoomType.js

@@ -41,11 +41,11 @@ export const saveRoomType = function (rid, roomType, user, sendMessage = true) {
 	if (sendMessage) {
 		let message;
 		if (roomType === 'c') {
-			message = TAPi18n.__('Channel', {
+			message = TAPi18n.__('public', {
 				lng: (user && user.language) || settings.get('Language') || 'en',
 			});
 		} else {
-			message = TAPi18n.__('Private_Group', {
+			message = TAPi18n.__('private', {
 				lng: (user && user.language) || settings.get('Language') || 'en',
 			});
 		}

apps/meteor/app/lib/lib/MessageTypes.ts

@@ -7,29 +7,27 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'r',
 		system: true,
-		message: 'Room_name_changed',
+		message: 'Room_name_changed_to',
 		data(message) {
 			return {
 				room_name: message.msg,
-				user_by: message.u.username,
 			};
 		},
 	});
 	MessageTypes.registerType({
 		id: 'au',
 		system: true,
-		message: 'User_added_by',
+		message: 'User_added_to',
 		data(message) {
 			return {
 				user_added: message.msg,
-				user_by: message.u.username,
 			};
 		},
 	});
 	MessageTypes.registerType({
 		id: 'added-user-to-team',
 		system: true,
-		message: 'Added__username__to_team',
+		message: 'Added__username__to_this_team',
 		data(message) {
 			return {
 				user_added: message.msg,
@@ -39,18 +37,17 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'ru',
 		system: true,
-		message: 'User_removed_by',
+		message: 'User_has_been_removed',
 		data(message) {
 			return {
 				user_removed: message.msg,
-				user_by: message.u.username,
 			};
 		},
 	});
 	MessageTypes.registerType({
 		id: 'removed-user-from-team',
 		system: true,
-		message: 'Removed__username__from_team',
+		message: 'Removed__username__from_the_team',
 		data(message) {
 			return {
 				user_removed: message.msg,
@@ -60,27 +57,17 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'ul',
 		system: true,
-		message: 'User_left',
-		data(message) {
-			return {
-				user_left: message.u.username,
-			};
-		},
+		message: 'User_left_this_channel',
 	});
 	MessageTypes.registerType({
 		id: 'ult',
 		system: true,
-		message: 'User_left_team',
-		data(message) {
-			return {
-				user_left: message.u.username,
-			};
-		},
+		message: 'User_left_this_team',
 	});
 	MessageTypes.registerType({
 		id: 'user-converted-to-team',
 		system: true,
-		message: 'Converted__roomName__to_team',
+		message: 'Converted__roomName__to_a_team',
 		data(message) {
 			return {
 				roomName: message.msg,
@@ -90,7 +77,7 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'user-converted-to-channel',
 		system: true,
-		message: 'Converted__roomName__to_channel',
+		message: 'Converted__roomName__to_a_channel',
 		data(message) {
 			return {
 				roomName: message.msg,
@@ -100,7 +87,7 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'user-removed-room-from-team',
 		system: true,
-		message: 'Removed__roomName__from_this_team',
+		message: 'Removed__roomName__from_the_team',
 		data(message) {
 			return {
 				roomName: message.msg,
@@ -110,7 +97,7 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'user-deleted-room-from-team',
 		system: true,
-		message: 'Deleted__roomName__',
+		message: 'Deleted__roomName__room',
 		data(message) {
 			return {
 				roomName: message.msg,
@@ -120,7 +107,7 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'user-added-room-to-team',
 		system: true,
-		message: 'added__roomName__to_team',
+		message: 'added__roomName__to_this_team',
 		data(message) {
 			return {
 				roomName: message.msg,
@@ -130,7 +117,7 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'uj',
 		system: true,
-		message: 'User_joined_channel',
+		message: 'User_joined_the_channel',
 		data(message) {
 			return {
 				user: message.u.username,
@@ -140,7 +127,7 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'ujt',
 		system: true,
-		message: 'User_joined_team',
+		message: 'User_joined_the_team',
 		data(message) {
 			return {
 				user: message.u.username,
@@ -150,7 +137,7 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'ut',
 		system: true,
-		message: 'User_joined_conversation',
+		message: 'User_joined_the_conversation',
 		data(message) {
 			return {
 				user: message.u.username,
@@ -170,12 +157,7 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'rm',
 		system: true,
-		message: 'Message_removed',
-		data(message) {
-			return {
-				user: message.u.username,
-			};
-		},
+		message: 'Message_is_removed',
 	});
 	// MessageTypes.registerType({
 	// 	id: 'rtc',
@@ -186,22 +168,20 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'user-muted',
 		system: true,
-		message: 'User_muted_by',
+		message: 'User_has_been_muted',
 		data(message) {
 			return {
 				user_muted: message.msg,
-				user_by: message.u.username,
 			};
 		},
 	});
 	MessageTypes.registerType({
 		id: 'user-unmuted',
 		system: true,
-		message: 'User_unmuted_by',
+		message: 'User_has_been_unmuted',
 		data(message) {
 			return {
 				user_unmuted: message.msg,
-				user_by: message.u.username,
 			};
 		},
 	});
@@ -232,67 +212,37 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'room-archived',
 		system: true,
-		message: 'This_room_has_been_archived_by__username_',
-		data(message) {
-			return {
-				username: message.u.username,
-			};
-		},
+		message: 'This_room_has_been_archived',
 	});
 	MessageTypes.registerType({
 		id: 'room-unarchived',
 		system: true,
-		message: 'This_room_has_been_unarchived_by__username_',
-		data(message) {
-			return {
-				username: message.u.username,
-			};
-		},
+		message: 'This_room_has_been_unarchived',
 	});
 	MessageTypes.registerType({
 		id: 'room-removed-read-only',
 		system: true,
-		message: 'room_removed_read_only',
-		data(message) {
-			return {
-				user_by: message.u.username,
-			};
-		},
+		message: 'room_removed_read_only_permission',
 	});
 	MessageTypes.registerType({
 		id: 'room-set-read-only',
 		system: true,
-		message: 'room_set_read_only',
-		data(message) {
-			return {
-				user_by: message.u.username,
-			};
-		},
+		message: 'room_set_read_only_permission',
 	});
 	MessageTypes.registerType({
 		id: 'room-allowed-reacting',
 		system: true,
-		message: 'room_allowed_reacting',
-		data(message) {
-			return {
-				user_by: message.u.username,
-			};
-		},
+		message: 'room_allowed_reactions',
 	});
 	MessageTypes.registerType({
 		id: 'room-disallowed-reacting',
 		system: true,
-		message: 'room_disallowed_reacting',
-		data(message) {
-			return {
-				user_by: message.u.username,
-			};
-		},
+		message: 'room_disallowed_reactions',
 	});
 	MessageTypes.registerType({
 		id: 'room_e2e_enabled',
 		system: true,
-		message: 'This_room_encryption_has_been_enabled_by__username_',
+		message: 'Enabled_E2E_Encryption_for_this_room',
 		data(message) {
 			return {
 				username: message.u.username,
@@ -302,7 +252,7 @@ Meteor.startup(function () {
 	MessageTypes.registerType({
 		id: 'room_e2e_disabled',
 		system: true,
-		message: 'This_room_encryption_has_been_disabled_by__username_',
+		message: 'Disabled_E2E_Encryption_for_this_room',
 		data(message) {
 			return {
 				username: message.u.username,

apps/meteor/app/livechat/lib/messageTypes.ts

@@ -108,7 +108,7 @@ MessageTypes.registerType({
 		}
 		return escapeHTML(message.msg);
 	},
-	message: 'room_changed_privacy',
+	message: 'room_changed_type',
 });
 
 MessageTypes.registerType({

apps/meteor/app/user-data-download/server/cronProcessDownloads.js

@@ -157,67 +157,67 @@ const getMessageData = function (msg, hideUsers, userData, usersMap) {
 
 		switch (msg.t) {
 			case 'uj':
-				messageObject.msg = TAPi18n.__('User_joined_channel');
+				messageObject.msg = TAPi18n.__('User_joined_the_channel');
 				break;
 			case 'ul':
-				messageObject.msg = TAPi18n.__('User_left');
+				messageObject.msg = TAPi18n.__('User_left_this_channel');
 				break;
 			case 'ult':
-				messageObject.msg = TAPi18n.__('User_left_team');
+				messageObject.msg = TAPi18n.__('User_left_this_team');
 				break;
 			case 'user-added-room-to-team':
-				messageObject.msg = TAPi18n.__('added__roomName__to_team', {
+				messageObject.msg = TAPi18n.__('added__roomName__to_this_team', {
 					roomName: msg.msg,
 				});
 				break;
 			case 'user-converted-to-team':
-				messageObject.msg = TAPi18n.__('Converted__roomName__to_team', {
+				messageObject.msg = TAPi18n.__('Converted__roomName__to_a_team', {
 					roomName: msg.msg,
 				});
 				break;
 			case 'user-converted-to-channel':
-				messageObject.msg = TAPi18n.__('Converted__roomName__to_channel', {
+				messageObject.msg = TAPi18n.__('Converted__roomName__to_a_channel', {
 					roomName: msg.msg,
 				});
 				break;
 			case 'user-deleted-room-from-team':
-				messageObject.msg = TAPi18n.__('Deleted__roomName__', {
+				messageObject.msg = TAPi18n.__('Deleted__roomName__room', {
 					roomName: msg.msg,
 				});
 				break;
 			case 'user-removed-room-from-team':
-				messageObject.msg = TAPi18n.__('Removed__roomName__from_this_team', {
+				messageObject.msg = TAPi18n.__('Removed__roomName__from_the_team', {
 					roomName: msg.msg,
 				});
 				break;
 			case 'ujt':
-				messageObject.msg = TAPi18n.__('User_joined_team');
+				messageObject.msg = TAPi18n.__('User_joined_the_team');
 				break;
 			case 'au':
-				messageObject.msg = TAPi18n.__('User_added_by', {
+				messageObject.msg = TAPi18n.__('User_added_to', {
 					user_added: hideUserName(msg.msg, userData, usersMap),
 					user_by: username,
 				});
 				break;
 			case 'added-user-to-team':
-				messageObject.msg = TAPi18n.__('Added__username__to_team', {
+				messageObject.msg = TAPi18n.__('Added__username__to_this_team', {
 					user_added: msg.msg,
 				});
 				break;
 			case 'r':
-				messageObject.msg = TAPi18n.__('Room_name_changed', {
+				messageObject.msg = TAPi18n.__('Room_name_changed_to', {
 					room_name: msg.msg,
 					user_by: username,
 				});
 				break;
 			case 'ru':
-				messageObject.msg = TAPi18n.__('User_removed_by', {
+				messageObject.msg = TAPi18n.__('User_has_been_removed', {
 					user_removed: hideUserName(msg.msg, userData, usersMap),
 					user_by: username,
 				});
 				break;
 			case 'removed-user-from-team':
-				messageObject.msg = TAPi18n.__('Removed__username__from_team', {
+				messageObject.msg = TAPi18n.__('Removed__username__from_the_team', {
 					user_removed: hideUserName(msg.msg, userData, usersMap),
 				});
 				break;