diff --git a/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/file-viewer.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/file-viewer.dialog.component.ts index 26e991a0..85a2dee6 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/file-viewer.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/file-viewer.dialog.component.ts @@ -115,7 +115,8 @@ export class FileViewerDialogComponent implements OnInit, OnDestroy { this.snackBarService.open( this.translateService.instant( 'common.file.errors.failToSave' - ) + ), + this.translateService.instant('common.file.errors.label') ); } }) @@ -123,7 +124,8 @@ export class FileViewerDialogComponent implements OnInit, OnDestroy { this.snackBarService.open( this.translateService.instant( 'common.file.errors.failToSave' - ) + ), + this.translateService.instant('common.file.errors.label') ); }); }) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts index 1111bdb9..977359ea 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts @@ -33,7 +33,6 @@ import { ExpansionPanelComponent as GroupExpansionPanelComponent } from '@ucap-w import { LoginResponse } from '@ucap-webmessenger/protocol-authentication'; import { UserInfo, GroupDetailData } from '@ucap-webmessenger/protocol-sync'; -import { StatusProtocolService } from '@ucap-webmessenger/protocol-status'; import { DeptSearchType, UserInfoSS, @@ -74,6 +73,7 @@ import { MessageWriteDialogData } from '../../dialogs/message/message-write.dialog.component'; import { environment } from '../../../../../environments/environment'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-layout-chat-left-sidenav-group', @@ -125,7 +125,7 @@ export class GroupComponent implements OnInit, OnDestroy { private sessionStorageService: SessionStorageService, private dialogService: DialogService, private queryProtocolService: QueryProtocolService, - private statusProtocolService: StatusProtocolService, + private translateService: TranslateService, private logger: NGXLogger ) { this.environmentsInfo = this.sessionStorageService.get( @@ -506,8 +506,16 @@ export class GroupComponent implements OnInit, OnDestroy { >(ConfirmDialogComponent, { width: '360px', data: { - title: 'Delete Member in Group', - html: `[${userInfo.name} ${userInfo.grade}]를 [${group.name}]그룹에서 삭제하시겠습니까?` + title: this.translateService.instant( + 'group.removeBuddyFromGroup' + ), + html: this.translateService.instant( + 'group.confirmRemoveBuddyFromGroupInContextMenu', + { + target: `${userInfo.name} ${userInfo.grade}`, + targetGroup: `${group.name}` + } + ) } }); @@ -533,7 +541,7 @@ export class GroupComponent implements OnInit, OnDestroy { >(SelectGroupDialogComponent, { width: '600px', data: { - title: 'Group Select' + title: this.translateService.instant('group.selectTargetGroup') } }); @@ -572,7 +580,7 @@ export class GroupComponent implements OnInit, OnDestroy { >(SelectGroupDialogComponent, { width: '600px', data: { - title: 'Group Select' + title: this.translateService.instant('group.selectTargetGroup') } }); @@ -707,7 +715,7 @@ export class GroupComponent implements OnInit, OnDestroy { EditGroupDialogResult >(EditGroupDialogComponent, { data: { - title: 'Group Name Edit', + title: this.translateService.instant('group.changeGroupName'), group } }); @@ -735,7 +743,7 @@ export class GroupComponent implements OnInit, OnDestroy { width: '600px', data: { type: UserSelectDialogType.EditMember, - title: 'Group Member Edit', + title: this.translateService.instant('group.modifyGroupMember'), group } }); @@ -764,8 +772,10 @@ export class GroupComponent implements OnInit, OnDestroy { >(ConfirmDialogComponent, { width: '360px', data: { - title: 'Delete group', - html: `그룹(${group.name})을 삭제하시겠습니까?
그룹 멤버는 해당 그룹에서만 삭제됩니다.` + title: this.translateService.instant('group.removeGroup'), + html: this.translateService.instant('group.confirmRemoveGroup', { + nameOfGroup: `${group.name}` + }) } }); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html index 0731f5f0..478a1e7f 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html @@ -156,7 +156,7 @@ {{ 'organization.startChat' | translate }} -
  • +