Merge branch 'develop' into it_translation_muted

app/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "edumeet",
-	"version": "3.5.5",
+	"version": "3.5.6",
 	"private": true,
 	"description": "edumeet meeting service",
 	"author": "Håvar Aambø Fosstveit <h@fosstveit.net>",

app/src/RoomClient.js

@@ -309,6 +309,11 @@ export default class RoomClient
 		else
 			this._maxSpotlights = config.mobileLastN;
 
+		const urlParser = new URL(window.location);
+		const parameters = urlParser.searchParams;
+
+		this._maxSpotlights = parameters.get('lastN') || this._maxSpotlights;
+
 		store.dispatch(
 			settingsActions.setLastN(this._maxSpotlights));
 

app/src/components/MeetingDrawer/MeetingDrawer.js

@@ -168,7 +168,7 @@ export default connect(
 			return (
 				prev.toolarea.currentToolTab === next.toolarea.currentToolTab &&
 				prev.toolarea.unreadMessages === next.toolarea.unreadMessages &&
-				prev.toolarea.drawerOverlayed === next.toolarea.drawerOverlayed &&
+				prev.settings.drawerOverlayed === next.settings.drawerOverlayed &&
 				prev.toolarea.unreadFiles === next.toolarea.unreadFiles &&
 				prev.peers === next.peers &&
 				prev.me.browser === next.me.browser

app/src/intl/locales.ts

@@ -15,12 +15,12 @@ const list = [
 	{
 		name   : 'Chinese (Simplified)',
 		file   : 'cn',
-		locale : [ 'zn', 'zn-zn', 'zn-cn' ]
+		locale : [ 'zh', 'zh-zh', 'zh-cn' ]
 	}, // hans
 	{
 		name   : 'Chinese (Traditional)',
 		file   : 'tw',
-		locale : [ 'zn-tw', 'zn-hk', 'zn-sg' ]
+		locale : [ 'zh-tw', 'zh-hk', 'zh-sg' ]
 	}, // hant
 	{
 		name   : 'Croatian',

app/src/intl/translations/cn.json

@@ -1,12 +1,12 @@
 {
     "configDocumentation.title": "Edumeet 配置",
-    "configError.bodyText":  "Edumeet 配置存在如下错误：",
-    "configError.link": "查看配置文档",
+    "configError.bodyText": "Edumeet 配置包含错误:",
+    "configError.link": "请参阅配置文档",
     "configError.title": "配置错误",
     "device.activateAudio": "激活音频",
     "device.audioUnsupported": "音频不受支持",
     "device.muteAudio": "静音",
-    "device.options": "设置",
+    "device.options": "选项",
     "device.screenSharingUnsupported": "不支持屏幕共享",
     "device.startScreenSharing": "开始屏幕共享",
     "device.startVideo": "开始视频",
@@ -18,10 +18,10 @@
     "devices.cameraError": "访问相机时发生错误",
     "devices.chooseMedia": "选择媒体",
     "devices.devicesChanged": "您的设备已更改，请在设置对话框中配置设备",
-    "devices.disableBothMicrophoneAndCamera": "关闭麦克风和摄像头",
-    "devices.enableBothMicrophoneAndCamera": "打开麦克风和摄像头",
-    "devices.enableOnlyCamera": "仅打开摄像头",
-    "devices.enableOnlyMicrophone": "仅打开麦克风",
+    "devices.disableBothMicrophoneAndCamera": "禁用麦克风与摄像头",
+    "devices.enableBothMicrophoneAndCamera": "启用麦克风与摄像头",
+    "devices.enableOnlyCamera": "仅启用摄像头",
+    "devices.enableOnlyMicrophone": "仅启用麦克风",
     "devices.microphoneDisconnected": "麦克风已断开",
     "devices.microphoneEnable": "启用了麦克风",
     "devices.microphoneError": "麦克风发生错误",
@@ -39,16 +39,16 @@
     "filesharing.startingFileShare": "正在尝试共享文件",
     "filesharing.successfulFileShare": "文件已成功共享",
     "filesharing.unableToShare": "无法共享文件",
-    "label.addVideo": null,
-    "label.advanced": null,
-    "label.appearance": null,
-    "label.audioSettings": null,
-    "label.auth": null,
-    "label.bold": null,
+    "label.addVideo": "添加新的视频源",
+    "label.advanced": "高级",
+    "label.appearance": "显示",
+    "label.audioSettings": "音频设置",
+    "label.auth": "认证",
+    "label.bold": "加粗",
     "label.chat": "聊天",
     "label.chatInput": "输入聊天消息",
-    "label.chatNewMessages": null,
-    "label.chatNoMessages": null,
+    "label.chatNewMessages": "新消息",
+    "label.chatNoMessages": "暂无消息",
     "label.close": "关闭",
     "label.democratic": "主持人视图",
     "label.fileSharingUnsupported": "不支持文件共享",
@@ -56,200 +56,201 @@
     "label.fullscreen": "全屏",
     "label.guest": "访客",
     "label.high": "高 (HD)",
-    "label.italic": null,
-    "label.join": "入会",
+    "label.italic": "斜体",
+    "label.join": "加入",
     "label.leave": "离开",
-    "label.leaveWithSavingChat": null,
-    "label.login": null,
-    "label.logout": null,
+    "label.leaveWithSavingChat": "确定并保存聊天记录 ({chatCount})",
+    "label.login": "登入",
+    "label.logout": "登出",
     "label.low": "低",
-    "label.media": null,
+    "label.media": "媒体",
     "label.medium": "中等",
-    "label.moreActions": null,
-    "label.newWindow": "新窗口",
-    "label.no": null,
+    "label.moreActions": "更多操作",
+    "label.newWindow": "在新窗口打开",
+    "label.no": "取消",
     "label.openDrawer": "打开抽屉",
-    "label.participants": "参与者",
-    "label.password": null,
-    "label.promoteAllPeers": null,
-    "label.recordingInProgress": null,
+    "label.participants": "参会人",
+    "label.password": "密码",
+    "label.promoteAllPeers": "允许所有人进入",
+    "label.recordingInProgress": "正在录制...",
     "label.roomName": "房间名称",
-    "label.saveChat": null,
-    "label.send": null,
+    "label.saveChat": "保存聊天记录",
+    "label.send": "发送",
     "label.shareFile": "共享文件",
-    "label.shareGalleryFile": null,
-    "label.showAdvancedInformation": null,
-    "label.sortAscending": null,
-    "label.sortDescending": null,
+    "label.shareGalleryFile": "共享图片",
+    "label.showAdvancedInformation": "显示高级信息",
+    "label.sortAscending": "升序",
+    "label.sortDescending": "降序",
     "label.ultra": "超高 (UHD)",
-    "label.underline": null,
+    "label.underline": "下划线",
     "label.unknown": "未知",
-    "label.username": null,
-    "label.version": null,
+    "label.username": "用户名",
+    "label.version": "版本",
     "label.veryHigh": "非常高 (FHD)",
-    "label.videoSettings": null,
-    "label.yes": null,
+    "label.videoSettings": "视频设置",
+    "label.yes": "确定",
     "label.yourName": "你的名字",
-    "me.mutedPTT": null,
-    "me.pushToTalk": null,
-    "moderator.clearChat": null,
-    "moderator.clearFiles": null,
-    "moderator.modifyPeerRoles": null,
-    "moderator.muteAudio": null,
-    "moderator.muteVideo": null,
-    "moderator.stopScreenSharing": null,
-    "roles.gotRole": null,
-    "roles.lostRole": null,
-    "room.about": null,
+    "me.mutedPTT": "您已静音{br}按住空格键说话",
+    "me.pushToTalk": "按住空格键发言",
+    "moderator.clearChat": "主持人清空了聊天记录",
+    "moderator.clearFiles": "主持人清空了文件",
+    "moderator.modifyPeerRoles": "修改角色",
+    "moderator.muteAudio": "主持人已将您静音",
+    "moderator.muteVideo": "主持人关闭了您的视频",
+    "moderator.stopScreenSharing": "主持人停止了您的屏幕共享",
+    "roles.gotRole": "你获得了参会角色: {role}",
+    "roles.lostRole": "你失去了参会角色: {role}",
+    "room.about": "关于",
     "room.accessCodeOff": "房间的访问密码已停用",
     "room.accessCodeOn": "房间的访问密码现已激活",
-    "room.browsePeersSpotlight": null,
+    "room.browsePeersSpotlight": "浏览处于焦点的参会人",
     "room.cantJoin": "无法加入房间",
     "room.cantLock": "无法锁定房间",
     "room.cantUnLock": "无法解锁房间",
     "room.changeDisplayNameError": "更改显示名称时发生错误",
     "room.changedDisplayName": "您的显示名称更改为{displayName}",
     "room.chatError": "无法发送聊天消息",
-    "room.clearChat": null,
-    "room.closeMeeting": null,
-    "room.consentUnderstand": null,
-    "room.cookieConsent": "这个网站使用cookies来增强用户体验",
+    "room.clearChat": "清空聊天记录",
+    "room.closeMeeting": "全员结束会议",
+    "room.consentUnderstand": "我已理解",
+    "room.cookieConsent": "本网站使用cookies来提升用户体验",
     "room.emptyRequireLogin": "房间是空的！ 您可以登录以开始会议或等待主持人加入",
-    "room.extraVideo": null,
-    "room.extraVideoDuplication": null,
-    "room.help": null,
-    "room.hideSelfView": null,
+    "room.extraVideo": "额外视频源",
+    "room.extraVideoDuplication": "该视频源已经被使用。",
+    "room.help": "帮助",
+    "room.hideSelfView": "隐藏本端视频",
     "room.joined": "您已加入房间",
-    "room.leaveConfirmationMessage": null,
-    "room.leavingTheRoom": null,
-    "room.lobbyAdministration": "大厅管理",
-    "room.lobbyEmpty": "大厅目前没有人",
-    "room.lobbyPeerChangedDisplayName": "大厅的参与者将名称更改为{displayName}",
-    "room.lobbyPeerChangedPicture": "大厅的参与者已更改图片",
-    "room.lobbyPeerLeft": "新参与者离开大厅",
-    "room.localRecordingPaused": null,
-    "room.localRecordingResumed": null,
-    "room.localRecordingSecurityError": null,
-    "room.localRecordingStarted": null,
-    "room.localRecordingStopped": null,
+    "room.leaveConfirmationMessage": "确定离开房间吗？",
+    "room.leavingTheRoom": "离开房间",
+    "room.lobbyAdministration": "等候室管理",
+    "room.lobbyEmpty": "等候室目前没有人",
+    "room.lobbyPeerChangedDisplayName": "等候室的参会人将名称更改为{displayName}",
+    "room.lobbyPeerChangedPicture": "等候室的参会人已更改图片",
+    "room.lobbyPeerLeft": "新参会人离开等候室",
+    "room.localRecordingPaused": "{displayName} 暂停了本地录制",
+    "room.localRecordingResumed": "{displayName} 回复了本地录制",
+    "room.localRecordingSecurityError": "由于安全限制，不允许录制指定的源。检查您的客户端设置！",
+    "room.localRecordingStarted": "{displayName} 开始了本地录制",
+    "room.localRecordingStopped": "{displayName} 停止了本地录制",
     "room.locked": "房间已锁定",
-    "room.locketWait": "房间已锁定-挂起，直到有人允许您进入...",
+    "room.locketWait": "房间已锁定 - 断开连接或直到有人允许您进入...",
     "room.loggedIn": "您已登录",
     "room.loggedOut": "您已登出",
-    "room.loweredHand": null,
+    "room.loweredHand": "{displayName} 取消了举手",
     "room.me": "我",
-    "room.moderatoractions": null,
-    "room.muteAll": null,
+    "room.moderatoractions": "主持人操作",
+    "room.muteAll": "全部静音",
     "room.newFile": "新文件可用",
-    "room.newLobbyPeer": "新参与者进入大厅",
+    "room.newLobbyPeer": "新参会人进入等候室",
     "room.newPeer": "{displayName}加入了会议室",
-    "room.overRoomLimit": null,
+    "room.overRoomLimit": "房间已满，过一段时间再试。",
     "room.peerChangedDisplayName": "{oldDisplayName}现在为{displayName}",
-    "room.peersInLobby": "大厅的参与者",
-    "room.raisedHand": null,
-    "room.recordingConsent": null,
-    "room.recordingConsentAccept": null,
-    "room.recordingConsentDeny": null,
+    "room.peersInLobby": "等候室的参会人",
+    "room.raisedHand": "{displayName} 举手示意",
+    "room.recordingConsent": "参加本次会议时，您同意并同意关于您的信息（音频、视频和元数据）可以成为该录制或广播的一部分",
+    "room.recordingConsentAccept": "我同意",
+    "room.recordingConsentDeny": "拒绝",
     "room.setAccessCode": "设置房间的访问密码",
     "room.setDemocraticView": "将布局更改为民主视图",
     "room.setFilmStripView": "将布局更改为幻灯片视图",
-    "room.shortcutKeys": null,
-    "room.showSelfView": null,
-    "room.spotlights": "Spotlight中的参与者",
-    "room.stopAllScreenSharing": null,
-    "room.stopAllVideo": null,
+    "room.shortcutKeys": "快捷键",
+    "room.showSelfView": "显示本端视频",
+    "room.spotlights": "处于焦点中的参会人",
+    "room.stopAllScreenSharing": "停止所有的屏幕共享",
+    "room.stopAllVideo": "停止所有视频",
     "room.toggleAdvancedMode": "切换高级模式",
-    "room.unexpectedErrorDuringLocalRecording": null,
+    "room.unexpectedErrorDuringLocalRecording": "本地录制时出现意外错误",
     "room.unlocked": "房间现已解锁",
     "room.videoPaused": "该视频已暂停",
-    "room.youAreReady": "好，您准备好了",
+    "room.youAreReady": "准备就绪",
     "room.youLocked": "您已锁定房间",
-    "room.youStartedLocalRecording": null,
-    "room.youStoppedLocalRecording": null,
+    "room.youStartedLocalRecording": "您已开始本地录制",
+    "room.youStoppedLocalRecording": "您已停止本地录制",
     "room.youUnLocked": "您解锁了房间",
     "settings.advancedMode": "高级模式",
-    "settings.aspectRatio": null,
+    "settings.aspectRatio": "视频比例",
     "settings.audio": "音频设备",
     "settings.audioOutput": "音频输出设备",
-    "settings.audioPreset": null,
-    "settings.autoGainControl": null,
-    "settings.buttonControlBar": null,
+    "settings.audioPreset": "选择音频预设",
+    "settings.autoGainControl": "自动增益控制",
+    "settings.buttonControlBar": "独立媒体控制",
     "settings.camera": "视频设备",
-    "settings.cantSelectAudio": "无法选择音频设备",
+    "settings.cantSelectAudio": "无法选择音频输入设备",
     "settings.cantSelectAudioOutput": "无法选择音频输出设备",
     "settings.cantSelectCamera": "无法选择视频设备",
-    "settings.channelCount": null,
-    "settings.drawerOverlayed": null,
-    "settings.echoCancellation": null,
-    "settings.enableOpusDetails": null,
-    "settings.frameRate": null,
-    "settings.hiddenControls": null,
-    "settings.hideNoVideoParticipants": null,
-    "settings.language": null,
+    "settings.channelCount": "选择音频通道数",
+    "settings.drawerOverlayed": "侧边栏是否覆盖内容",
+    "settings.echoCancellation": "回声消除",
+    "settings.enableOpusDetails": "启用 OPUS 详细信息（需要刷新页面）",
+    "settings.frameRate": "选择视频帧率",
+    "settings.hiddenControls": "隐藏媒体控制",
+    "settings.hideNoVideoParticipants": "隐藏没有视频的参会者",
+    "settings.language": "选择语言",
     "settings.lastn": "可见视频数量",
     "settings.layout": "房间布局",
-    "settings.mirrorOwnVideo": null,
-    "settings.myPhotoButton": null,
-    "settings.myPhotoLabel": null,
-    "settings.myPhotoSizeError": null,
-    "settings.myPhotoTypeError": null,
-    "settings.noiseSuppression": null,
-    "settings.noiseThreshold": null,
-    "settings.notificationSounds": null,
-    "settings.opusDtx": null,
-    "settings.opusFec": null,
-    "settings.opusPtime": null,
-    "settings.permanentTopBar": "永久顶吧",
-    "settings.recordingsPreferredMimeType": null,
+    "settings.mirrorOwnVideo": "镜像我的视频",
+    "settings.myPhotoButton": "设置我的照片",
+    "settings.myPhotoLabel": "最大文件大小: 5MB, 允许格式: jpg, jpeg, png",
+    "settings.myPhotoSizeError": " 文件过大",
+    "settings.myPhotoTypeError": " 是不支持的文件类型",
+    "settings.noiseSuppression": "噪声抑制",
+    "settings.noiseThreshold": "噪声阈值",
+    "settings.notificationSounds": "入会提示音",
+    "settings.opusDtx": "启用 Opus 不连续传输 (DTX)",
+    "settings.opusFec": "启用 Opus 向前纠错 (FEC)",
+    "settings.opusPtime": "选择 Opus 帧大小",
+    "settings.permanentTopBar": "永久显示顶部栏",
+    "settings.recordingsPreferredMimeType": "选择偏好视频 MIME 类型",
     "settings.resolution": "选择视频分辨率",
-    "settings.sampleRate": null,
-    "settings.sampleSize": null,
-    "settings.screenSharingFrameRate": null,
-    "settings.selectAspectRatio": null,
+    "settings.sampleRate": "选择音频采样率",
+    "settings.sampleSize": "选择音频采样大小",
+    "settings.screenSharingFrameRate": "选择您的屏幕共享帧率",
+    "settings.selectAspectRatio": "选择视频比例",
     "settings.selectAudio": "选择音频设备",
     "settings.selectAudioOutput": "选择音频输出设备",
     "settings.selectCamera": "选择视频设备",
     "settings.selectRoomLayout": "选择房间布局",
     "settings.settings": "设置",
-    "settings.showAdvancedAudio": null,
-    "settings.showAdvancedVideo": null,
-    "settings.showNotifications": null,
-    "settings.voiceActivatedUnmute": null,
-    "settings.webcamFrameRate": null,
+    "settings.showAdvancedAudio": "高级音频设置",
+    "settings.showAdvancedVideo": "高级视频设置",
+    "settings.showNotifications": "显示通知",
+    "settings.voiceActivatedUnmute": "检测到语音自动取消静音",
+    "settings.webcamFrameRate": "选择摄像头帧率",
     "socket.disconnected": "您已断开连接",
     "socket.reconnected": "您已重新连接",
     "socket.reconnecting": "尝试重新连接",
     "socket.requestError": "服务器请求错误",
-    "tooltip.addParticipantToSpotlight": null,
-    "tooltip.admitFromLobby": "从大厅允许",
+    "tooltip.addParticipantToSpotlight": "添加到焦点",
+    "tooltip.admitFromLobby": "允许入会",
     "tooltip.enterFullscreen": "进入全屏",
-    "tooltip.inSpotlight": null,
-    "tooltip.isSpeaker": null,
-    "tooltip.kickParticipant": null,
+    "tooltip.inSpotlight": "处于焦点中",
+    "tooltip.isSpeaker": "正在发言",
+    "tooltip.kickParticipant": "踢出会议",
     "tooltip.leaveFullscreen": "退出全屏",
-    "tooltip.lobby": "显示大厅",
+    "tooltip.lobby": "显示等候室",
     "tooltip.lockRoom": "锁房",
     "tooltip.login": "登录",
     "tooltip.logout": "注销",
-    "tooltip.muteParticipant": null,
-    "tooltip.muteParticipantAudioModerator": null,
-    "tooltip.muteParticipantVideo": null,
-    "tooltip.muteParticipantVideoModerator": null,
-    "tooltip.muteScreenSharing": null,
-    "tooltip.muteScreenSharingModerator": null,
+    "tooltip.muteParticipant": "关闭麦克风",
+    "tooltip.muteParticipantAudioModerator": "静音",
+    "tooltip.muteParticipantVideo": "关闭视频",
+    "tooltip.muteParticipantVideoModerator": "停止视频",
+    "tooltip.muteScreenSharing": "关闭屏幕共享",
+    "tooltip.muteScreenSharingModerator": "停止屏幕共享",
     "tooltip.participants": "显示参加者",
-    "tooltip.pauseLocalRecording": null,
-    "tooltip.raisedHand": null,
-    "tooltip.removeParticipantFromSpotlight": null,
-    "tooltip.resumeLocalRecording": null,
+    "tooltip.pauseLocalRecording": "暂停本地录制",
+    "tooltip.raisedHand": "举手",
+    "tooltip.removeParticipantFromSpotlight": "移除焦点",
+    "tooltip.resumeLocalRecording": "恢复暂停的本地录制",
     "tooltip.settings": "显示设置",
-    "tooltip.startLocalRecording": null,
-    "tooltip.stopLocalRecording": null,
+    "tooltip.startLocalRecording": "开始本地录制",
+    "tooltip.stopLocalRecording": "停止本地录制",
     "tooltip.unLockRoom": "解锁房间",
-    "tooltip.unMuteParticipant": null,
-    "tooltip.unMuteParticipantVideo": null,
-    "tooltip.unMuteScreenSharing": null,
-    "unsupportedBrowser.bodyText": null,
-    "unsupportedBrowser.titleUnsupportedBrowser": null,
-    "unsupportedBrowser.titlewebrtcUnavailable": null
+    "tooltip.unMuteParticipant": "恢复静音",
+    "tooltip.unMuteParticipantVideo": "恢复视频",
+    "tooltip.unMuteScreenSharing": "恢复屏幕共享",
+    "unsupportedBrowser.bodyText": "此会议服务不支持您的当前的浏览器。请升级或切换到其他浏览器或检查您的设置。当前支持的浏览器：",
+    "unsupportedBrowser.titleUnsupportedBrowser": "检测到不支持的浏览器！",
+    "unsupportedBrowser.titlewebrtcUnavailable": "所需功能在您的浏览器中不可用！"
 }
+

server/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "edumeet-server",
-	"version": "3.5.5",
+	"version": "3.5.6",
 	"private": true,
 	"description": "edumeet server",
 	"author": "Håvar Aambø Fosstveit <h@fosstveit.net>",

server/server.js

@@ -725,7 +725,7 @@ function isPathAlreadyTaken(actualUrl)
  */
 async function runWebSocketServer()
 {
-	io = require('socket.io')(mainListener, { cookie: false });
+	io = require('socket.io')(mainListener, { cookie: false, maxHttpBufferSize: 1e8 });
 
 	io.use(
 		sharedSession(session, sharedCookieParser, {})