Skip to content

Commit af72a2b

Browse files
committed
Add cases to You translations
1 parent a858170 commit af72a2b

File tree

9 files changed

+29
-10
lines changed

9 files changed

+29
-10
lines changed

public/locales/de/common.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"ui": {
1717
"actors": {
1818
"you": "Du",
19+
"you_dativus": "Dir",
20+
"you_accusativus": "Dich",
1921
"friends": "Freunde",
2022
"groups": "Gruppen",
2123
"members": "Mitglieder",

public/locales/en/common.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"ui": {
1717
"actors": {
1818
"you": "You",
19+
"you_dativus": "You",
20+
"you_accusativus": "You",
1921
"friends": "Friends",
2022
"groups": "Groups",
2123
"members": "Members",

public/locales/it/common.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"ui": {
1717
"actors": {
1818
"you": "Tu",
19+
"you_dativus": "Tu",
20+
"you_accusativus": "Tu",
1921
"friends": "Amici",
2022
"groups": "Gruppi",
2123
"members": "Membri",

public/locales/pl/common.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"ui": {
1717
"actors": {
1818
"you": "Ty",
19+
"you_dativus": "Tobie",
20+
"you_accusativus": "Ciebie",
1921
"friends": "Znajomi",
2022
"groups": "Grupy",
2123
"members": "Członkowie",

public/locales/sv/common.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"ui": {
1717
"actors": {
1818
"you": "Du",
19+
"you_dativus": "Dig",
20+
"you_accusativus": "Dig",
1921
"friends": "Vänner",
2022
"groups": "Grupper",
2123
"members": "Medlemmar",

src/components/Expense/BalanceList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export const BalanceList: React.FC<{
141141
})}{' '}
142142
</span>
143143
<span className="text-foreground">
144-
{displayName(user, userQuery.data?.id)}
144+
{displayName(user, userQuery.data?.id, 'accusativus')}
145145
</span>
146146
</div>
147147
</div>

src/components/Expense/ExpenseDetails.tsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,22 @@ const ExpenseDetails: FC<ExpenseDetailsProps> = ({ user, expense, storagePublicU
4444
) : null}
4545
{expense.updatedByUser ? (
4646
<p className="text-sm text-gray-500">
47-
{t('ui.edited_by', { ns: 'common' })} {displayName(expense.updatedByUser, user.id)}{' '}
48-
{t('ui.on')} {toUIDate(expense.updatedAt, { year: true })}
47+
{t('ui.edited_by', { ns: 'common' })}{' '}
48+
{displayName(expense.updatedByUser, user.id, 'accusativus')} {t('ui.on')}{' '}
49+
{toUIDate(expense.updatedAt, { year: true })}
4950
</p>
5051
) : null}
5152
{expense.deletedByUser ? (
5253
<p className="text-sm text-orange-600">
53-
{t('ui.deleted_by', { ns: 'common' })} {displayName(expense.deletedByUser, user.id)}{' '}
54+
{t('ui.deleted_by', { ns: 'common' })}{' '}
55+
{displayName(expense.deletedByUser, user.id, 'accusativus')}{' '}
5456
{t('ui.on', { ns: 'common' })}{' '}
5557
{toUIDate(expense.deletedAt ?? expense.createdAt, { year: true })}
5658
</p>
5759
) : (
5860
<p className="text-sm text-gray-500">
59-
{t('ui.added_by', { ns: 'common' })} {displayName(expense.addedByUser, user.id)}{' '}
61+
{t('ui.added_by', { ns: 'common' })}{' '}
62+
{displayName(expense.addedByUser, user.id, 'accusativus')}{' '}
6063
{t('ui.on', { ns: 'common' })} {toUIDate(expense.createdAt, { year: true })}
6164
</p>
6265
)}
@@ -83,7 +86,10 @@ const ExpenseDetails: FC<ExpenseDetailsProps> = ({ user, expense, storagePublicU
8386
<EntityAvatar entity={expense.paidByUser} size={35} />
8487
<p>
8588
{displayName(expense.paidByUser, user.id)}{' '}
86-
{t(`ui.expense.user.${expense.amount < 0 ? 'received' : 'paid'}`, { ns: 'common' })}{' '}
89+
{t(
90+
`ui.expense.${expense.paidByUser.id === user.id ? 'you' : 'user'}.${expense.amount < 0 ? 'received' : 'paid'}`,
91+
{ ns: 'common' },
92+
)}{' '}
8793
{expense.currency} {toUIString(expense.amount)}
8894
</p>
8995
</div>

src/components/group/GroupMyBalance.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ const GroupMyBalance: React.FC<GroupMyBalanceProps> = ({
9393
{Object.entries(balances).map(([currency, amount]) => (
9494
<div key={currency}>
9595
{0 < amount
96-
? `${friend?.name} ${t('ui.expense.user.owe')} ${t('ui.actors.you').toLowerCase()}`
96+
? `${friend?.name} ${t('ui.expense.user.owe')} ${t('ui.actors.you_dativus').toLowerCase()}`
9797
: `${t('ui.actors.you')} ${t('ui.expense.you.owe')} ${friend?.name}`}{' '}
9898
{toUIString(amount)} {currency}
9999
</div>

src/utils/strings.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ export type ParametersExceptTranslation<F> = F extends (t: TFunction, ...rest: i
88
: never;
99

1010
export const displayName = (
11-
t?: TFunction,
11+
t: TFunction,
1212
user?: Pick<User, 'name' | 'email' | 'id'> | null,
1313
currentUserId?: number,
14+
useCase?: 'dativus' | 'accusativus',
1415
): string => {
1516
if (currentUserId === user?.id) {
16-
return t ? t('ui.actors.you', { ns: 'common' }) : 'You';
17+
return t(`ui.actors.you${useCase ? `_${useCase}` : ''}`, { ns: 'common' });
1718
}
1819
return user?.name ?? user?.email ?? '';
1920
};
@@ -23,7 +24,9 @@ export const toUIDate = (
2324
date: Date,
2425
{ useToday = false, year = false } = {},
2526
): string =>
26-
useToday && isToday(date) ? t('ui.today') : format(date, year ? 'dd MMM yyyy' : 'MMM dd');
27+
useToday && isToday(date)
28+
? t('ui.today', { ns: 'common' })
29+
: format(date, year ? 'dd MMM yyyy' : 'MMM dd');
2730

2831
export function generateSplitDescription(
2932
t: TFunction,

0 commit comments

Comments
 (0)