Browse Source

Improve language localization

pull/5104/head
Thomas Kaul 2 months ago
parent
commit
7a51203ba9
  1. 9
      apps/client/src/app/components/admin-users/admin-users.component.ts
  2. 13
      apps/client/src/app/components/admin-users/admin-users.html

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

@ -1,6 +1,10 @@
import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config'; import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config';
import { getDateFormatString, getEmojiFlag } from '@ghostfolio/common/helper'; import {
getDateFnsLocale,
getDateFormatString,
getEmojiFlag
} from '@ghostfolio/common/helper';
import { AdminUsers, InfoItem, User } from '@ghostfolio/common/interfaces'; import { AdminUsers, InfoItem, User } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { hasPermission, permissions } from '@ghostfolio/common/permissions';
@ -116,7 +120,8 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
public formatDistanceToNow(aDateString: string) { public formatDistanceToNow(aDateString: string) {
if (aDateString) { if (aDateString) {
const distanceString = formatDistanceToNowStrict(parseISO(aDateString), { const distanceString = formatDistanceToNowStrict(parseISO(aDateString), {
addSuffix: true addSuffix: true,
locale: getDateFnsLocale(this.user?.settings?.language)
}); });
return Math.abs(differenceInSeconds(parseISO(aDateString), new Date())) < return Math.abs(differenceInSeconds(parseISO(aDateString), new Date())) <

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

@ -52,14 +52,15 @@
@if (element.subscription?.expiresAt) { @if (element.subscription?.expiresAt) {
<gf-premium-indicator <gf-premium-indicator
class="ml-1" class="ml-1"
i18n-title
[enableLink]="false" [enableLink]="false"
[title]=" [title]="
'Expires ' + `Expires ${formatDistanceToNow(
formatDistanceToNow(element.subscription.expiresAt) + element.subscription.expiresAt
' (' + )} (${
(element.subscription.expiresAt (element.subscription.expiresAt
| date: defaultDateFormat) + | date: defaultDateFormat)
')' })`
" "
/> />
} }

Loading…
Cancel
Save