Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/elements/iframe/iframe.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
this.ping = setInterval(() => {
this._logger.info(`[Luna] Send PING to: ${this.id}`);
this.iframeWindow.postMessage(
{ name: 'PING', id: this.id, protocol: this.view.protocol },
{ name: 'PING', id: this.id, category: this.view.asset.category.value },
'*'
);
}, 500);
Expand Down
2 changes: 1 addition & 1 deletion src/app/elements/replay/guacamole/guacamole.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="content">
<div class="commands" *ngIf="commands.length > 0">
<div class="commands-header">
<span>{{ "Commands" | translate }} ({{ commands.length }})</span>
<span>{{ 'HistoryCommands' | translate }} ({{ commands.length }})</span>
</div>
<div class="commands-list"
infiniteScroll
Expand Down
8 changes: 7 additions & 1 deletion src/app/elements/replay/parts/parts.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,13 @@ export class ElementsPartsComponent implements OnInit {
}

toSafeLocalDateStr(d) {
const date_s = d.toLocaleString(this.getUserLang(), { hour12: false });
let lang = this.getUserLang();

if (lang === 'zh-hans') {
lang = 'zh-CN'
}

const date_s = d.toLocaleString(lang, { hour12: false });
return date_s.split('/').join('-');
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ export class ElementACLDialogComponent implements OnInit {
},
acl_face_online_not_supported: {
title: 'Login reminder',
message: this.data.errorDetail,
message: 'FaceOnlineNotSupported',
isError: true,
actions: [
{
Expand Down