diff --git a/CHANGELOG.md b/CHANGELOG.md index 07057014..6a843a55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -759,7 +759,7 @@ Moreover, they don't seem to be used much. ### Features * Builtin prosody use a working dir provided by Peertube (needs Peertube >= 3.2.0) -* Starting with Peertube 3.2.0, builtin prosody save room history on server. So when a user connects, he can get previously send messages. +* Starting with Peertube 3.2.0, builtin prosody save room history on server. So when a user connects, they can get previously send messages. * Starting with Peertube 3.2.0, builtin prosody also activate mod_muc_moderation, enabling moderators to moderate messages. * Prosody log level will be the same as the Peertube's one. * Prosody log rotation every 24 hour. @@ -796,7 +796,7 @@ Moreover, they don't seem to be used much. ## v2.1.3 * Fix: 2.1.0 was in fact correct... Did not work on my preprod env because of... a Livebox bug... -* Fix: if the video owner is already owner of the chatroom, he should not be downgraded to admin. +* Fix: if the video owner is already owner of the chatroom, they should not be downgraded to admin. ## v2.1.2 diff --git a/build-avatars.js b/build-avatars.js index 6fc8cc77..8cee4898 100755 --- a/build-avatars.js +++ b/build-avatars.js @@ -171,7 +171,7 @@ async function generateAvatars (part) { async function generateBotsAvatars () { { - // Moderation bot avatar: choosing some parts, and turning it so he is facing left. + // Moderation bot avatar: choosing some parts, and turning it so it is facing left. const inputDir = path.join('./assets/images/avatars/', 'sepia') const botOutputDir = './dist/server/bot_avatars/sepia/' fs.mkdirSync(botOutputDir, { recursive: true }) @@ -196,7 +196,7 @@ async function generateBotsAvatars () { } { - // Moderation bot avatar: choosing some parts, and turning it so he is facing left. + // Moderation bot avatar: choosing some parts, and turning it so it is facing left. const inputDir = path.join('./assets/images/avatars/', 'cat') const botOutputDir = './dist/server/bot_avatars/cat/' fs.mkdirSync(botOutputDir, { recursive: true }) @@ -220,7 +220,7 @@ async function generateBotsAvatars () { } { - // Moderation bot avatar: choosing some parts, and turning it so he is facing left. + // Moderation bot avatar: choosing some parts, and turning it so it is facing left. const inputDir = path.join('./assets/images/avatars/', 'bird') const botOutputDir = './dist/server/bot_avatars/bird/' fs.mkdirSync(botOutputDir, { recursive: true }) @@ -246,7 +246,7 @@ async function generateBotsAvatars () { } { - // Moderation bot avatar: choosing some parts, and turning it so he is facing left. + // Moderation bot avatar: choosing some parts, and turning it so it is facing left. const inputDir = './assets/images/avatars/fenec' const botOutputDir = './dist/server/bot_avatars/fenec/' fs.mkdirSync(botOutputDir, { recursive: true }) @@ -273,7 +273,7 @@ async function generateBotsAvatars () { } { - // Moderation bot avatar: choosing some parts, and turning it so he is facing left. + // Moderation bot avatar: choosing some parts, and turning it so it is facing left. const inputDir = './assets/images/avatars/abstract' const botOutputDir = './dist/server/bot_avatars/abstract/' fs.mkdirSync(botOutputDir, { recursive: true }) diff --git a/languages/en.yml b/languages/en.yml index 0b0b3083..35c2d624 100644 --- a/languages/en.yml +++ b/languages/en.yml @@ -243,7 +243,7 @@ prosody_peertube_uri_description: | prosody_muc_log_by_default_label: "Log rooms content by default" prosody_muc_log_by_default_description: | If checked, room contents will be saved by default. - Any user who joins a room will see what was written before he joins.
+ Any user who joins a room will see what was written before they joins.
Please note that it is always possible to enable/disable the content archiving for a specific room, by editing its properties. diff --git a/prosody-modules/mod_pubsub_peertubelivechat/mod_pubsub_peertubelivechat.lua b/prosody-modules/mod_pubsub_peertubelivechat/mod_pubsub_peertubelivechat.lua index 5dd041f3..95465bf1 100644 --- a/prosody-modules/mod_pubsub_peertubelivechat/mod_pubsub_peertubelivechat.lua +++ b/prosody-modules/mod_pubsub_peertubelivechat/mod_pubsub_peertubelivechat.lua @@ -329,7 +329,7 @@ module:hook("muc-room-destroyed", function(event) end); -- When a user lose its admin/owner affilation, and is still subscribed to the node, --- we must unsubscribe him. +-- we must unsubscribe them. module:hook("muc-set-affiliation", function(event) local previous_affiliation = event.previous_affiliation; local new_affiliation = event.affiliation; @@ -374,7 +374,7 @@ module:hook("muc-occupant-left", function (event) module:log( "debug", - "Occupant %q has left room %q, we must unsubscribe him/her for pubsub nodes.", + "Occupant %q has left room %q, we must unsubscribe them for pubsub nodes.", occupant.bare_jid, room_jid ); for node in pairs(service.nodes) do diff --git a/server/lib/federation/fetch-infos.ts b/server/lib/federation/fetch-infos.ts index 39fdf50a..f29ec051 100644 --- a/server/lib/federation/fetch-infos.ts +++ b/server/lib/federation/fetch-infos.ts @@ -28,7 +28,7 @@ const got = require('got') * - server B: server that follows ours (or used to watch V, without following A) * - user from B connect to the B XMPP server * - server B has server A connection informations (got it using ActivityPub) - * - but, when using Websocket S2S, server A needs information from B, that he never receives + * - but, when using Websocket S2S, server A needs information from B, that it never receives * * Indeed, the XMPP S2S dialback mecanism will try to connect back to * server A, and transmit a secret key, to ensure that all incomming connection diff --git a/server/lib/middlewares/configuration/channel.ts b/server/lib/middlewares/configuration/channel.ts index 7f400750..9284b909 100644 --- a/server/lib/middlewares/configuration/channel.ts +++ b/server/lib/middlewares/configuration/channel.ts @@ -41,7 +41,7 @@ function getCheckConfigurationChannelMiddleware (options: RegisterServerOptions) } else if (await isUserAdminOrModerator(options, res)) { logger.debug('Current user is an instance moderator or admin') } else { - logger.warn('Current user tries to access a channel for which he has no right.') + logger.warn('Current user tries to access a channel for which they has no right.') res.sendStatus(403) return } diff --git a/server/lib/prosody/auth.ts b/server/lib/prosody/auth.ts index 98636228..dfd47ab8 100644 --- a/server/lib/prosody/auth.ts +++ b/server/lib/prosody/auth.ts @@ -57,7 +57,7 @@ let singleton: LivechatProsodyAuth | undefined * * The livechat tokens password are encrypted in data files. * The associated secret key is in the database. - * This is to ensure an additional security level: if an attacker has access to file system, he also must have access + * This is to ensure an additional security level: if an attacker has access to file system, they also must have access * to DB to get the secret key and decrypt passwords. */ export class LivechatProsodyAuth { diff --git a/server/lib/prosody/config.ts b/server/lib/prosody/config.ts index 8b2d49b9..97cd17d0 100644 --- a/server/lib/prosody/config.ts +++ b/server/lib/prosody/config.ts @@ -85,7 +85,7 @@ async function getProsodyFilePaths (options: RegisterServerOptions): Promise