diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index 3fc5e952..58c2f1be 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -50,7 +50,7 @@

- 대화방명을 가져오고 있습니다.. + {{ 'chat.getRoomNameInProgress' | translate }} @@ -90,7 +90,7 @@ > {{ getConvertTimer(roomInfo.timeRoomInterval) }} 비밀 대화방입니다. + >{{ 'chat.isRoomTypeSecret' | translate }}

@@ -104,13 +104,13 @@ notifications_active notifications_off diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json index 8cb2a431..110c5459 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json @@ -42,7 +42,25 @@ } }, "profile": { + "my": "My profile", "open": "Open profile", + "changeProfileImage": "Change image of profile", + "favorit": "Favorit", + "addBuddy": "Add a buddy", + "removeBuddy": "Remove a buddy", + "fieldCompany": "Company", + "fieldResponsibilities": "Responsibilities", + "fieldWorkplace": "Workplace", + "fieldJob": "Job", + "fieldCustomerInfo": "CustomerInfo", + "fieldEmail": "Email", + "fieldOfficePhoneNumber": "Office phone", + "fieldHandphone": "Cellphone", + "fieldMyTalk": "MyTalk", + "fieldOneToOneTalk": "1:1 Talk", + "fieldSMS": "SMS", + "fieldVideoConference": "Video conference", + "fieldMessage": "Message", "errors": { "label": "Profile error", "failToChangeProfileImage": "Failed to change profile image." @@ -52,7 +70,44 @@ "label": "Settings", "typeGenernal": "Genernal", "typeNotification": "Notification", - "typeChat": "Chat" + "typeChat": "Chat", + "chat": { + "label": "Chat", + "fontFamily": "Font family", + "fontSize": "Font size", + "file": "File transfer", + "downloadPath": "Download path" + }, + "genernal": { + "theme": "Theme", + "application": "Application", + "autoStartOnBoot": "Auto start on OS boot time", + "autoHideWindow": "Hide window on excuted", + "login": "Login", + "autoLogin": "Auto login", + "language": "Language", + "hrLanguage": "HR language", + "timezone": "Timezone" + }, + "notification": { + "chat": "Chat", + "receival": "Get notified", + "receive": "Receive", + "notReceive": "Not receive", + "method": "Notification method", + "methodTypeSound": "Sound", + "methodTypeAlert": "Alert", + "methodTypeSoundAndAlert": "Sound + Alert", + "settingOfAlertWindow": "Alert", + "mobile": "Mobile", + "receiveForMobile": "Mobile notifications", + "receiveForMobileTypeAlways": "Always get mobile notifications", + "descriptionReceiveForMobileTypeAlways": "Receive mobile notifications only when PC version is absent on release", + "message": "Message", + "receiveForMessage": "Message notifications", + "receiveForMessageTypePopup": "Alert view when receiving a message", + "descriptionReceiveForMobileTypePopup": "Only get notifications on release" + } }, "presence": { "online": "Online", @@ -127,6 +182,10 @@ "ejectFromRoom": "Eject from room", "confirmEjectFromRoom": "Do you want to eject member[{{targetMember}}] from room?", "badgeDescriptionForUnread": "There is an unconfirmed message.", + "getRoomNameInProgress": "Getting chat room name.", + "isRoomTypeSecret": "This room is secret type", + "notificationIsOn": "Notification is on", + "notificationIsOff": "Notification is off", "event": { "inviteToRoomWith": "{{owner}} invited {{inviter}}.", "exitFromRoomWith": "{{exitor}} has left.", @@ -173,10 +232,13 @@ }, "message": { "label": "Message", + "fieldTitle": "Title", + "fieldReceiver": "Receiver", "new": "New message", "remove": "Remove message", "modify": "Modify message", "sendTo": "Send message", + "sendReservation": "Send reservation", "placeholderForSearch": "search for name, title, content", "messageTypeAll": "All", "messageTypeReceiving": "Receiving", @@ -208,7 +270,8 @@ "errors": { "label": "Message error", "failToSending": "The message failed to send.", - "failToModify": "The message failed to modify." + "failToModify": "The message failed to modify.", + "minTimeReservation": "It can be set only 30 minutes after the current time." } }, "notice": { @@ -248,7 +311,12 @@ "hourFrom": "hour", "minute": "minute", "second": "second", - "persons": "person(s)" + "persons": "person(s)", + "hourLaterWith": "(An) {{hour}} hour(s) later", + "tomorrowMorning": "Tomorrow morning", + "tomorrowAfternoon": "Tomorrow afternoon", + "weekLaterWith": "(A) {{week}} week(s) later", + "monthLaterWith": "(A) {{month}} month(s) later" }, "file": { "name": "Name of file", diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json index 824fbfa3..35f1636e 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json @@ -42,7 +42,25 @@ } }, "profile": { + "my": "내 프로필", "open": "프로필 보기", + "changeProfileImage": "프로필 이미지 변경", + "favorit": "즐겨찾기", + "addBuddy": "동료추가", + "removeBuddy": "동료삭제", + "fieldCompany": "회사", + "fieldResponsibilities": "담당업무", + "fieldWorkplace": "근무지", + "fieldJob": "직무", + "fieldCustomerInfo": "거래처", + "fieldEmail": "이메일", + "fieldOfficePhoneNumber": "사무실", + "fieldHandphone": "핸드폰", + "fieldMyTalk": "MyTalk", + "fieldOneToOneTalk": "1:1 대화", + "fieldSMS": "SMS", + "fieldVideoConference": "화상회의", + "fieldMessage": "쪽지", "errors": { "label": "프로필 에러", "failToChangeProfileImage": "프로필 이미지 변경에 실패 하였습니다." @@ -52,7 +70,44 @@ "label": "설정", "typeGenernal": "일반", "typeNotification": "알림", - "typeChat": "대화" + "typeChat": "대화", + "chat": { + "label": "대화", + "fontFamily": "글꼴", + "fontSize": "글 크기", + "file": "파일 전송", + "downloadPath": "다운로드 폴더" + }, + "genernal": { + "theme": "테마", + "application": "응용 프로그램", + "autoStartOnBoot": "Windows 실행 시 자동 실행", + "autoHideWindow": "실행 시 창 숨기기", + "login": "로그인", + "autoLogin": "실행 시 자동 로그인", + "language": "언어", + "hrLanguage": "인사 정보 언어", + "timezone": "시간대" + }, + "notification": { + "chat": "메시지", + "receival": "알림 받기", + "receive": "알림 받음", + "notReceive": "알림 받지 않음", + "method": "알림 방법", + "methodTypeSound": "소리", + "methodTypeAlert": "알림창", + "methodTypeSoundAndAlert": "소리 + 알림창", + "settingOfAlertWindow": "알림창 설정", + "mobile": "모바일", + "receiveForMobile": "모바일 알림", + "receiveForMobileTypeAlways": "항상 모바일 알림을 받음", + "descriptionReceiveForMobileTypeAlways": "해제 시 PC버전이 부재중인 경우에만 모바일 알림을 받음", + "message": "쪽지", + "receiveForMessage": "쪽지 알림", + "receiveForMessageTypePopup": "쪽지 수신 시 팝업보기", + "descriptionReceiveForMobileTypePopup": "해제 시 쪽지 알림만 받음" + } }, "presence": { "online": "온라인", @@ -67,8 +122,8 @@ "nameFavorit": "즐겨찾기", "nameMyDept": "소속부서", "nameDefault": "기본", - "favorite": "즐겨찾기 등록", - "unfavorite": "즐겨찾기 해제", + "favorit": "즐겨찾기 등록", + "unfavorit": "즐겨찾기 해제", "removeBuddyFromGroup": "그룹에서 삭제", "copyBuddyToGroup": "대화 상대 복사", "moveBuddyToGroup": "대화 상대 이동", @@ -127,6 +182,10 @@ "ejectFromRoom": "강퇴", "confirmEjectFromRoom": "{{targetMember}} 님을 대화방에서 퇴장 시키겠습니까?", "badgeDescriptionForUnread": "확인하지 않은 메시지가 있습니다.", + "getRoomNameInProgress": "대화방명을 가져오고 있습니다.", + "isRoomTypeSecret": "비밀 대화방입니다.", + "notificationIsOn": "알림 켜짐", + "notificationIsOff": "알림 꺼짐", "event": { "inviteToRoomWith": "{{owner}}이 {{inviter}}을 초대했습니다.", "exitFromRoomWith": "{{exitor}}님이 퇴장하셨습니다.", @@ -173,10 +232,13 @@ }, "message": { "label": "쪽지", + "fieldTitle": "제목", + "fieldReceiver": "수신자", "new": "새로운 쪽지", "remove": "쪽지 삭제", "modify": "쪽지 수정", "sendTo": "쪽지 보내기", + "sendReservation": "쪽지 예약 보내기", "placeholderForSearch": "이름, 제목, 내용 검색", "messageTypeAll": "전체", "messageTypeReceiving": "수신", @@ -208,7 +270,8 @@ "errors": { "label": "쪽지 에러", "failToSending": "쪽지를 전송에 실패 하였습니다.", - "failToModify": "쪽지 수정에 실패 하였습니다." + "failToModify": "쪽지 수정에 실패 하였습니다.", + "minTimeReservation": "현재 시각으로부터 30분 이후로만 설정 가능합니다." } }, "notice": { @@ -248,7 +311,12 @@ "hourFrom": "시간", "minute": "분", "second": "초", - "persons": "명" + "persons": "명", + "hourLaterWith": "{{hour}}시간 뒤", + "tomorrowMorning": "내일 아침", + "tomorrowAfternoon": "내일 오후", + "weekLaterWith": "{{week}}주일 뒤", + "monthLaterWith": "{{month}}달 뒤" }, "file": { "name": "파일 이름", diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/information.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/information.component.html index 8a2f3384..0fa9cd4f 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/information.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/information.component.html @@ -5,7 +5,7 @@ 'chat.event.inviteToRoomWith' | translate : { - owner: message.sentMessageJson.owner, + owner: getI18nForSir(message.sentMessageJson.owner), inviter: getI18nForSir(message.sentMessageJson.inviter) } }} diff --git a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html index 611b10ac..e08142cb 100644 --- a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html +++ b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html @@ -55,7 +55,9 @@ - 내 프로필 + {{ + 'profile.my' | translate + }} {{ @@ -81,7 +83,8 @@ - ({{ node.countOfChildren }}명)
- + @@ -43,7 +47,7 @@ @@ -80,12 +84,13 @@ (click)="onClickCancel()" class="mat-primary" > - 취소 + {{ 'common.messages.cancel' | translate }} @@ -100,7 +105,7 @@ 0 === contentLength || 1000 < contentLength " - >보내기{{ 'message.sendTo' | translate }} diff --git a/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.html b/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.html index bd2919dd..367db99e 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.html +++ b/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.html @@ -1,7 +1,7 @@ - 예약 발송 + {{ 'message.sendReservation' | translate }} @@ -46,7 +46,7 @@ class="preset-button" (click)="onClickPresetHour(1)" > - 1시간 뒤 + {{ 'common.units.hourLaterWith' | translate: { hour: 1 } }} @@ -55,7 +55,7 @@ class="preset-button" (click)="onClickPresetHour(2)" > - 2시간 뒤 + {{ 'common.units.hourLaterWith' | translate: { hour: 2 } }} @@ -64,7 +64,7 @@ class="preset-button" (click)="onClickPresetTommorowMorning()" > - 내일 아침 + {{ 'common.units.tomorrowMorning' | translate }} @@ -73,7 +73,7 @@ class="preset-button" (click)="onClickPresetTommorowAfternoon()" > - 내일 오후 + {{ 'common.units.tomorrowAfternoon' | translate }} @@ -82,7 +82,7 @@ class="preset-button" (click)="onClickPresetDay(7)" > - 일주일 뒤 + {{ 'common.units.weekLaterWith' | translate: { week: 1 } }} @@ -91,7 +91,7 @@ class="preset-button" (click)="onClickPresetDay(30)" > - 한달 뒤 + {{ 'common.units.monthLaterWith' | translate: { month: 2 } }} @@ -104,7 +104,7 @@
- 현재 시각으로부터 30분 이후로만 설정 가능합니다. + {{ 'message.errors.minTimeReservation' | translate }}
@@ -114,7 +114,7 @@ (click)="onClickCancel()" class="mat-primary" > - 취소 + {{ 'common.messages.cancel' | translate }}
diff --git a/projects/ucap-webmessenger-ui-message/src/lib/ucap-ui-message.module.ts b/projects/ucap-webmessenger-ui-message/src/lib/ucap-ui-message.module.ts index 4aede558..62202c7b 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/ucap-ui-message.module.ts +++ b/projects/ucap-webmessenger-ui-message/src/lib/ucap-ui-message.module.ts @@ -31,6 +31,7 @@ import { ListItemComponent } from './components/list-item.component'; import { WriteComponent } from './components/write.component'; import { ScheduleSendDialogComponent } from './dialogs/schedule-send.dialog.component'; +import { TranslateModule } from '@ngx-translate/core'; const COMPONENTS = [ListItemComponent, WriteComponent]; const DIALOGS = [ScheduleSendDialogComponent]; @@ -57,10 +58,11 @@ const SERVICES = []; MatInputModule, MatListModule, MatMomentDateModule, - MatMenuModule, MatButtonToggleModule, + TranslateModule, + PerfectScrollbarModule, UCapUiModule diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html index 8aa57a0a..1c5bb000 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html @@ -14,7 +14,7 @@ mat-mini-fab class="mat-elevation-z6 btn-upload-profile-image" *ngIf="isMe && editableProfileImage" - matTooltip="프로필 이미지 변경" + matTooltip="{{ 'profile.changeProfileImage' | translate }}" matTooltipPosition="above" [disabled]=" profileImageFileUploadItem && @@ -79,7 +79,7 @@ stroke-linejoin="round" [ngClass]="[isFavorit ? 'on' : '']" (click)="onToggleFavorit()" - matTooltip="즐겨찾기" + matTooltip="{{ 'profile.favorite' | translate }}" > @@ -122,7 +122,7 @@ class="on" *ngIf="getShowBuddyDelBtn()" (click)="onClickDelBuddy()" - matTooltip="동료삭제" + matTooltip="{{ 'profile.removeBuddy' | translate }}" > @@ -157,32 +157,36 @@ -->
  • -
    회사
    +
    {{ 'profile.fieldCompany' | translate }}
    {{ userInfo.companyName | ucapStringEmptycheck }}
  • -
    담당업무
    +
    + {{ 'profile.fieldResponsibilities' | translate }} +
    {{ userInfo.responsibilities | ucapStringEmptycheck }}
  • -
    근무지
    +
    {{ 'profile.fieldworkplace' | translate }}
    {{ userInfo.workplace | ucapStringEmptycheck }}
  • -
    직무
    +
    {{ 'profile.fieldJob' | translate }}
    {{ userInfo.job | ucapStringEmptycheck }}
  • -
    거래처
    +
    {{ 'profile.fieldCustomerInfo' | translate }}
    {{ userInfo.customerInfo | ucapStringEmptycheck }}
  • -
    이메일
    +
    {{ 'profile.fieldEmail' | translate }}
    {{ userInfo.email | ucapStringEmptycheck }}
  • -
    사무실
    +
    + {{ 'profile.fieldOfficePhoneNumber' | translate }} +
    {{ userInfo.lineNumber @@ -194,7 +198,7 @@ mat-mini-fab class="mat-elevation-z userInfo-call" *ngIf="!isMe" - matTooltip="전화" + matTooltip="{{ 'profile.fieldOfficePhoneNumber' | translate }}" matTooltipPosition="above" [disabled]="getDisabledBtn('LINE')" (click)="onClickCall('LINE')" @@ -217,7 +221,7 @@
  • -
    핸드폰
    +
    {{ 'profile.fieldHandphone' | translate }}
    {{ userInfo.hpNumber | ucapStringFormatterPhone | ucapStringEmptycheck @@ -227,7 +231,7 @@ mat-mini-fab class="mat-elevation-z userInfo-call" *ngIf="!isMe" - matTooltip="모바일" + matTooltip="{{ 'profile.fieldHandphone' | translate }}" matTooltipPosition="above" [disabled]="getDisabledBtn('MOBILE')" (click)="onClickCall('MOBILE')" @@ -257,7 +261,10 @@ - 대화 - myTalk + {{ + 'profile.fieldOneToOneTalk' | translate + }} + {{ + 'profile.fieldMyTalk' | translate + }}
    @@ -303,7 +314,7 @@ mat-mini-fab class="mat-elevation-z" *ngIf="!isMe" - matTooltip="SMS" + matTooltip="{{ 'profile.fieldSMS' | translate }}" matTooltipPosition="above" [disabled]="getDisabledBtn('SMS')" (click)="onClickSMS()" @@ -314,7 +325,7 @@ /> - SMS + {{ 'profile.fieldSMS' | translate }}
    @@ -322,7 +333,7 @@ mat-mini-fab class="mat-elevation-z bg-accent-darkest" *ngIf="!isMe" - matTooltip="화상회의" + matTooltip="{{ 'profile.fieldVideoConference' | translate }}" matTooltipPosition="above" (click)="onClickVideoConference()" > @@ -332,7 +343,9 @@ /> - 화상 + {{ + 'profile.fieldVideoConference' | translate + }}
    @@ -340,7 +353,7 @@ mat-mini-fab class="mat-elevation-z bg-accent-darkest" *ngIf="!isMe" - matTooltip="쪽지" + matTooltip="{{ 'profile.fieldMessage' | translate }}" matTooltipPosition="above" (click)="onClickMessage()" > @@ -348,7 +361,9 @@ - 쪽지 + {{ + 'profile.fieldMessage' | translate + }}
    diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/ucap-ui-profile.module.ts b/projects/ucap-webmessenger-ui-profile/src/lib/ucap-ui-profile.module.ts index a8d32a04..e46dc535 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/ucap-ui-profile.module.ts +++ b/projects/ucap-webmessenger-ui-profile/src/lib/ucap-ui-profile.module.ts @@ -19,6 +19,7 @@ import { ListItemComponent } from './components/list-item.component'; import { UserListItemComponent } from './components/user-list-item.component'; import { ProfileComponent } from './components/profile.component'; import { MyProfileWidgetComponent } from './components/my-profile-widget.component'; +import { TranslateModule } from '@ngx-translate/core'; const COMPONENTS = [ ListItemComponent, @@ -44,6 +45,8 @@ const SERVICES = []; MatTooltipModule, MatProgressSpinnerModule, + TranslateModule, + UCapUiModule ], exports: [...COMPONENTS], diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html index 4856720d..f3ffec90 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html @@ -60,7 +60,8 @@ class="num bg-accent-light" *ngIf="roomInfo.roomType === RoomType.Multi" > - {{ roomInfo.joinUserCount }}명 + {{ roomInfo.joinUserCount }} + {{ 'common.units.persons' | translate }}
    notifications_off diff --git a/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts b/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts index 19e16761..ed846f96 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts +++ b/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts @@ -8,9 +8,14 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { ListItemComponent } from './components/list-item.component'; -import { MatBadgeModule, MatCheckboxModule, MatRippleModule } from '@angular/material'; +import { + MatBadgeModule, + MatCheckboxModule, + MatRippleModule +} from '@angular/material'; import { UCapUiModule } from '@ucap-webmessenger/ui'; +import { TranslateModule } from '@ngx-translate/core'; const COMPONENTS = [ListItemComponent]; const DIRECTIVES = []; @@ -29,6 +34,8 @@ const SERVICES = []; MatBadgeModule, MatCheckboxModule, + TranslateModule, + UCapUiModule ], exports: [...COMPONENTS, ...DIRECTIVES], diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/chat.component.html b/projects/ucap-webmessenger-ui-settings/src/lib/components/chat.component.html index 6f0a84f4..84c760d5 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/components/chat.component.html +++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/chat.component.html @@ -1,8 +1,10 @@
    -

    대화

    +

    {{ 'settings.chat.label' | translate }}

    - 글꼴 + {{ + 'settings.chat.fontFamily' | translate + }} - 크기 + {{ 'settings.chat.fontSize' | translate }} -

    파일 전송

    +

    + {{ 'settings.chat.file' | translate }} +

    -

    테마

    +

    {{ 'settings.genernal.theme' | translate }}