Skip to content

Commit c710511

Browse files
authored
Merge pull request #1402 from jumpserver/pr@dev@fix_translate
Fixed: translate
2 parents 4dd14e9 + 7245ebe commit c710511

4 files changed

Lines changed: 10 additions & 4 deletions

File tree

src/app/elements/iframe/iframe.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
174174
this.ping = setInterval(() => {
175175
this._logger.info(`[Luna] Send PING to: ${this.id}`);
176176
this.iframeWindow.postMessage(
177-
{ name: 'PING', id: this.id, protocol: this.view.protocol },
177+
{ name: 'PING', id: this.id, category: this.view.asset.category.value },
178178
'*'
179179
);
180180
}, 500);

src/app/elements/replay/guacamole/guacamole.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="content">
1212
<div class="commands" *ngIf="commands.length > 0">
1313
<div class="commands-header">
14-
<span>{{ "Commands" | translate }} ({{ commands.length }})</span>
14+
<span>{{ 'HistoryCommands' | translate }} ({{ commands.length }})</span>
1515
</div>
1616
<div class="commands-list"
1717
infiniteScroll

src/app/elements/replay/parts/parts.component.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,13 @@ export class ElementsPartsComponent implements OnInit {
265265
}
266266

267267
toSafeLocalDateStr(d) {
268-
const date_s = d.toLocaleString(this.getUserLang(), { hour12: false });
268+
let lang = this.getUserLang();
269+
270+
if (lang === 'zh-hans') {
271+
lang = 'zh-CN'
272+
}
273+
274+
const date_s = d.toLocaleString(lang, { hour12: false });
269275
return date_s.split('/').join('-');
270276
}
271277
}

src/app/services/connect-token/acl-dialog/acl-dialog.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ export class ElementACLDialogComponent implements OnInit {
362362
},
363363
acl_face_online_not_supported: {
364364
title: 'Login reminder',
365-
message: this.data.errorDetail,
365+
message: 'FaceOnlineNotSupported',
366366
isError: true,
367367
actions: [
368368
{

0 commit comments

Comments
 (0)