# 이슈처리.
136 쪽지 날짜 표기 오류 151 쪽지 예약 보내기 월/일 표기 오류 대화입력폼 다국어 처리.
This commit is contained in:
parent
351c3a121f
commit
4d303df05a
|
@ -198,6 +198,7 @@
|
||||||
"isRoomTypeSecret": "This room is secret type",
|
"isRoomTypeSecret": "This room is secret type",
|
||||||
"notificationIsOn": "Notification is on",
|
"notificationIsOn": "Notification is on",
|
||||||
"notificationIsOff": "Notification is off",
|
"notificationIsOff": "Notification is off",
|
||||||
|
"typeMessage": "Type your message.",
|
||||||
"event": {
|
"event": {
|
||||||
"inviteToRoomWith": "{{owner}} invited {{inviter}}.",
|
"inviteToRoomWith": "{{owner}} invited {{inviter}}.",
|
||||||
"exitFromRoomWith": "{{exitor}} has left.",
|
"exitFromRoomWith": "{{exitor}} has left.",
|
||||||
|
@ -276,6 +277,8 @@
|
||||||
"detailOfViewers": "Detail of viewers",
|
"detailOfViewers": "Detail of viewers",
|
||||||
"selectRecipient": "Select recipient",
|
"selectRecipient": "Select recipient",
|
||||||
"andOthers": "and {{count}}others",
|
"andOthers": "and {{count}}others",
|
||||||
|
"addReceiver": "Add Reciever",
|
||||||
|
"countOfReceiver": "{{count}} total recipients",
|
||||||
"results": {
|
"results": {
|
||||||
"successForSending": "Your message has been sent.",
|
"successForSending": "Your message has been sent.",
|
||||||
"successForReservation": "You have scheduled a message transfer.",
|
"successForReservation": "You have scheduled a message transfer.",
|
||||||
|
|
|
@ -198,6 +198,7 @@
|
||||||
"isRoomTypeSecret": "비밀 대화방입니다.",
|
"isRoomTypeSecret": "비밀 대화방입니다.",
|
||||||
"notificationIsOn": "알림 켜짐",
|
"notificationIsOn": "알림 켜짐",
|
||||||
"notificationIsOff": "알림 꺼짐",
|
"notificationIsOff": "알림 꺼짐",
|
||||||
|
"typeMessage": "대화를 입력하세요.",
|
||||||
"event": {
|
"event": {
|
||||||
"inviteToRoomWith": "{{owner}}이 {{inviter}}을 초대했습니다.",
|
"inviteToRoomWith": "{{owner}}이 {{inviter}}을 초대했습니다.",
|
||||||
"exitFromRoomWith": "{{exitor}}님이 퇴장하셨습니다.",
|
"exitFromRoomWith": "{{exitor}}님이 퇴장하셨습니다.",
|
||||||
|
@ -276,6 +277,8 @@
|
||||||
"detailOfViewers": "읽음 확인",
|
"detailOfViewers": "읽음 확인",
|
||||||
"selectRecipient": "수신자 선택",
|
"selectRecipient": "수신자 선택",
|
||||||
"andOthers": "외 {{count}}명",
|
"andOthers": "외 {{count}}명",
|
||||||
|
"addReceiver": "수신자 추가",
|
||||||
|
"countOfReceiver": "총 수신자 {{count}}명",
|
||||||
"results": {
|
"results": {
|
||||||
"successForSending": "쪽지를 전송하였습니다.",
|
"successForSending": "쪽지를 전송하였습니다.",
|
||||||
"successForReservation": "쪽지 전송을 예약 하였습니다.",
|
"successForReservation": "쪽지 전송을 예약 하였습니다.",
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
<textarea
|
<textarea
|
||||||
matInput
|
matInput
|
||||||
#replyInput
|
#replyInput
|
||||||
placeholder="Type your message"
|
placeholder="{{ 'chat.typeMessage' | translate }}"
|
||||||
ngModel
|
ngModel
|
||||||
name="message"
|
name="message"
|
||||||
[matTextareaAutosize]="true"
|
[matTextareaAutosize]="true"
|
||||||
|
|
|
@ -61,7 +61,7 @@
|
||||||
</dd>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
<div class="date">
|
<div class="date">
|
||||||
<span>{{ message.regDate | ucapDate: 'MM:DD' }}</span>
|
<span>{{ message.regDate | ucapDate: 'C' }}</span>
|
||||||
<span
|
<span
|
||||||
*ngIf="message.type === MessageType.Receive && !message.readYn"
|
*ngIf="message.type === MessageType.Receive && !message.readYn"
|
||||||
class="badge-new bg-warn-darkest"
|
class="badge-new bg-warn-darkest"
|
||||||
|
|
|
@ -7,9 +7,18 @@
|
||||||
class="mat-mini-fab mat-button-base mat-accent mat-elevation-z"
|
class="mat-mini-fab mat-button-base mat-accent mat-elevation-z"
|
||||||
>
|
>
|
||||||
<mat-icon>add</mat-icon>
|
<mat-icon>add</mat-icon>
|
||||||
<span class="mat-fab__label">수신자 추가</span>
|
<span class="mat-fab__label">{{
|
||||||
|
'message.addReceiver' | translate
|
||||||
|
}}</span>
|
||||||
</button>
|
</button>
|
||||||
<span class="receiver-sum text-accent-color">총 수신자 OO명</span>
|
<span
|
||||||
|
*ngIf="receiverList.length > 0"
|
||||||
|
class="receiver-sum text-accent-color"
|
||||||
|
>
|
||||||
|
{{
|
||||||
|
'message.countOfReceiver' | translate: { count: receiverList.length }
|
||||||
|
}}
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<mat-chip-list #chipList aria-label="receiver selection">
|
<mat-chip-list #chipList aria-label="receiver selection">
|
||||||
<mat-chip
|
<mat-chip
|
||||||
|
|
|
@ -78,6 +78,7 @@ export class GeneralComponent implements OnInit, OnDestroy {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
this.logger.debug('general setting', this.setting);
|
||||||
let themeIndex: number;
|
let themeIndex: number;
|
||||||
switch (this.setting.appTheme) {
|
switch (this.setting.appTheme) {
|
||||||
case 'theme-default':
|
case 'theme-default':
|
||||||
|
|
|
@ -10,6 +10,7 @@ import {
|
||||||
import { ucapAnimations } from '../animations';
|
import { ucapAnimations } from '../animations';
|
||||||
import { MatCalendar, DateAdapter } from '@angular/material';
|
import { MatCalendar, DateAdapter } from '@angular/material';
|
||||||
import { Subject } from 'rxjs';
|
import { Subject } from 'rxjs';
|
||||||
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ucap-pick-date',
|
selector: 'ucap-pick-date',
|
||||||
|
@ -34,7 +35,12 @@ export class PickDateComponent<D> implements OnInit {
|
||||||
calendar: MatCalendar<D>;
|
calendar: MatCalendar<D>;
|
||||||
|
|
||||||
// tslint:disable-next-line: variable-name
|
// tslint:disable-next-line: variable-name
|
||||||
constructor(@Optional() private _dateAdapter: DateAdapter<D>) {}
|
constructor(
|
||||||
|
@Optional() private _dateAdapter: DateAdapter<D>,
|
||||||
|
private translateService: TranslateService
|
||||||
|
) {
|
||||||
|
this._dateAdapter.setLocale(this.translateService.currentLang);
|
||||||
|
}
|
||||||
|
|
||||||
ngOnInit() {}
|
ngOnInit() {}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user