Browse Source

Merge branch 'main' into task/upgrade-ionic-angular-to-version-8.8.12

pull/7162/head
Thomas Kaul 2 weeks ago
committed by GitHub
parent
commit
aa4b5de24e
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      CHANGELOG.md
  2. 2
      apps/client/src/app/components/admin-users/admin-users.component.ts
  3. 8
      apps/client/src/app/components/admin-users/admin-users.html
  4. 3
      apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
  5. 7
      apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html
  6. 1022
      apps/client/src/locales/messages.ja.xlf

1
CHANGELOG.md

@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Improved the language localization for Japanese (`ja`)
- Upgraded `@ionic/angular` from version `8.8.5` to `8.8.12`
## 3.18.0 - 2026-06-28

2
apps/client/src/app/components/admin-users/admin-users.component.ts

@ -8,6 +8,7 @@ import { UserService } from '@ghostfolio/client/services/user/user.service';
import { DEFAULT_LOCALE, DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config';
import { ConfirmationDialogType } from '@ghostfolio/common/enums';
import {
getCountryName,
getDateFnsLocale,
getDateFormatString,
getEmojiFlag
@ -88,6 +89,7 @@ export class GfAdminUsersComponent implements OnInit {
>();
protected defaultDateFormat: string;
protected displayedColumns: string[] = [];
protected readonly getCountryName = getCountryName;
protected readonly getEmojiFlag = getEmojiFlag;
protected hasPermissionForSubscription: boolean;
protected hasPermissionToImpersonateAllUsers: boolean;

8
apps/client/src/app/components/admin-users/admin-users.html

@ -60,9 +60,11 @@
class="mat-mdc-cell px-1 py-2"
mat-cell
>
<span class="h5" [title]="element.country">{{
getEmojiFlag(element.country)
}}</span>
<span
class="h5"
[title]="getCountryName({ code: element.country })"
>{{ getEmojiFlag(element.country) }}</span
>
</td>
</ng-container>
}

3
apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts

@ -1,4 +1,4 @@
import { getSum } from '@ghostfolio/common/helper';
import { getCountryName, getSum } from '@ghostfolio/common/helper';
import { AdminUserResponse } from '@ghostfolio/common/interfaces';
import { AdminService, DataService } from '@ghostfolio/ui/services';
import { GfValueComponent } from '@ghostfolio/ui/value';
@ -50,6 +50,7 @@ import {
})
export class GfUserDetailDialogComponent implements OnInit {
public baseCurrency: string;
public readonly getCountryName = getCountryName;
public subscriptionsDataSource = new MatTableDataSource<Subscription>();
public subscriptionsDisplayedColumns = [
'createdAt',

7
apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html

@ -74,7 +74,12 @@
>
</div>
<div class="col-6 mb-3">
<gf-value i18n size="medium" [value]="user?.country"
<gf-value
i18n
size="medium"
[value]="
user?.country ? getCountryName({ code: user.country }) : '-'
"
>Country</gf-value
>
</div>

1022
apps/client/src/locales/messages.ja.xlf

File diff suppressed because it is too large
Loading…
Cancel
Save