sh-edraft.de/sh_discord_bot
5
1
Fork 1
Code Issues 26 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

Refactored translations #232

Browse Source
This commit is contained in:
Sven Heidemann
2023-02-23 10:56:07 +01:00
parent 2d995544c3
commit 5b265488df
17 changed files with 849 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kdb-web/src/app/modules/admin/auth-users/components/auth-user/auth-user.component.html
View File

@@ -10,17 +10,17 @@
<ng-template pTemplate="caption">
<div class="table-caption">
<div class="table-caption-text">
<ng-container *ngIf="!loading">{{users.length}} {{'admin.auth_users.of' | translate}}
<ng-container *ngIf="!loading">{{users.length}} {{'common.of' | translate}}
{{dt.totalRecords}}
</ng-container>
{{'admin.auth_users.users' | translate}}
</div>
<div class="table-caption-btn-wrapper btn-wrapper">
<button pButton label="{{'admin.auth_users.add' | translate}}" class="icon-btn btn"
<button pButton label="{{'common.add' | translate}}" class="icon-btn btn"
icon="pi pi-user-plus" (click)="addUser(dt)" [disabled]="isEditingNew">
</button>
<button pButton label="{{'admin.auth_users.reset_filters' | translate}}" icon="pi pi-undo"
<button pButton label="{{'common.reset_filters' | translate}}" icon="pi pi-undo"
class="icon-btn btn" (click)="resetFilters()">
</button>
</div>
@@ -45,7 +45,7 @@
<th pSortableColumn="email">
<div class="table-header-label">
<div class="table-header-text">{{'admin.auth_users.headers.e_mail' | translate}}</div>
<div class="table-header-text">{{'common.email' | translate}}</div>
<p-sortIcon field="email" class="table-header-icon"></p-sortIcon>
</div>
</th>
@@ -84,7 +84,7 @@
<th class="table-header-actions">
<div class="table-header-label">
<div class="table-header-text">{{'admin.auth_users.headers.actions' | translate}}</div>
<div class="table-header-text">{{'common.actions' | translate}}</div>
</div>
</th>
</tr>
@@ -101,7 +101,7 @@
</th>
<th>
<form [formGroup]="filterForm">
<input type="email" pInputText formControlName="email" placeholder="{{'admin.auth_users.headers.e_mail' | translate}}">
<input type="email" pInputText formControlName="email" placeholder="{{'common.email' | translate}}">
</form>
</th>
<th></th>
@@ -224,7 +224,7 @@
<ng-template pTemplate="emptymessage">
<tr>
<td colspan="9">{{'admin.auth_users.no_entries_found' | translate}}</td>
<td colspan="9">{{'common.no_entries_found' | translate}}</td>
</tr>
</ng-template>

18
kdb-web/src/app/modules/admin/settings/components/settings/settings.component.html
View File

@@ -65,42 +65,42 @@
<div class="content-wrapper">
<div class="content-header">
<h2>
{{'admin.settings.e_mail.header' | translate}}
{{'admin.settings.email.header' | translate}}
</h2>
</div>
<div class="content">
<div class="content-row">
<div class="content-column">
<div class="content-data-name">{{'admin.settings.e_mail.user' | translate}}:</div>
<div class="content-data-name">{{'admin.settings.email.user' | translate}}:</div>
<div class="content-data-value">{{data.mailUser}}</div>
</div>
</div>
<div class="content-row">
<div class="content-column">
<div class="content-data-name">{{'admin.settings.e_mail.host' | translate}}:</div>
<div class="content-data-name">{{'admin.settings.email.host' | translate}}:</div>
<div class="content-data-value">{{data.mailHost}}</div>
</div>
</div>
<div class="content-row">
<div class="content-column">
<div class="content-data-name">{{'admin.settings.e_mail.port' | translate}}:</div>
<div class="content-data-name">{{'admin.settings.email.port' | translate}}:</div>
<div class="content-data-value">{{data.mailPort}}</div>
</div>
</div>
<div class="content-row">
<div class="content-column">
<div class="content-data-name">{{'admin.settings.e_mail.transceiver' | translate}}:</div>
<div class="content-data-name">{{'admin.settings.email.transceiver' | translate}}:</div>
<div class="content-data-value">{{data.mailTransceiver}}</div>
</div>
</div>
<div class="content-row">
<div class="content-column">
<div class="content-data-name">{{'admin.settings.e_mail.e_mail_address' | translate}}:</div>
<div class="content-data-name">{{'admin.settings.email.email_address' | translate}}:</div>
<div class="content-data-value">{{data.mailTransceiverAddress}}</div>
</div>
</div>
@@ -109,17 +109,17 @@
<form [formGroup]="testMailForm" class="content-column">
<div class="content-data-name">
<div class="input-field content-input-field">
<input type="email" pInputText formControlName="mail" placeholder="{{'admin.settings.e_mail.e_mail' | translate}}" autocomplete="email">
<input type="email" pInputText formControlName="mail" placeholder="{{'common.email' | translate}}" autocomplete="email">
</div>
</div>
<div class="content-data-value">
<div class="login-form-submit">
<button pButton icon="pi pi-save" label="{{'admin.settings.e_mail.send_e_mail' | translate}}" class="btn login-form-submit-btn"
<button pButton icon="pi pi-save" label="{{'common.email' | translate}}" class="btn login-form-submit-btn"
(click)="testMail()" [disabled]="testMailForm.invalid"></button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>

4
kdb-web/src/app/modules/auth/components/forget-password/forget-password.component.html
View File

@@ -6,7 +6,7 @@
<h1>{{'auth.header' | translate}}</h1>
<div *ngIf="!ready" class="input-field">
<input type="email" pInputText formControlName="email"
placeholder="{{'auth.forgot_password.e_mail' | translate}}" autocomplete="username email">
placeholder="{{'common.email' | translate}}" autocomplete="username email">
</div>
<div *ngIf="ready" class="input-field-info-text">
{{'auth.forgot_password.send_confirmation_url' | translate}}
@@ -60,4 +60,4 @@
</div>
<app-auth-header></app-auth-header>
</section>
</section>

10
kdb-web/src/app/modules/auth/components/login/login.component.html
View File

@@ -4,7 +4,7 @@
<form [formGroup]="loginForm">
<h1>{{'auth.header' | translate}}</h1>
<div class="input-field">
<input type="email" pInputText formControlName="email" placeholder="{{'auth.login.e_mail' | translate}}" [ngClass]="{ 'invalid-feedback-input': submitted && (
<input type="email" pInputText formControlName="email" placeholder="{{'common.email' | translate}}" [ngClass]="{ 'invalid-feedback-input': submitted && (
(loginForm.controls.email.errors && loginForm.controls.email.errors['required'] || authUserAtrErrors.email.required) ||
(authUserAtrErrors.email.wrongData) ||
(authUserAtrErrors.email.notConfirmed)
@@ -12,9 +12,9 @@
<div *ngIf="submitted" class="invalid-feedback">
<div
*ngIf="loginForm.controls.email.errors && loginForm.controls.email.errors['required'] || authUserAtrErrors.email.required">
{{'auth.login.e_mail_required' | translate}}</div>
{{'auth.login.email_required' | translate}}</div>
<div *ngIf="authUserAtrErrors.email.wrongData">{{'auth.login.user_not_found' | translate}}</div>
<div *ngIf="authUserAtrErrors.email.notConfirmed">{{'auth.login.e_mail_not_confirmed' | translate}}</div>
<div *ngIf="authUserAtrErrors.email.notConfirmed">{{'auth.login.email_not_confirmed' | translate}}</div>
</div>
</div>
<div class="input-field">
@@ -24,10 +24,10 @@
styleClass="p-password p-component p-inputwrapper p-input-icon-right"
Remove after update!
-->
<p-password type="password" formControlName="password" placeholder="{{'auth.login.password' | translate}}" [ngClass]="{ 'invalid-feedback-input': submitted && (
<p-password formControlName="password" placeholder="{{'auth.login.password' | translate}}" [ngClass]="{ 'invalid-feedback-input': submitted && (
(loginForm.controls.password.errors && loginForm.controls.password.errors['required'] || authUserAtrErrors.password.required) ||
(authUserAtrErrors.password.wrongData)
)}" autocomplete="current-password" [toggleMask]="true" [feedback]="false"
)}" [toggleMask]="true" [feedback]="false"
styleClass="p-password p-component p-inputwrapper p-input-icon-right"
></p-password>
<div *ngIf="submitted" class="invalid-feedback">

16
kdb-web/src/app/modules/auth/components/registration/registration.component.html
View File

@@ -26,29 +26,29 @@
</div>
<div class="input-field">
<input type="email" pInputText formControlName="email" placeholder="{{'auth.register.e_mail' | translate}}"
<input type="email" pInputText formControlName="email" placeholder="{{'common.email' | translate}}"
[ngClass]="{ 'invalid-feedback-input': submitted && (authUserAtrErrors.email.wrongData || loginForm.controls.email.errors && loginForm.controls.email.errors['required'] || authUserAtrErrors.email.required)}"
autocomplete="username email">
<div *ngIf="submitted" class="invalid-feedback">
<div
*ngIf="loginForm.controls.email.errors && loginForm.controls.email.errors['required'] || authUserAtrErrors.email.required">
{{'auth.register.e_mail_required' | translate}}</div>
{{'auth.register.email_required' | translate}}</div>
<div *ngIf="authUserAtrErrors.email.wrongData">{{'auth.register.user_already_exists' | translate}}</div>
</div>
</div>
<div class="input-field">
<input type="email" pInputText formControlName="emailRepeat" placeholder="{{'auth.register.repeat_e_mail' | translate}}"
<input type="email" pInputText formControlName="emailRepeat" placeholder="{{'common.email' | translate}}"
[ngClass]="{ 'invalid-feedback-input': submitted && repeatErrors.email}">
<div *ngIf="submitted" class="invalid-feedback">
<div *ngIf="repeatErrors.email">{{'auth.register.e_mails_not_match' | translate}}</div>
<div *ngIf="repeatErrors.email">{{'auth.register.emails_not_match' | translate}}</div>
</div>
</div>
<div class="input-field">
<p-password type="password" formControlName="password" placeholder="{{'auth.register.password' | translate}}"
ngClass="{ 'invalid-feedback': submitted && loginForm.controls.password.errors && loginForm.controls.password.errors['required'] || authUserAtrErrors.password.required}"
autocomplete="new-password" [toggleMask]="true" [feedback]="false"
<!--ngClass="{ 'invalid-feedback': submitted && loginForm.controls.password.errors && loginForm.controls.password.errors['required'] || authUserAtrErrors.password.required}"-->
<p-password formControlName="password" placeholder="{{'auth.register.password' | translate}}"
[toggleMask]="true" [feedback]="false"
styleClass="p-password p-component p-inputwrapper p-input-icon-right"></p-password>
<div *ngIf="submitted" class="invalid-feedback">
<div
@@ -58,7 +58,7 @@
</div>
<div class="input-field">
<p-password type="password" formControlName="passwordRepeat" placeholder="{{'auth.register.repeat_password' | translate}}"
<p-password formControlName="passwordRepeat" placeholder="{{'auth.register.repeat_password' | translate}}"
[ngClass]="{ 'invalid-feedback-input': submitted && repeatErrors.password}" [toggleMask]="true"
[feedback]="false" styleClass="p-password p-component p-inputwrapper p-input-icon-right">
</p-password>

4
kdb-web/src/app/modules/view/dashboard/components/dashboard/dashboard.component.html
View File

@@ -21,14 +21,14 @@
</div>
<div class="server-count">
{{servers.length}} {{'view.dashboard.of' | translate}} {{totalRecords}} {{'view.dashboard.servers' | translate}}:
{{servers.length}} {{'common.of' | translate}} {{totalRecords}} {{'view.dashboard.servers' | translate}}:
<hr>
</div>
<div class="server-list">
<div class="server" *ngFor="let server of servers" (click)="selectServer(server)">
<div class="logo">
<img *ngIf="server.iconURL" [src]="server.iconURL">
<img *ngIf="server.iconURL" [src]="server.iconURL" alt="">
</div>
<div class="info">

14
kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html
View File

@@ -10,17 +10,17 @@
<ng-template pTemplate="caption">
<div class="table-caption">
<div class="table-caption-text">
<ng-container *ngIf="!loading">{{rules.length}} {{'view.server.auto_roles.rules.of' | translate}}
<ng-container *ngIf="!loading">{{rules.length}} {{'common.of' | translate}}
{{dt.totalRecords}}
</ng-container>
{{'view.server.auto_roles.rules.auto_roles' | translate}}
</div>
<div class="table-caption-btn-wrapper btn-wrapper">
<button pButton label="{{'admin.auth_users.add' | translate}}" class="icon-btn btn"
<button pButton label="{{'common.add' | translate}}" class="icon-btn btn"
icon="pi pi-user-plus" (click)="addAutoRoleRule(dt)" [disabled]="isEditingNew">
</button>
<button pButton label="{{'view.server.auto_roles.rules.reset_filters' | translate}}" icon="pi pi-undo"
<button pButton label="{{'common.reset_filters' | translate}}" icon="pi pi-undo"
class="icon-btn btn" (click)="resetFilters()">
</button>
</div>
@@ -31,7 +31,7 @@
<tr>
<th pSortableColumn="id">
<div class="table-header-label">
<div class="table-header-text">{{'view.server.auto_roles.rules.headers.id' | translate}}</div>
<div class="table-header-text">{{'common.id' | translate}}</div>
<p-sortIcon field="id" class="table-header-icon"></p-sortIcon>
</div>
</th>
@@ -63,7 +63,7 @@
<th>
<div class="table-header-label">
<div class="table-header-text">{{'view.server.auto_roles.rules.headers.actions' | translate}}</div>
<div class="table-header-text">{{'common.actions' | translate}}</div>
</div>
</th>
</tr>
@@ -71,7 +71,7 @@
<tr>
<th class="table-header-small">
<form [formGroup]="filterForm">
<input type="text" pInputText formControlName="id" placeholder="{{'view.server.auto_roles.rules.headers.id' | translate}}">
<input type="text" pInputText formControlName="id" placeholder="{{'common.id' | translate}}">
</form>
</th>
<th>
@@ -176,7 +176,7 @@
<ng-template pTemplate="emptymessage">
<tr></tr>
<tr>
<td colspan="10">{{'view.server.auto_roles.rules.no_entries_found' | translate}}</td>
<td colspan="10">{{'common.no_entries_found' | translate}}</td>
</tr>
<tr></tr>
</ng-template>

14
kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.html
View File

@@ -10,17 +10,17 @@
<ng-template pTemplate="caption">
<div class="table-caption">
<div class="table-caption-text">
<ng-container *ngIf="!loading">{{auto_roles.length}} {{'view.server.auto_roles.of' | translate}}
<ng-container *ngIf="!loading">{{auto_roles.length}} {{'common.of' | translate}}
{{dt.totalRecords}}
</ng-container>
{{'view.server.auto_roles.auto_roles' | translate}}
</div>
<div class="table-caption-btn-wrapper btn-wrapper">
<button pButton label="{{'admin.auth_users.add' | translate}}" class="icon-btn btn"
<button pButton label="{{'common.add' | translate}}" class="icon-btn btn"
icon="pi pi-user-plus" (click)="addAutoRole(dt)" [disabled]="isEditingNew">
</button>
<button pButton label="{{'view.server.auto_roles.reset_filters' | translate}}" icon="pi pi-undo"
<button pButton label="{{'common.reset_filters' | translate}}" icon="pi pi-undo"
class="icon-btn btn" (click)="resetFilters()">
</button>
</div>
@@ -31,7 +31,7 @@
<tr>
<th pSortableColumn="id">
<div class="table-header-label">
<div class="table-header-text">{{'view.server.auto_roles.headers.id' | translate}}</div>
<div class="table-header-text">{{'common.id' | translate}}</div>
<p-sortIcon field="id" class="table-header-icon"></p-sortIcon>
</div>
</th>
@@ -77,7 +77,7 @@
<th>
<div class="table-header-label">
<div class="table-header-text">{{'view.server.auto_roles.headers.actions' | translate}}</div>
<div class="table-header-text">{{'common.actions' | translate}}</div>
</div>
</th>
</tr>
@@ -85,7 +85,7 @@
<tr>
<th class="table-header-small">
<form [formGroup]="filterForm">
<input type="text" pInputText formControlName="id" placeholder="{{'view.server.auto_roles.headers.id' | translate}}">
<input type="text" pInputText formControlName="id" placeholder="{{'common.id' | translate}}">
</form>
</th>
<th>
@@ -209,7 +209,7 @@
<ng-template pTemplate="emptymessage">
<tr></tr>
<tr>
<td colspan="10">{{'view.server.auto_roles.no_entries_found' | translate}}</td>
<td colspan="10">{{'common.no_entries_found' | translate}}</td>
</tr>
<tr></tr>
</ng-template>

14
kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html
View File

@@ -10,17 +10,17 @@
<ng-template pTemplate="caption">
<div class="table-caption">
<div class="table-caption-text">
<ng-container *ngIf="!loading">{{levels.length}} {{'view.server.levels.of' | translate}}
<ng-container *ngIf="!loading">{{levels.length}} {{'common.of' | translate}}
{{dt.totalRecords}}
</ng-container>
{{'view.server.levels.levels' | translate}}
</div>
<div class="table-caption-btn-wrapper btn-wrapper">
<button pButton label="{{'admin.auth_users.add' | translate}}" class="icon-btn btn"
<button pButton label="{{'common.add' | translate}}" class="icon-btn btn"
icon="pi pi-user-plus" (click)="addLevel(dt)" [disabled]="isEditingNew">
</button>
<button pButton label="{{'view.server.levels.reset_filters' | translate}}" icon="pi pi-undo"
<button pButton label="{{'common.reset_filters' | translate}}" icon="pi pi-undo"
class="icon-btn btn" (click)="resetFilters()">
</button>
</div>
@@ -31,7 +31,7 @@
<tr>
<th pSortableColumn="id">
<div class="table-header-label">
<div class="table-header-text">{{'view.server.levels.headers.id' | translate}}</div>
<div class="table-header-text">{{'common.id' | translate}}</div>
<p-sortIcon field="id" class="table-header-icon"></p-sortIcon>
</div>
</th>
@@ -78,7 +78,7 @@
<th>
<div class="table-header-label">
<div class="table-header-text">{{'view.server.levels.headers.actions' | translate}}</div>
<div class="table-header-text">{{'common.actions' | translate}}</div>
</div>
</th>
</tr>
@@ -87,7 +87,7 @@
<th class="table-header-small">
<form [formGroup]="filterForm">
<input type="text" pInputText formControlName="id"
placeholder="{{'view.server.levels.headers.id' | translate}}">
placeholder="{{'common.id' | translate}}">
</form>
</th>
<th>
@@ -201,7 +201,7 @@
<ng-template pTemplate="emptymessage">
<tr></tr>
<tr>
<td colspan="10">{{'view.server.levels.no_entries_found' | translate}}</td>
<td colspan="10">{{'common.no_entries_found' | translate}}</td>
</tr>
<tr></tr>
</ng-template>

16
kdb-web/src/app/modules/view/server/members/members.component.html
View File

@@ -10,14 +10,14 @@
<ng-template pTemplate="caption">
<div class="table-caption">
<div class="table-caption-text">
<ng-container *ngIf="!loading">{{members.length}} {{'view.server.members.of' | translate}}
<ng-container *ngIf="!loading">{{members.length}} {{'common.of' | translate}}
{{dt.totalRecords}}
</ng-container>
{{'view.server.members.members' | translate}}
</div>
<div class="table-caption-btn-wrapper btn-wrapper">
<button pButton label="{{'view.server.members.reset_filters' | translate}}" icon="pi pi-undo"
<button pButton label="{{'common.reset_filters' | translate}}" icon="pi pi-undo"
class="icon-btn btn" (click)="resetFilters()">
</button>
</div>
@@ -28,14 +28,14 @@
<tr>
<th pSortableColumn="id">
<div class="table-header-label">
<div class="table-header-text">{{'view.server.members.headers.id' | translate}}</div>
<div class="table-header-text">{{'common.id' | translate}}</div>
<p-sortIcon field="id" class="table-header-icon"></p-sortIcon>
</div>
</th>
<th pSortableColumn="discordId">
<div class="table-header-label">
<div class="table-header-text">{{'view.server.members.headers.discord_id' | translate}}</div>
<div class="table-header-text">{{'common.discord_id' | translate}}</div>
<p-sortIcon field="discordId" class="table-header-icon"></p-sortIcon>
</div>
</th>
@@ -89,7 +89,7 @@
<th>
<div class="table-header-label">
<div class="table-header-text">{{'view.server.members.headers.actions' | translate}}</div>
<div class="table-header-text">{{'common.actions' | translate}}</div>
</div>
</th>
</tr>
@@ -97,12 +97,12 @@
<tr>
<th class="table-header-small">
<form [formGroup]="filterForm">
<input type="text" pInputText formControlName="id" placeholder="{{'view.server.members.headers.id' | translate}}">
<input type="text" pInputText formControlName="id" placeholder="{{'common.id' | translate}}">
</form>
</th>
<th class="table-header-medium">
<form [formGroup]="filterForm">
<input type="text" pInputText formControlName="discordId" placeholder="{{'view.server.members.headers.discord_id' | translate}}">
<input type="text" pInputText formControlName="discordId" placeholder="{{'common.discord_id' | translate}}">
</form>
</th>
<th>
@@ -241,7 +241,7 @@
<ng-template pTemplate="emptymessage">
<tr></tr>
<tr>
<td colspan="10">{{'view.server.members.no_entries_found' | translate}}</td>
<td colspan="10">{{'common.no_entries_found' | translate}}</td>
</tr>
<tr></tr>
</ng-template>

4
kdb-web/src/app/modules/view/server/profile/profile.component.html
View File

@@ -11,11 +11,11 @@
<div class="content">
<div class="content-row">
<div class="content-column">
<div class="content-data-name">{{'view.server.profile.id' | translate}}:</div>
<div class="content-data-name">{{'common.id' | translate}}:</div>
<div class="content-data-value">{{user.id}}</div>
</div>
<div class="content-column">
<div class="content-data-name">{{'view.server.profile.discord_id' | translate}}:</div>
<div class="content-data-name">{{'common.discord_id' | translate}}:</div>
<div class="content-data-value">{{user.discordId}}</div>
</div>
</div>

4
kdb-web/src/app/modules/view/server/server-dashboard/components/client/client.component.html
View File

@@ -1,10 +1,10 @@
<div class="client">
<div class="client-info">
<label class="client-info-header">{{'view.server.dashboard.id' | translate}}</label>
<label class="client-info-header">{{'common.id' | translate}}</label>
<label class="client-info-value">{{client.id}}</label>
</div>
<div class="client-info">
<label class="client-info-header">{{'view.server.dashboard.discord_id' | translate}}</label>
<label class="client-info-header">{{'common.discord_id' | translate}}</label>
<label class="client-info-value">{{client.discordId}}</label>
</div>
<div class="client-info">

6
kdb-web/src/app/modules/view/user-settings/components/user-settings/user-settings.component.html
View File

@@ -17,10 +17,10 @@
</div>
<div class="input-field">
<input type="email" pInputText formControlName="email" placeholder="{{'view.user_settings.e_mail' | translate}}"
<input type="email" pInputText formControlName="email" placeholder="{{'common.email' | translate}}"
autocomplete="username email" [ngClass]="{ 'invalid-feedback-input': submitted && errors.email}">
<div *ngIf="submitted" class="invalid-feedback">
<div *ngIf="errors.email">{{'view.user_settings.e_mail_already_exists' | translate}}</div>
<div *ngIf="errors.email">{{'view.user_settings.email_already_exists' | translate}}</div>
</div>
</div>
@@ -38,4 +38,4 @@
</div>
</form>
</div>
</div>
</div>