Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapting i18n and add Simplified Chinese for web pages on branch 2.5.x #10607

Open
wants to merge 2 commits into
base: 2.5.x
Choose a base branch
from
+1,347 −120
Open

Adapting i18n and add Simplified Chinese for web pages on branch 2.5.x #10607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e86a886
Fix mismatched version numbers
inRemark Jan 9, 2024
8c6633b
[#noissue] Adapting i18n and add simplified chinese to web pages on b…
inRemark Jan 13, 2024
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
4 changes: 2 additions & 2 deletions agent-testweb/grpc-plugin-testweb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pinpoint-agent-testweb</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.5.4-SNAPSHOT</version>
</parent>

<artifactId>pinpoint-grpc-plugin-testweb</artifactId>
Expand Down Expand Up @@ -94,4 +94,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions agent-testweb/ning-asynchttpclient-plugin-testweb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pinpoint-agent-testweb</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.5.4-SNAPSHOT</version>
</parent>

<artifactId>pinpoint-ning-asynchttpclient-plugin-testweb</artifactId>
Expand Down Expand Up @@ -48,4 +48,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions agent-testweb/okhttp-plugin-testweb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pinpoint-agent-testweb</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.5.4-SNAPSHOT</version>
</parent>

<artifactId>pinpoint-okhttp-plugin-testweb</artifactId>
Expand Down Expand Up @@ -48,4 +48,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
2 changes: 1 addition & 1 deletion commons/src/main/java/com/navercorp/pinpoint/common/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.navercorp.pinpoint.common;
public final class Version {
public static final String VERSION = "2.5.4";
public static final String VERSION = "2.5.4-SNAPSHOT";
}
8 changes: 4 additions & 4 deletions ...gular/src/app/core/components/alarm-rule-list/alarm-rule-create-and-update.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="l-wrapper">
<button class="btn btn-black l-close" (click)="onClose(); formDir.resetForm();"><i class="fas fa-times"></i></button>
<h1>{{editAlarm ? 'Edit Alarm' : 'Add Alarm'}}</h1>
<h1>{{editAlarm ? i18nLabel.EDIT_LABEL : i18nLabel.ADD_LABEL }}</h1>
<form [formGroup]="alarmForm" #formDir="ngForm" (ngSubmit)="onCreateOrUpdate()">
<div class="l-form-grid">
<div>
Expand Down Expand Up @@ -56,7 +56,7 @@ <h1>{{editAlarm ? 'Edit Alarm' : 'Add Alarm'}}</h1>
<div class="l-form-label">Webhook</div>
<div class="l-form-webhook-container" [style.overflow-y]="webhookListScroll">
<div class="l-form-webhook-list">
<pp-alarm-rule-webhook-list
<pp-alarm-rule-webhook-list
*ngFor="let webhook of webhookList"
[webhook]="webhook"
[checkedWebhookList]="checkedWebhookList"
Expand All @@ -70,7 +70,7 @@ <h1>{{editAlarm ? 'Edit Alarm' : 'Add Alarm'}}</h1>
go to <a routerLink="/config/webhook">webhook configuration page</a>.
</div>
</div>
<pp-loading [showLoading]="showWebhookLoading" [zIndex]="20"></pp-loading>
<pp-loading [showLoading]="showWebhookLoading" [zIndex]="20"></pp-loading>
<pp-film-for-disable *ngIf="disableWebhookList || isWebhookSelectDisable" [zIndex]="9" [marginWidth]="0" [height]="9999"></pp-film-for-disable>
</div>
</div>
Expand All @@ -79,6 +79,6 @@ <h1>{{editAlarm ? 'Edit Alarm' : 'Add Alarm'}}</h1>
<div class="l-form-label">{{i18nLabel.NOTES_LABEL}}</div>
<textarea id="notes" class="l-textarea" formControlName="notes"></textarea>
</div>
<button type="submit" class="btn btn-blue l-create">OK</button>
<button type="submit" class="btn btn-blue l-create">{{ i18nLabel.SUBMIT_LABEL }}</button>
</form>
</div>
10 changes: 5 additions & 5 deletions .../angular/src/app/core/components/alarm-rule-list/alarm-rule-list-container.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<tr>
<th>
<div class="l-table-title">
<div class="l-title-text">Alarm</div>
<div class="l-title-text">{{ i18nLabel.ALARM_TITLE_LABEL }}</div>
<button class="btn btn-blue btn-sm l-add-button fas fa-plus" (click)="onClickAddBtn()" [disabled]="!isApplicationSelected()"></button>
</div>
<div class="l-alarm-rules-th">
<div>Rule Name</div>
<div>User Group</div>
<div>Threshold</div>
<div>Type</div>
<div>{{ i18nLabel.RULE_NAME_LABEL }}</div>
<div>{{ i18nLabel.USER_GROUP_LABEL }}</div>
<div>{{ i18nLabel.THRESHOLD_LABEL }}</div>
<div>{{ i18nLabel.TYPE_LABEL }}</div>
<div></div>
</div>
</th>
Expand Down
21 changes: 19 additions & 2 deletions ...in/angular/src/app/core/components/alarm-rule-list/alarm-rule-list-container.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ export class AlarmRuleListContainerComponent implements OnInit, OnDestroy {
THRESHOLD_LABEL: '',
TYPE_LABEL: '',
NOTES_LABEL: '',
ALARM_TITLE_LABEL: '',
RULE_NAME_LABEL: '',
EDIT_LABEL: '',
ADD_LABEL: '',
SUBMIT_LABEL: '',
};
i18nTemplateGuide = {
APP_NOT_SELECTED: '',
Expand Down Expand Up @@ -115,8 +120,15 @@ export class AlarmRuleListContainerComponent implements OnInit, OnDestroy {
this.translateService.get('CONFIGURATION.COMMON.TYPE'),
this.translateService.get('CONFIGURATION.COMMON.NOTES'),
this.translateService.get('CONFIGURATION.ALARM.EMPTY'),
this.translateService.get('COMMON.SELECT_YOUR_APP')
).subscribe(([requiredMessage, checkerLabel, userGroupLabel, thresholdLabel, typeLabel, notesLabel, alarmEmpty, selectApp]: string[]) => {
this.translateService.get('COMMON.SELECT_YOUR_APP'),
this.translateService.get('CONFIGURATION.ALARM.TITLE'),
this.translateService.get('CONFIGURATION.ALARM.RULE_NAME'),
this.translateService.get('CONFIGURATION.ALARM.EDIT_TITLE'),
this.translateService.get('CONFIGURATION.ALARM.ADD_TITLE'),
this.translateService.get('COMMON.SUBMIT'),
).subscribe(([requiredMessage, checkerLabel, userGroupLabel, thresholdLabel, typeLabel,
notesLabel, alarmEmpty, selectApp, alarmLabel, ruleNameLabel,
editAlarmLabel, addAlarmLabel, submitLabel]: string[]) => {
this.i18nFormGuide = {
checkerName: { required: this.translateReplaceService.replace(requiredMessage, checkerLabel) },
userGroupId: { required: this.translateReplaceService.replace(requiredMessage, userGroupLabel) },
Expand All @@ -132,6 +144,11 @@ export class AlarmRuleListContainerComponent implements OnInit, OnDestroy {
this.i18nLabel.THRESHOLD_LABEL = thresholdLabel;
this.i18nLabel.TYPE_LABEL = typeLabel;
this.i18nLabel.NOTES_LABEL = notesLabel;
this.i18nLabel.ALARM_TITLE_LABEL = alarmLabel;
this.i18nLabel.RULE_NAME_LABEL = ruleNameLabel;
this.i18nLabel.EDIT_LABEL = editAlarmLabel;
this.i18nLabel.ADD_LABEL = addAlarmLabel;
this.i18nLabel.SUBMIT_LABEL = submitLabel;

this.i18nTemplateGuide.NO_ALARM_RESGISTERED = alarmEmpty;
this.i18nTemplateGuide.APP_NOT_SELECTED = selectApp;
Expand Down
12 changes: 6 additions & 6 deletions ...omponents/application-list/application-list-for-agent-management-container.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="l-application-wrapper">
<div class="l-application-title">
<span>Application</span>
<span>{{ i18nText.APPLICATION_LABEL }}</span>
</div>
<div class="l-application-search">
<input type="text" placeholder="{{i18nText.SEARCH_INPUT_GUIDE}}" class="l-search-input"
ppSearchInput
<input type="text" placeholder="{{i18nText.SEARCH_INPUT_GUIDE}}" class="l-search-input"
ppSearchInput
[searchMinLength]="SEARCH_MIN_LENGTH"
[useEnter]="searchUseEnter"
(outCancel)="onCancel()"
Expand All @@ -13,12 +13,12 @@
</div>
<div class="l-application-list">
<ng-container *ngIf="!isEmpty; else emptyText">
<pp-application-list-for-header
<pp-application-list-for-header
[showTitle]="showTitle"
[restCount]="restCount"
[focusIndex]="focusIndex"
[focusType]="focusType"
[applicationList]="filteredAppList"
[applicationList]="filteredAppList"
[selectedApplication]="selectedApp"
[funcImagePath]="funcImagePath"
(outSelected)="onSelectApp($event)"
Expand All @@ -29,6 +29,6 @@
<p class="l-empty-text">{{i18nText.EMPTY}}</p>
</ng-template>
</div>
<pp-film-for-disable *ngIf="useDisable" [zIndex]="9" [marginWidth]="0"></pp-film-for-disable>
<pp-film-for-disable *ngIf="useDisable" [zIndex]="9" [marginWidth]="0"></pp-film-for-disable>
<pp-loading [showLoading]="showLoading" [zIndex]="11"></pp-loading>
</div>
9 changes: 6 additions & 3 deletions .../components/application-list/application-list-for-agent-management-container.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ export class ApplicationListForAgentManagementContainerComponent implements OnIn
SEARCH_MIN_LENGTH = 2;
i18nText = {
SEARCH_INPUT_GUIDE: '',
EMPTY: ''
EMPTY: '',
APPLICATION_LABEL: '',
};
isEmpty: boolean;
useDisable = true;
Expand Down Expand Up @@ -83,10 +84,12 @@ export class ApplicationListForAgentManagementContainerComponent implements OnIn
private initI18nText(): void {
forkJoin(
this.translateService.get('COMMON.INPUT_APP_NAME_PLACE_HOLDER'),
this.translateService.get('COMMON.EMPTY_ON_SEARCH')
).subscribe(([placeholderText, emptyText]: string[]) => {
this.translateService.get('COMMON.EMPTY_ON_SEARCH'),
this.translateService.get('COMMON.APPLICATION'),
).subscribe(([placeholderText, emptyText, applicationLabel]: string[]) => {
this.i18nText.SEARCH_INPUT_GUIDE = placeholderText;
this.i18nText.EMPTY = emptyText;
this.i18nText.APPLICATION_LABEL = applicationLabel;
});
}

Expand Down
12 changes: 6 additions & 6 deletions ...onents/application-list/application-list-for-configuration-alarm-container.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="l-application-wrapper">
<div class="l-application-title">
<span>Application</span>
<span>{{ i18nText.APPLICATION_LABEL }}</span>
</div>
<div class="l-application-search">
<input type="text" placeholder="{{i18nText.SEARCH_INPUT_GUIDE}}" class="l-search-input"
ppSearchInput
<input type="text" placeholder="{{i18nText.SEARCH_INPUT_GUIDE}}" class="l-search-input"
ppSearchInput
[searchMinLength]="SEARCH_MIN_LENGTH"
[useEnter]="searchUseEnter"
(outCancel)="onCancel()"
Expand All @@ -13,12 +13,12 @@
</div>
<div class="l-application-list">
<ng-container *ngIf="!isEmpty; else emptyText">
<pp-application-list-for-header
<pp-application-list-for-header
[showTitle]="showTitle"
[restCount]="restCount"
[focusIndex]="focusIndex"
[focusType]="focusType"
[applicationList]="filteredAppList"
[applicationList]="filteredAppList"
[selectedApplication]="selectedApp"
[funcImagePath]="funcImagePath"
(outSelected)="onSelectApp($event)"
Expand All @@ -29,6 +29,6 @@
<p class="l-empty-text">{{i18nText.EMPTY}}</p>
</ng-template>
</div>
<pp-film-for-disable *ngIf="useDisable" [zIndex]="9" [marginWidth]="0"></pp-film-for-disable>
<pp-film-for-disable *ngIf="useDisable" [zIndex]="9" [marginWidth]="0"></pp-film-for-disable>
<pp-loading [showLoading]="showLoading" [zIndex]="11"></pp-loading>
</div>
9 changes: 6 additions & 3 deletions ...mponents/application-list/application-list-for-configuration-alarm-container.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ export class ApplicationListForConfigurationAlarmContainerComponent implements O
SEARCH_MIN_LENGTH = 2;
i18nText = {
SEARCH_INPUT_GUIDE: '',
EMPTY: ''
EMPTY: '',
APPLICATION_LABEL: '',
};
isEmpty: boolean;
useDisable = true;
Expand Down Expand Up @@ -68,10 +69,12 @@ export class ApplicationListForConfigurationAlarmContainerComponent implements O
private initI18nText(): void {
forkJoin(
this.translateService.get('COMMON.INPUT_APP_NAME_PLACE_HOLDER'),
this.translateService.get('COMMON.EMPTY_ON_SEARCH')
).subscribe(([placeholderText, emptyText]: string[]) => {
this.translateService.get('COMMON.EMPTY_ON_SEARCH'),
this.translateService.get('COMMON.APPLICATION'),
).subscribe(([placeholderText, emptyText, applicationLabel]: string[]) => {
this.i18nText.SEARCH_INPUT_GUIDE = placeholderText;
this.i18nText.EMPTY = emptyText;
this.i18nText.APPLICATION_LABEL = applicationLabel;
});
}

Expand Down
12 changes: 6 additions & 6 deletions ...ents/application-list/application-list-for-configuration-webhook-container.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="l-application-wrapper">
<div class="l-application-title">
<span>Application</span>
<span>{{ i18nText.APPLICATION_LABEL }}</span>
</div>
<div class="l-application-search">
<input type="text" placeholder="{{i18nText.SEARCH_INPUT_GUIDE}}" class="l-search-input"
ppSearchInput
<input type="text" placeholder="{{i18nText.SEARCH_INPUT_GUIDE}}" class="l-search-input"
ppSearchInput
[searchMinLength]="SEARCH_MIN_LENGTH"
[useEnter]="searchUseEnter"
(outCancel)="onCancel()"
Expand All @@ -13,12 +13,12 @@
</div>
<div class="l-application-list">
<ng-container *ngIf="!isEmpty; else emptyText">
<pp-application-list-for-header
<pp-application-list-for-header
[showTitle]="showTitle"
[restCount]="restCount"
[focusIndex]="focusIndex"
[focusType]="focusType"
[applicationList]="filteredAppList"
[applicationList]="filteredAppList"
[selectedApplication]="selectedApp"
[funcImagePath]="funcImagePath"
(outSelected)="onSelectApp($event)"
Expand All @@ -29,6 +29,6 @@
<p class="l-empty-text">{{i18nText.EMPTY}}</p>
</ng-template>
</div>
<pp-film-for-disable *ngIf="useDisable" [zIndex]="9" [marginWidth]="0"></pp-film-for-disable>
<pp-film-for-disable *ngIf="useDisable" [zIndex]="9" [marginWidth]="0"></pp-film-for-disable>
<pp-loading [showLoading]="showLoading" [zIndex]="11"></pp-loading>
</div>
9 changes: 6 additions & 3 deletions ...onents/application-list/application-list-for-configuration-webhook-container.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ export class ApplicationListForConfigurationWebhookContainerComponent implements
SEARCH_MIN_LENGTH = 2;
i18nText = {
SEARCH_INPUT_GUIDE: '',
EMPTY: ''
EMPTY: '',
APPLICATION_LABEL: '',
};
isEmpty: boolean;
useDisable = true;
Expand Down Expand Up @@ -69,10 +70,12 @@ export class ApplicationListForConfigurationWebhookContainerComponent implements
private initI18nText(): void {
forkJoin(
this.translateService.get('COMMON.INPUT_APP_NAME_PLACE_HOLDER'),
this.translateService.get('COMMON.EMPTY_ON_SEARCH')
).subscribe(([placeholderText, emptyText]: string[]) => {
this.translateService.get('COMMON.EMPTY_ON_SEARCH'),
this.translateService.get('COMMON.APPLICATION'),
).subscribe(([placeholderText, emptyText, applicationLabel]: string[]) => {
this.i18nText.SEARCH_INPUT_GUIDE = placeholderText;
this.i18nText.EMPTY = emptyText;
this.i18nText.APPLICATION_LABEL = applicationLabel;
});
}

Expand Down
4 changes: 2 additions & 2 deletions ...pp/core/components/configuration-favorite/configuration-favorite-container.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!-- <div class="l-desc-text-wrapper"><p class="l-desc-text nanumgothic">{{desc$ | async}}</p></div> -->
<div class="l-title"><span>Favorite Application List</span></div>
<div class="l-title"><span>{{ favoriteLabel$ | async }}</span></div>
<div class="l-contents">
<div class="l-content-item">
<pp-application-list-for-configuration-container></pp-application-list-for-configuration-container>
</div>
<div class="l-content-item">
<pp-favorite-application-list-for-configuration-container></pp-favorite-application-list-for-configuration-container>
</div>
</div>
</div>
3 changes: 2 additions & 1 deletion .../app/core/components/configuration-favorite/configuration-favorite-container.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { getApplicationList, getFavApplicationList } from 'app/shared/store/acti
})
export class ConfigurationFavoriteContainerComponent implements OnInit {
desc$: Observable<string>;

favoriteLabel$: Observable<string>;
constructor(
private translateService: TranslateService,
private storeHelperService: StoreHelperService,
Expand All @@ -26,5 +26,6 @@ export class ConfigurationFavoriteContainerComponent implements OnInit {

private initDescText(): void {
this.desc$ = this.translateService.get('CONFIGURATION.GENERAL.DESC');
this.favoriteLabel$ = this.translateService.get('MAIN.FAVORITE_APP_LIST');
}
}
4 changes: 2 additions & 2 deletions ...c/main/angular/src/app/core/components/group-member/group-member-container.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="l-group-member-wrapper">
<div class="l-group-member-title">
<span>Group Member ({{groupMemberList.length}})</span>
<span>{{ memberLabel$ | async }} ({{groupMemberList.length}})</span>
<div>
<button *ngIf="currentUserGroupId" class="btn btn-sm btn-blue" (click)="onReload()"><i class="fas fa-sync"></i></button>
<button class="fas fa-exchange-alt l-group-member-sort-exchange" (click)="onSort()"></button>
Expand All @@ -23,6 +23,6 @@
(outClose)="onCloseErrorMessage()">
</pp-server-error-message>
</ng-container>
<pp-film-for-disable *ngIf="useDisable" [zIndex]="9" [marginWidth]="0"></pp-film-for-disable>
<pp-film-for-disable *ngIf="useDisable" [zIndex]="9" [marginWidth]="0"></pp-film-for-disable>
<pp-loading [showLoading]="showLoading" [zIndex]="20"></pp-loading>
</div>
2 changes: 2 additions & 0 deletions ...src/main/angular/src/app/core/components/group-member/group-member-container.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export class GroupMemberContainerComponent implements OnInit, OnDestroy {
showLoading = false;
errorMessage: string;
emptyText$: Observable<string>;
memberLabel$: Observable<string>;

constructor(
private translateService: TranslateService,
Expand All @@ -30,6 +31,7 @@ export class GroupMemberContainerComponent implements OnInit, OnDestroy {
) {}
ngOnInit() {
this.emptyText$ = this.translateService.get('COMMON.EMPTY');
this.memberLabel$ = this.translateService.get('CONFIGURATION.USER_GROUP.MEMBER');
this.messageQueueService.receiveMessage(this.unsubscribe, MESSAGE_TO.USER_GROUP_SELECTED_USER_GROUP).subscribe((param: any) => {
this.currentUserGroupId = param;
if (this.isValidUserGroupId()) {
Expand Down
Loading