From 409ddc90cec50abdccafffc762e97c1998ee6e98 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 28 Oct 2023 20:46:13 +0200 Subject: [PATCH 1/2] Feature/improve language localization for german 20231028 (#2556) * Improve localization * Update changelog --- CHANGELOG.md | 1 + .../pages/accounts/accounts-page.component.ts | 2 +- apps/client/src/locales/messages.de.xlf | 16 ++++++++-------- apps/client/src/locales/messages.es.xlf | 16 ++++++++-------- apps/client/src/locales/messages.fr.xlf | 16 ++++++++-------- apps/client/src/locales/messages.it.xlf | 16 ++++++++-------- apps/client/src/locales/messages.nl.xlf | 16 ++++++++-------- apps/client/src/locales/messages.pt.xlf | 16 ++++++++-------- apps/client/src/locales/messages.tr.xlf | 16 ++++++++-------- apps/client/src/locales/messages.xlf | 14 +++++++------- 10 files changed, 65 insertions(+), 64 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2be15252..4c8bbf690 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Improved the usability and validation in the cash balance transfer from one to another account - Improved the localized meta data (keywords) in `html` files +- Improved the language localization for German (`de`) ## 2.15.0 - 2023-10-26 diff --git a/apps/client/src/app/pages/accounts/accounts-page.component.ts b/apps/client/src/app/pages/accounts/accounts-page.component.ts index b0a3d512e..93d3ee181 100644 --- a/apps/client/src/app/pages/accounts/accounts-page.component.ts +++ b/apps/client/src/app/pages/accounts/accounts-page.component.ts @@ -302,7 +302,7 @@ export class AccountsPageComponent implements OnDestroy, OnInit { }) .pipe( catchError(() => { - alert($localize`Oops, transfer cash balance has failed.`); + alert($localize`Oops, cash balance transfer has failed.`); return EMPTY; }), diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlf index fd4d81d10..502e58a82 100644 --- a/apps/client/src/locales/messages.de.xlf +++ b/apps/client/src/locales/messages.de.xlf @@ -10935,14 +10935,6 @@ 12 - - Oops, transfer cash balance has failed. - Oops, transfer cash balance has failed. - - apps/client/src/app/pages/accounts/accounts-page.component.ts - 305 - - app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 aktie, app, asset, dashboard, etf, finanzen, kryptowährung, management, performance, portfolio, software, trading, vermögen, web3 @@ -10951,6 +10943,14 @@ 8,11 + + Oops, cash balance transfer has failed. + Ups, der Cash-Bestand Transfer ist fehlgeschlagen. + + apps/client/src/app/pages/accounts/accounts-page.component.ts + 305 + + diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf index ff2131bff..89fed1723 100644 --- a/apps/client/src/locales/messages.es.xlf +++ b/apps/client/src/locales/messages.es.xlf @@ -10933,14 +10933,6 @@ 12 - - Oops, transfer cash balance has failed. - Oops, transfer cash balance has failed. - - apps/client/src/app/pages/accounts/accounts-page.component.ts - 305 - - app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 @@ -10949,6 +10941,14 @@ 8,11 + + Oops, cash balance transfer has failed. + Oops, cash balance transfer has failed. + + apps/client/src/app/pages/accounts/accounts-page.component.ts + 305 + + diff --git a/apps/client/src/locales/messages.fr.xlf b/apps/client/src/locales/messages.fr.xlf index 37331e210..a4324444b 100644 --- a/apps/client/src/locales/messages.fr.xlf +++ b/apps/client/src/locales/messages.fr.xlf @@ -10932,14 +10932,6 @@ 12 - - Oops, transfer cash balance has failed. - Oops, transfer cash balance has failed. - - apps/client/src/app/pages/accounts/accounts-page.component.ts - 305 - - app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 @@ -10948,6 +10940,14 @@ 8,11 + + Oops, cash balance transfer has failed. + Oops, cash balance transfer has failed. + + apps/client/src/app/pages/accounts/accounts-page.component.ts + 305 + + diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlf index 344f04bb9..998afb261 100644 --- a/apps/client/src/locales/messages.it.xlf +++ b/apps/client/src/locales/messages.it.xlf @@ -10933,14 +10933,6 @@ 12 - - Oops, transfer cash balance has failed. - Oops, transfer cash balance has failed. - - apps/client/src/app/pages/accounts/accounts-page.component.ts - 305 - - app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 @@ -10949,6 +10941,14 @@ 8,11 + + Oops, cash balance transfer has failed. + Oops, cash balance transfer has failed. + + apps/client/src/app/pages/accounts/accounts-page.component.ts + 305 + + diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlf index 8af35a715..f7751d125 100644 --- a/apps/client/src/locales/messages.nl.xlf +++ b/apps/client/src/locales/messages.nl.xlf @@ -10932,14 +10932,6 @@ 12 - - Oops, transfer cash balance has failed. - Oops, transfer cash balance has failed. - - apps/client/src/app/pages/accounts/accounts-page.component.ts - 305 - - app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 @@ -10948,6 +10940,14 @@ 8,11 + + Oops, cash balance transfer has failed. + Oops, cash balance transfer has failed. + + apps/client/src/app/pages/accounts/accounts-page.component.ts + 305 + + diff --git a/apps/client/src/locales/messages.pt.xlf b/apps/client/src/locales/messages.pt.xlf index 8cdb648a5..5b6e083a8 100644 --- a/apps/client/src/locales/messages.pt.xlf +++ b/apps/client/src/locales/messages.pt.xlf @@ -10932,14 +10932,6 @@ 12 - - Oops, transfer cash balance has failed. - Oops, transfer cash balance has failed. - - apps/client/src/app/pages/accounts/accounts-page.component.ts - 305 - - app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 @@ -10948,6 +10940,14 @@ 8,11 + + Oops, cash balance transfer has failed. + Oops, cash balance transfer has failed. + + apps/client/src/app/pages/accounts/accounts-page.component.ts + 305 + + diff --git a/apps/client/src/locales/messages.tr.xlf b/apps/client/src/locales/messages.tr.xlf index 10774ba8e..08763406b 100644 --- a/apps/client/src/locales/messages.tr.xlf +++ b/apps/client/src/locales/messages.tr.xlf @@ -10932,14 +10932,6 @@ 12 - - Oops, transfer cash balance has failed. - Oops, transfer cash balance has failed. - - apps/client/src/app/pages/accounts/accounts-page.component.ts - 305 - - app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 @@ -10948,6 +10940,14 @@ 8,11 + + Oops, cash balance transfer has failed. + Oops, cash balance transfer has failed. + + apps/client/src/app/pages/accounts/accounts-page.component.ts + 305 + + diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf index e8ab49a0f..7ba7a64ac 100644 --- a/apps/client/src/locales/messages.xlf +++ b/apps/client/src/locales/messages.xlf @@ -10357,13 +10357,6 @@ 12 - - Oops, transfer cash balance has failed. - - apps/client/src/app/pages/accounts/accounts-page.component.ts - 305 - - app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3 @@ -10371,6 +10364,13 @@ 8,11 + + Oops, cash balance transfer has failed. + + apps/client/src/app/pages/accounts/accounts-page.component.ts + 305 + + From 16f1b16e41702ce793586afe5ddf1e9627c394b2 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 28 Oct 2023 20:46:44 +0200 Subject: [PATCH 2/2] Feature/change checkboxes to slide toggles in admin control panel (#2551) * Change checkboxes to slide toggles * Update changelog --- CHANGELOG.md | 1 + .../admin-overview/admin-overview.component.ts | 14 +++++++------- .../components/admin-overview/admin-overview.html | 10 ++++++---- .../admin-overview/admin-overview.module.ts | 4 ++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c8bbf690..3f21cec7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Improved the usability and validation in the cash balance transfer from one to another account +- Changed the checkboxes to slide toggles in the overview of the admin control panel - Improved the localized meta data (keywords) in `html` files - Improved the language localization for German (`de`) diff --git a/apps/client/src/app/components/admin-overview/admin-overview.component.ts b/apps/client/src/app/components/admin-overview/admin-overview.component.ts index 97573cdbe..6c4c72f70 100644 --- a/apps/client/src/app/components/admin-overview/admin-overview.component.ts +++ b/apps/client/src/app/components/admin-overview/admin-overview.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; -import { MatCheckboxChange } from '@angular/material/checkbox'; +import { MatSlideToggleChange } from '@angular/material/slide-toggle'; import { AdminService } from '@ghostfolio/client/services/admin.service'; import { CacheService } from '@ghostfolio/client/services/cache.service'; import { DataService } from '@ghostfolio/client/services/data.service'; @@ -169,17 +169,17 @@ export class AdminOverviewComponent implements OnDestroy, OnInit { } } - public onReadOnlyModeChange(aEvent: MatCheckboxChange) { + public onEnableUserSignupModeChange(aEvent: MatSlideToggleChange) { this.putAdminSetting({ - key: PROPERTY_IS_READ_ONLY_MODE, - value: aEvent.checked ? true : undefined + key: PROPERTY_IS_USER_SIGNUP_ENABLED, + value: aEvent.checked ? undefined : false }); } - public onEnableUserSignupModeChange(aEvent: MatCheckboxChange) { + public onReadOnlyModeChange(aEvent: MatSlideToggleChange) { this.putAdminSetting({ - key: PROPERTY_IS_USER_SIGNUP_ENABLED, - value: aEvent.checked ? undefined : false + key: PROPERTY_IS_READ_ONLY_MODE, + value: aEvent.checked ? true : undefined }); } diff --git a/apps/client/src/app/components/admin-overview/admin-overview.html b/apps/client/src/app/components/admin-overview/admin-overview.html index 47f27dd40..40ae7a150 100644 --- a/apps/client/src/app/components/admin-overview/admin-overview.html +++ b/apps/client/src/app/components/admin-overview/admin-overview.html @@ -81,21 +81,23 @@
User Signup
- + >
Read-only Mode
- + >
diff --git a/apps/client/src/app/components/admin-overview/admin-overview.module.ts b/apps/client/src/app/components/admin-overview/admin-overview.module.ts index 899fb09ae..fed4b84df 100644 --- a/apps/client/src/app/components/admin-overview/admin-overview.module.ts +++ b/apps/client/src/app/components/admin-overview/admin-overview.module.ts @@ -3,8 +3,8 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; -import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatSelectModule } from '@angular/material/select'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { CacheService } from '@ghostfolio/client/services/cache.service'; import { GfValueModule } from '@ghostfolio/ui/value'; @@ -18,9 +18,9 @@ import { AdminOverviewComponent } from './admin-overview.component'; FormsModule, GfValueModule, MatButtonModule, - MatCheckboxModule, MatCardModule, MatSelectModule, + MatSlideToggleModule, ReactiveFormsModule ], providers: [CacheService],