translate is modified

This commit is contained in:
병준 박 2019-12-24 18:14:16 +09:00
parent dc27cd1cd5
commit d9c164298b
6 changed files with 43 additions and 18 deletions

View File

@ -174,7 +174,7 @@ export class LeftSideComponent implements OnInit, OnDestroy {
width: '600px', width: '600px',
data: { data: {
type: UserSelectDialogType.NewChat, type: UserSelectDialogType.NewChat,
title: type === 'TIMER' ? 'New Timer Chat' : 'New Chat' title: type === 'TIMER' ? 'chat.newTimerChat' : 'chat.newChat'
} }
}); });
@ -203,7 +203,7 @@ export class LeftSideComponent implements OnInit, OnDestroy {
width: '600px', width: '600px',
data: { data: {
type: UserSelectDialogType.NewGroup, type: UserSelectDialogType.NewGroup,
title: 'New Group' title: 'group.addNew'
} }
}); });

View File

@ -1,19 +1,21 @@
<mat-card class="confirm-card mat-elevation-z"> <mat-card class="confirm-card mat-elevation-z">
<mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle> <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
<mat-card-title>{{ data.title }}</mat-card-title> <mat-card-title>{{ data.title | translate }}</mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<div *ngIf="data.type === UserSelectDialogType.NewGroup"> <div *ngIf="data.type === UserSelectDialogType.NewGroup">
<form name="inputForm" [formGroup]="inputForm" novalidate> <form name="inputForm" [formGroup]="inputForm" novalidate>
<mat-form-field <mat-form-field
hintLabel="특수문자는 '-,_'만 사용할 수 있습니다." hintLabel="{{
'common.useOnlyForSpecialCharacter' | translate: { v: '-,_' }
}}"
style="display:block;margin-bottom:10px;" style="display:block;margin-bottom:10px;"
> >
<input <input
matInput matInput
#input #input
maxlength="20" maxlength="20"
placeholder="그룹이름" placeholder="{{ 'group.name' | translate }}"
formControlName="groupName" formControlName="groupName"
/> />
<mat-hint align="end">{{ input.value?.length || 0 }}/20</mat-hint> <mat-hint align="end">{{ input.value?.length || 0 }}/20</mat-hint>
@ -45,7 +47,7 @@
stroke-width="1.5" stroke-width="1.5"
stroke-linecap="butt" stroke-linecap="butt"
stroke-linejoin="round" stroke-linejoin="round"
matTooltip="그룹" matTooltip="{{ 'group.label' | translate }}"
matTooltipPosition="after" matTooltipPosition="after"
> >
<path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path> <path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path>
@ -107,7 +109,7 @@
</div> </div>
<div class="result-num"> <div class="result-num">
검색결과 {{ 'common.searchResult' | translate }}
<span class="text-accent-color" <span class="text-accent-color"
>({{ searchUserInfos.length }}명)</span >({{ searchUserInfos.length }}명)</span
> >
@ -129,7 +131,9 @@
</mat-tab> </mat-tab>
<mat-tab> <mat-tab>
<ng-template mat-tab-label> <ng-template mat-tab-label>
<mat-icon matTooltip="조직도" matTooltipPosition="after" <mat-icon
matTooltip="{{ 'organization.chart' | translate }}"
matTooltipPosition="after"
>device_hub</mat-icon >device_hub</mat-icon
> >
</ng-template> </ng-template>
@ -150,7 +154,9 @@
</mat-tab> </mat-tab>
<mat-tab *ngIf="data.type === UserSelectDialogType.MessageForward"> <mat-tab *ngIf="data.type === UserSelectDialogType.MessageForward">
<ng-template mat-tab-label> <ng-template mat-tab-label>
<mat-icon matTooltip="대화방" matTooltipPosition="before" <mat-icon
matTooltip="{{ 'chat.room' | translate }}"
matTooltipPosition="before"
>chat</mat-icon >chat</mat-icon
> >
</ng-template> </ng-template>
@ -187,7 +193,8 @@
</mat-chip-list> </mat-chip-list>
</div> </div>
<span *ngIf="isShowSelectedUserList" <span *ngIf="isShowSelectedUserList"
>{{ selectedUserList.length }}명</span >{{ selectedUserList.length }}
{{ 'common.howPersons' | translate }}</span
> >
</div> </div>
</mat-card-content> </mat-card-content>

View File

@ -2,7 +2,9 @@
"common": { "common": {
"search": "Search", "search": "Search",
"searchWord": "Search word", "searchWord": "Search word",
"useOnlyForSpecialCharacter": "Can only use Special characters: {{0}}", "searchResult": "Search result",
"useOnlyForSpecialCharacter": "Can only use Special characters: {{v}}",
"howPersons": "person(s)",
"timezone": { "timezone": {
"Africa/Abidjan": "Africa/Abidjan", "Africa/Abidjan": "Africa/Abidjan",
"Africa/Accra": "Africa/Accra", "Africa/Accra": "Africa/Accra",
@ -606,7 +608,13 @@
"expandLess": "Collapse all groups", "expandLess": "Collapse all groups",
"name": "Group name" "name": "Group name"
}, },
"chat": {}, "chat": {
"organization": {}, "room": "Chat room",
"newTimerChat": "New Timer Chat",
"newChat": "New Chat"
},
"organization": {
"chart": "Organization chart"
},
"message": {} "message": {}
} }

View File

@ -2,7 +2,9 @@
"common": { "common": {
"search": "검색", "search": "검색",
"searchWord": "검색어", "searchWord": "검색어",
"useOnlyForSpecialCharacter": "특수문자는 {{0}}만 사용할 수 있습니다.", "searchResult": "검색 결과",
"useOnlyForSpecialCharacter": "특수문자는 {{v}}만 사용할 수 있습니다.",
"howPersons": "명",
"timezone": { "timezone": {
"Africa/Abidjan": "아프리카/아비 장", "Africa/Abidjan": "아프리카/아비 장",
"Africa/Accra": "아프리카/아크라", "Africa/Accra": "아프리카/아크라",
@ -606,7 +608,13 @@
"expandLess": "그룹 전체 닫기", "expandLess": "그룹 전체 닫기",
"name": "그룹 이름" "name": "그룹 이름"
}, },
"chat": {}, "chat": {
"organization": {}, "room": "대화방",
"newTimerChat": "새로운 타이머 대화",
"newChat": "새로운 대화"
},
"organization": {
"chart": "조직도"
},
"message": {} "message": {}
} }

View File

@ -15,7 +15,7 @@
<input <input
matInput matInput
#searchWordInput #searchWordInput
placeholder="검색어" placeholder="{{ 'common.searchWord' | translate }}"
(keydown.enter)="onKeyDownEnter(searchWordInput.value)" (keydown.enter)="onKeyDownEnter(searchWordInput.value)"
/> />
<button <button

View File

@ -15,7 +15,7 @@ import { MatSelectModule } from '@angular/material/select';
import { MatTreeModule } from '@angular/material/tree'; import { MatTreeModule } from '@angular/material/tree';
import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
import { TranslateModule } from '@ngx-translate/core';
import { UCapUiModule } from '@ucap-webmessenger/ui'; import { UCapUiModule } from '@ucap-webmessenger/ui';
import { TenantSearchComponent } from './components/tenant-search.component'; import { TenantSearchComponent } from './components/tenant-search.component';
@ -39,6 +39,8 @@ const SERVICES = [];
MatSelectModule, MatSelectModule,
MatTreeModule, MatTreeModule,
TranslateModule,
PerfectScrollbarModule, PerfectScrollbarModule,
UCapUiModule UCapUiModule