Skip to content

Commit 117eb98

Browse files
committed
chore: code improvements
1 parent 039c254 commit 117eb98

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

app/containers/message/index.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ interface IMessageContainerProps {
3434
useRealName?: boolean;
3535
autoTranslateRoom?: boolean;
3636
autoTranslateLanguage?: string;
37-
autoTranslateLanguageBcp47?: string;
3837
status?: number;
3938
isIgnored?: boolean;
4039
highlighted?: boolean;
@@ -380,8 +379,7 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
380379
isBeingEdited,
381380
isPreview,
382381
showUnreadSeparator,
383-
dateSeparator,
384-
autoTranslateLanguageBcp47
382+
dateSeparator
385383
} = this.props;
386384
const {
387385
id,
@@ -507,7 +505,7 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
507505
isBeingEdited={isBeingEdited}
508506
isPreview={isPreview}
509507
pinned={pinned}
510-
autoTranslateLanguage={autoTranslateLanguageBcp47 || autoTranslateLanguage}
508+
autoTranslateLanguage={autoTranslateLanguage}
511509
/>
512510
<MessageSeparator ts={dateSeparator} unread={showUnreadSeparator} />
513511
</MessageContext.Provider>

app/views/RoomView/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
13581358
useRealName={useRealName}
13591359
isReadReceiptEnabled={Message_Read_Receipt_Enabled}
13601360
autoTranslateRoom={canAutoTranslate && 'id' in room && room.autoTranslate}
1361-
autoTranslateLanguage={'id' in room ? room.autoTranslateLanguage : undefined}
1361+
autoTranslateLanguage={'id' in room ? room?.autoTranslateLanguageBcp47 || room.autoTranslateLanguage : undefined}
13621362
navToRoomInfo={this.navToRoomInfo}
13631363
getCustomEmoji={this.getCustomEmoji}
13641364
handleEnterCall={this.handleEnterCall}
@@ -1372,7 +1372,6 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
13721372
isBeingEdited={isBeingEdited}
13731373
dateSeparator={dateSeparator}
13741374
showUnreadSeparator={showUnreadSeparator}
1375-
autoTranslateLanguageBcp47={'id' in room ? room?.autoTranslateLanguageBcp47 : undefined}
13761375
/>
13771376
);
13781377
}

0 commit comments

Comments
 (0)