From 334c0fa77d80e0eed211189cf3c9ef7ce7694675 Mon Sep 17 00:00:00 2001 From: wanglijuan <13139869837@163.com> Date: Fri, 27 Sep 2024 15:50:17 +0800 Subject: [PATCH] fix: teacher -> tutor --- src/containers/device-pretest/index.css | 8 +- .../widget/fixed-board-tips/index.tsx | 2 +- src/translate/en.ts | 105 +++++++++--------- src/translate/zh.ts | 1 + 4 files changed, 60 insertions(+), 56 deletions(-) diff --git a/src/containers/device-pretest/index.css b/src/containers/device-pretest/index.css index 06cea2abc..edacaf705 100644 --- a/src/containers/device-pretest/index.css +++ b/src/containers/device-pretest/index.css @@ -7,24 +7,25 @@ .fcr-pretest { height: 100%; - padding-top: 40px; + padding: 40px 0; } @media screen and (orientation:landscape) { .fcr-pretest { width: 100%; height: 100%; - padding-top: 40px; + padding: 40px 0; } } .fcr-pretest .fcr-pretest__video-portal { padding: 0 16px; + height: 100%; display: flex; flex-direction: column; justify-content: space-between; color: #FEFEFE; - gap: 70px; + /* gap: 40px; */ } .fcr-pretest__video-portal__video_control-wrapped { @@ -98,6 +99,7 @@ /* 视频窗口 */ .fcr-pretest .fcr-pretest__video-portal .fcr-pretest__video-portal__video { height: 279px; + /* margin: 40px 0; */ } .fcr-pretest__video-portal__video .fcr-video-player-wrapper { diff --git a/src/containers/widget/fixed-board-tips/index.tsx b/src/containers/widget/fixed-board-tips/index.tsx index f2f6d7cc3..1523cbc35 100644 --- a/src/containers/widget/fixed-board-tips/index.tsx +++ b/src/containers/widget/fixed-board-tips/index.tsx @@ -119,7 +119,7 @@ export const FixedBoardTips = observer(() => { type="primary" size="lg" style={{ width: '100%', fontSize: '15px', fontWeight: 700 }}> - Got It + {transI18n('fcr_board_rotate_msg')} diff --git a/src/translate/en.ts b/src/translate/en.ts index 196db2a14..6bb28303e 100644 --- a/src/translate/en.ts +++ b/src/translate/en.ts @@ -15,7 +15,7 @@ export const en = { 'Close Private Call': 'Close private call', 'Camera Pos Reset': 'Reset camera', role: { - teacher: 'Teacher', + teacher: 'Tutor', student: 'Student', assistant: 'Assistant', }, @@ -61,7 +61,7 @@ export const en = { }, roster: { chat: 'Mute Chat', - teacher_name: 'Teacher:', + teacher_name: 'Tutor:', user_list: 'Roster', student_name: 'Student', student_co_video: 'Stage', @@ -92,9 +92,9 @@ export const en = { remote_close_microphone: 'Your mic has been turned off', remote_revoke_board: 'You cannot use the whiteboard tools', received_student_hands_up: 'A student wants to get on the stage', - received_teacher_accepted: 'Teacher Accepted', - received_teacher_refused: 'Teacher Refused', - received_student_cancel: 'Teacher Cancelled', + received_teacher_accepted: 'Tutor Accepted', + received_teacher_refused: 'Tutor Refused', + received_student_cancel: 'Tutor Cancelled', received_message_timeout: 'No Response. Try again?', hands_up_requsted: 'Your request has been sent', hands_up_cancelled: 'Your request has been cancelled', @@ -139,8 +139,8 @@ export const en = { unmute_chat: 'You were allowed to chat by {hostName}', remote_mute_chat: '{studentName} was silenced by {hostName}', remote_unmute_chat: '{studentName} was allowed to chat by {hostName}', - add_screen_share: 'Teacher starts to the screen share', - remove_screen_share: 'Teacher stops the screen share', + add_screen_share: 'Tutor starts to the screen share', + remove_screen_share: 'Tutor stops the screen share', granted_board_success: 'Grant Permission success', revoke_board_success: 'Revoke Permission success', create_screen_share_failed: 'Create screen share failed', @@ -150,7 +150,7 @@ export const en = { }, webview_tip: 'Swipe left and right to turn pages of courseware', close_ppt: 'Close CourseWare', - tec_close_board: 'Teacher closed whiteboard', + tec_close_board: 'Tutor closed whiteboard', sure_close_ppt: 'Are you sure to close?', end_class: 'End Class', quit_from_room: 'Leave Class Room', @@ -182,16 +182,16 @@ export const en = { rtm_login_failed: 'login failure, please check your network', rtm_login_failed_reason: 'login failure, reason: {reason}', replay_failed: 'Replay failed please refresh browser', - teacher_exists: 'Teacher existed. Please wait 30s or reopen a new class.', + teacher_exists: 'Tutor existed. Please wait 30s or reopen a new class.', student_over_limit: 'Number of Students exceeds maximum. Please waiting 30s or join a new class', teacher_and_student_over_limit: - 'The number of students and teacher have reached the upper limit', - teacher_accept_whiteboard: 'Teacher already granted your whiteboard', - teacher_cancel_whiteboard: 'Teacher already cancel your whiteboard', - teacher_accept_co_video: 'Teacher already accept co-video', - teacher_reject_co_video: 'Teacher already rejected co-video', - teacher_cancel_co_video: 'Teacher already cancelled co-video', + 'The number of students and tutor have reached the upper limit', + teacher_accept_whiteboard: 'Tutor already granted your whiteboard', + teacher_cancel_whiteboard: 'Tutor already cancel your whiteboard', + teacher_accept_co_video: 'Tutor already accept co-video', + teacher_reject_co_video: 'Tutor already rejected co-video', + teacher_cancel_co_video: 'Tutor already cancelled co-video', student_cancel_co_video: 'Student cancelled co-video', student_peer_leave: '"{reason}" Left', student_send_co_video_apply: '"{reason}" send the co-video request', @@ -230,10 +230,10 @@ export const en = { open_whiteboard_follow: 'open whiteboard follow', close_whiteboard_follow: 'close whiteboard follow', i: 'I', - teacher: 'Teacher', - the_teacher_authorized_your_whiteboard: 'The teacher invites you to the whiteboard', + teacher: 'Tutor', + the_teacher_authorized_your_whiteboard: 'The tutor invites you to the whiteboard', the_teacher_cancelled_your_whiteboard_permission: - 'The teacher cancelled your whiteboard permission', + 'The tutor cancelled your whiteboard permission', publish_business_flow_successfully: 'Publish business flow successfully', media_method_call_failed: 'Media method call failed', successfully_left_the_business_channel: 'Successfully left the business channel', @@ -246,11 +246,11 @@ export const en = { successfully_ended_recording: 'Successfully_ended_recording', failed_to_end_recording: 'Failed to end recording', you_have_a_default_message: 'You have a default message', - the_teacher_agreed: 'Teacher Agreed', + the_teacher_agreed: 'Tutor Agreed', student_applied: 'Student applied', - you_were_dismissed_by_the_teacher: 'You were dismissed by the teacher', + you_were_dismissed_by_the_teacher: 'You were dismissed by the tutor', student_canceled: 'Student cancelled', - the_teacher_refused: 'Teacher refused', + the_teacher_refused: 'Tutor refused', failed_to_initiate_a_raise_of_hand_application: 'Failed to initiate a raise of hand application', failed_to_end_the_call: 'Failed to end the call', @@ -389,7 +389,7 @@ export const en = { device_not_working: 'The device is not working properly!', detect_new_device_in_room: 'The device has installed, Please click setting and select the new device.', - teacher_device_may_not_work: "There is something wrong with the teacher's device", + teacher_device_may_not_work: "There is something wrong with the tutor's device", test: 'Test', video: 'Video', audio: 'Audio', @@ -447,7 +447,7 @@ export const en = { 'placeholder.loading': 'Camera is loading', 'placeholder.muted': 'Camera is closed', 'placeholder.broken': 'Camera is broken', - 'placeholder.notpresent.teacher': 'Teacher is not in the classroom', + 'placeholder.notpresent.teacher': 'Tutor is not in the classroom', 'placeholder.notpresent.student': 'Student is not in the classroom', teacher: 'Tutor', }, @@ -457,16 +457,16 @@ export const en = { toast2: { 'teacher.turn.off.my.mic': 'You are muted', 'teacher.turn.on.my.mic': 'You are unmuted', - 'teacher.turn.off.my.cam': 'The teacher has turned off your camera', - 'teacher.turn.on.my.cam': 'The teacher has turned on your camera', + 'teacher.turn.off.my.cam': 'The tutor has turned off your camera', + 'teacher.turn.on.my.cam': 'The tutor has turned on your camera', 'teacher.grant.permission': 'You can now annotate on the whiteboard', - 'teacher.revoke.permission': 'Your access to the whiteboard has been revoked by the teacher', + 'teacher.revoke.permission': 'Your access to the whiteboard has been revoked by the tutor', 'teacher.grant.permission2': 'You can now annotate on the whiteboard', - 'teacher.revoke.permission2': 'Your access to the whiteboard has been revoked by the teacher', + 'teacher.revoke.permission2': 'Your access to the whiteboard has been revoked by the tutor', 'teacher.accept.onpodium': 'You are on stage now, you are in presentation mode now. Please feel free to interact with others', 'teacher.revoke.onpodium': 'You are off the stage now, you are no longer in presentation mode', - 'teacher.reward': '{reason} has been rewarded by the teacher', + 'teacher.reward': '{reason} has been rewarded by the tutor', 'teacher.reward2': 'Congratulations to {reason1} and {reason2} other students for getting a star', screen_permission_denied: @@ -501,7 +501,7 @@ export const en = { confirm_invite_teacher_content: '{reason2} in Room {reason1} asked for help', confirm_invite_student_btn_ok: 'Join', confirm_invite_student_btn_cancel: 'Later', - confirm_ask_for_help_absent_content: 'Teacher is not in this classroom', + confirm_ask_for_help_absent_content: 'Tutor is not in this classroom', confirm_ask_for_help_btn_cancel: 'Cancel', already_in_room: 'You are already in this group', not_accepted: 'Not accepted', @@ -532,17 +532,17 @@ export const en = { }, /** Breakout Room */ fcr_group_help_title: 'Request help', - fcr_group_help_content: 'You can invite the teacher to this group for assistance.', + fcr_group_help_content: 'You can invite the tutor to this group for assistance.', fcr_group_help_teacher_busy_msg: - 'The teacher is currently helping others. Please try again later.', + 'The tutor is currently helping others. Please try again later.', fcr_group_help_cancel: 'Request for help canceled', fcr_group_help_send: 'Invitation was sent', - fcr_group_teacher_join: 'Teacher has joined the group', + fcr_group_teacher_join: 'Tutor has joined the group', fcr_group_teacher_is_helping_others_msg: - 'The teacher is helping other group, Please wait for minutes.', - fcr_group_teacher_exist_hint: 'The teacher is already in the group', + 'The tutor is helping other group, Please wait for minutes.', + fcr_group_teacher_exist_hint: 'The tutor is already in the group', fcr_group_invite: 'Invite', - fcr_group_invitation: ' Teacher is inviting you to join {reason}', + fcr_group_invitation: ' Tutor is inviting you to join {reason}', fcr_group_button_join: 'Join', fcr_group_button_later: 'Later', // fcr_group_joining: 'Joining {reason}', @@ -551,8 +551,8 @@ export const en = { fcr_group_enter_welcome: 'Welcome to join {reason} and discuss with everyone', fcr_group_enter_group: '{reason1} {reason2} has joined group', fcr_group_exit_group: '{reason1} {reason2} has left group', - fcr_group_close_group: 'The teacher closed breakout rooms', - fcr_group_invite_back_main_room: 'The teacher is inviting you to return to main session', + fcr_group_close_group: 'The tutor closed breakout rooms', + fcr_group_invite_back_main_room: 'The tutor is inviting you to return to main session', fcr_group_back_main_room: 'Returning to main session...', fcr_group_back_sure: 'Sure', fcr_group_back_cancel: 'Cancel', @@ -565,7 +565,7 @@ export const en = { 'You have been transferred to {reason} and your request for help will be cancelled. Please reapply for help', /** Breakout Room */ /** Remote Control */ - fcr_share_title_teacher: 'Teacher Screen Share', + fcr_share_title_teacher: 'Tutor Screen Share', fcr_share_title_singel_window: 'Support sharing a single application', fcr_share_title_full_screen: 'Support full screen sharing', fcr_share_title_sound: 'Audio is not supported', @@ -573,15 +573,15 @@ export const en = { fcr_share_title_any_student: 'You can assign a student to share the screen', fcr_share_selected: '{reason} Selected', fcr_share_sharing: "Sharing {reason}'s screen", - fcr_share_authorized_control: 'The teacher has authorized you to control the screen', - fcr_share_forbidden_control: 'The teacher has forbidden your screen control', + fcr_share_authorized_control: 'The tutor has authorized you to control the screen', + fcr_share_forbidden_control: 'The tutor has forbidden your screen control', fcr_share_device_not_support: '{reason}‘s device does not support remote control', fcr_share_Remote_control_disconnected: '{reason} left classroom，Remote control disconnected', fcr_share_reminded_student_agree: '{reason1} has not agreed to share his/her screen,reminded {reason2} to click on the "Agree" button to share his/her own screen', fcr_share_teacher_requesting_share: - 'The teacher adds to have access to your screen content and remote control your device.Do you want to accept now?', - fcr_share_stopped_student_share: 'The teacher has stopped viewing your screen', + 'The tutor adds to have access to your screen content and remote control your device.Do you want to accept now?', + fcr_share_stopped_student_share: 'The tutor has stopped viewing your screen', fcr_share_no_student: "Can't share student's screen as there's no student in the classroom", fcr_share_device_no_support: 'Student devices do not support remote control', fcr_rc_control_bar_allow_student_control: 'Allow {reason} to control', @@ -618,6 +618,7 @@ export const en = { 'Please enable the auto-rotate function on your phone and place it horizontally. Use the whiteboard tool in landscape mode.', fcr_board_rotate_lock: 'Lock screen rotation', fcr_board_rotate_auto: 'auto rotate', + fcr_board_rotate_msg: 'Got It', fcr_board_enable: 'Enable', fcr_student_no_teacher_show: 'No teaching content currently available', /** Remote Control */ @@ -730,7 +731,7 @@ export const en = { '30403100': 'You cannot join room.', '30400420': 'Please set whiteboard token in Agora console.', '30403200': 'You cannot send chat message.', - '30404200': 'The teacher is not in the room.', + '30404200': 'The tutor is not in the room.', '30409100': 'Session is started.', '30409101': 'Session is ended.', '30409102': 'Screen has shared.', @@ -760,7 +761,7 @@ export const en = { role: 'Role', loading: 'Loading More...', end: 'No More', - role_teacher: 'Teacher', + role_teacher: 'Tutor', role_student: 'Student', role_assistant: 'Assistant', role_audience: 'Audience', @@ -793,7 +794,7 @@ export const en = { confirm: { title: 'Prompt', content: - 'The teacher invited you to power exchange, click ok to power click cancel to ignore', + 'The tutor invited you to power exchange, click ok to power click cancel to ignore', ok: 'OK', cancel: 'Cancel', }, @@ -817,7 +818,7 @@ export const en = { fcr_expansion_screen_button_down: 'Down stage', fcr_expansion_screen_tips_close_group: 'Please close breakout room', fcr_expansion_screen_tips_close_expansion_screen: 'Please close expansion display', - fcr_expansion_screen_tips_teacher_watching: 'The teacher is viewing your video screen', + fcr_expansion_screen_tips_teacher_watching: 'The tutor is viewing your video screen', fcr_expansion_screen_tips_need_invite_student_on_stage: 'After enabling the video gallery, you need to manually invite students to join call', fcr_expansion_screen_tips_student_on_stage: 'The student has joined call', @@ -828,13 +829,13 @@ export const en = { fcr_H5_tips_chat_pollopened: 'Poll opened', fcr_H5_click_to_play: 'Play', fcr_user_tips_teacher_start_video_title: 'Request to start video', - fcr_user_tips_teacher_start_video_content: 'Teacher requests to start video', + fcr_user_tips_teacher_start_video_content: 'Tutor requests to start video', fcr_user_tips_teacher_unmute_title: 'Request to unmute', - fcr_user_tips_teacher_unmute_content: 'Teacher requests to unmute', + fcr_user_tips_teacher_unmute_content: 'Tutor requests to unmute', fcr_user_tips_teacher_unmute_ok: 'OK', fcr_user_tips_teacher_unmute_cancel: 'Cancel', - fcr_home_status_teacher_leave: 'The teacher has left the room', + fcr_home_status_teacher_leave: 'The tutor has left the room', fcr_failed_converting: 'Failed', fcr_raisehand_label_choose_interaction_mode: 'Please choose at least one interaction mode', @@ -846,7 +847,7 @@ export const en = { fcr_raisehand_button_request_interaction: 'Request for Interaction', fcr_raisehand_button_disconnect_interaction: 'Disconnect Interaction', fcr_raisehand_label_waiting_teacher_approve: - 'Waiting for the teacher to approve your interaction request.', + 'Waiting for the tutor to approve your interaction request.', fcr_raisehand_label_waiting_interaction: 'Waiting for Interaction', fcr_raisehand_label_Interacting: 'Interacting', fcr_raisehand_label_Interacting_now: 'You can start interacting now.', @@ -856,13 +857,13 @@ export const en = { fcr_raisehand_tips_interaction_disconnected: 'Interaction has been disconnected.', fcr_raisehand_tips_not_supported_browser: 'The current browser does not support the function of joining the call.', - fcr_room_tips_lower_hand: 'Teacher lowers your hand', + fcr_room_tips_lower_hand: 'Tutor lowers your hand', fcr_room_tips_lower_all_hand: 'All student‘s hands lowered', fcr_group_button_cancel: 'Cancel', fcr_group_button_invite: 'Invite', fcr_group_tips_leave_content: 'Are you sure you want to leave the group', fcr_group_button_leave_group: 'Return to main Classroom', - fcr_group_teacher_not_in_classroom: 'Teacher is not in this classroom', + fcr_group_teacher_not_in_classroom: 'Tutor is not in this classroom', fcr_group_tool_help: 'Help', fcr_tips_leave_content: 'Are you sure you want to leave the classroom', fcr_group_tool_cancel_help: 'Cancel Help', diff --git a/src/translate/zh.ts b/src/translate/zh.ts index e86498441..021087eb0 100644 --- a/src/translate/zh.ts +++ b/src/translate/zh.ts @@ -598,6 +598,7 @@ export const zh = { fcr_board_rotate_tip: '请把手机的自动旋转打开，并把手机横向放置，在横屏下使用白板编辑。', fcr_board_rotate_lock: '锁定旋转', fcr_board_rotate_auto: '自动旋转', + fcr_board_rotate_msg: '明白了', fcr_board_enable: '启用', fcr_student_no_teacher_show: '当前无教学内容', /** Remote Control */