Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import NextLink from 'next/link';
import React from 'react';
import { Link, Typography, styled } from '@mui/material';
import { Trans, useTranslation } from 'react-i18next';
import { useAccountListId } from 'src/hooks/useAccountListId';
import { useGoalCalculator } from '../Shared/GoalCalculatorContext';
import { ExpensesStep } from '../SharedComponents/ExpensesStep/ExpensesStep';

Expand All @@ -12,23 +14,26 @@ const InstructionsWrapper = styled('div')(({ theme }) => ({

const Instructions: React.FC = () => {
const { t } = useTranslation();
const accountListId = useAccountListId() ?? '';
Comment thread
wjames111 marked this conversation as resolved.

return (
<InstructionsWrapper>
<Typography variant="body2">
<Trans t={t}>
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Suggestion] **Run `yarn extract` to refresh the translation key.**

The <Trans> body text changed (link anchor went from MPGA tool on StaffWeb to MPGA report, and the trailing sentence was shortened). Since i18next-parser.config.js uses keySeparator: false and defaultValue: key, the English source text IS the translation key — so the old entry in public/locales/en/translation.json will become orphaned after this PR lands.

Action: run yarn extract and commit the regenerated public/locales/en/translation.json. Non-English locales will fall back to the source text until CrowdIn re-syncs (normal flow).

Enter amounts for the following categories of reimbursable and
ministry expenses. The{' '}
<Link href="https://staffweb.cru.org/mpd-donations/my-donations/mpga.html">
MPGA tool on StaffWeb
<Link
component={NextLink}
href={`/accountLists/${accountListId}/reports/mpgaIncomeExpenses`}
Comment thread
wjames111 marked this conversation as resolved.
>
Ministry Partner Giving Analysis tool
</Link>{' '}
can show you your averages in some of these categories. If you did not
take full reimbursements for the entire year, or if your
reimbursements were abnormally high (e.g. you had a surgery or bought
a new computer), or low (e.g. no summer mission), you will want to
adjust the averages from the MPGA to reflect an average year. Click
the link above, go to the Income/Expenses tab, and look under the
Ministry Expenses section.
the link above and look at the Ministry rows in the Expenses table.
</Trans>
</Typography>
</InstructionsWrapper>
Expand Down
Loading