Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename separategangpositoion to separate position #1634

Merged
merged 3 commits into from
Dec 10, 2024
Merged

rename separategangpositoion to separate position #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dea79ea
rename separategangpositoion to separate position
Dec 8, 2024
97c8363
biomefix
Dec 8, 2024
28376a3
Merge branch 'master' into feature/renameseparateposition
magsyg Dec 10, 2024
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
2 changes: 1 addition & 1 deletion ...es/OrganizationRecruitmentPage/Components/GangSeparatePositions/GangSeparatePositions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export function GangSeparatePositions({ recruitmentSeparatePositions }: GangSepa
return (
<ExpandableHeader
showByDefault={true}
label={t(KEY.recruitment_gangs_with_separate_positions)}
label={t(KEY.recruitment_positions_with_separate_recruitment)}
className={styles.separate_header}
>
{recruitmentSeparatePositions.map((pos) => (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/PagesAdmin/RecruitmentGangOverviewPage/RecruitmentGangOverviewPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export function RecruitmentGangOverviewPage() {
{ key: 1, label: t(KEY.common_gangs), value: <Table columns={tableGangColumns} data={tableGangData} /> },
{
key: 2,
label: t(KEY.recruitment_gangs_with_separate_positions),
label: t(KEY.recruitment_positions_with_separate_recruitment),
value: <Table columns={tableSeparatePositionColumns} data={tableSeparatePositionData ?? []} />,
},
{ key: 3, label: t(KEY.recruitment_interview_groups), value: <RecruitmentInterviewGroupsList /> },
Expand Down
4 changes: 3 additions & 1 deletion ...src/PagesAdmin/RecruitmentGangOverviewPage/components/AppletContainer/AppletContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ export function AppletContainer({ recruitmentId }: Props) {

<AppletCard
title={t(KEY.recruitment_separate_recruitment)}
description={lowerCapitalize(`${t(KEY.common_create)} ${t(KEY.recruitment_gangs_with_separate_positions)}`)}
description={lowerCapitalize(
`${t(KEY.common_create)} ${t(KEY.recruitment_positions_with_separate_recruitment)}`,
)}
url={reverse({
pattern: ROUTES.frontend.admin_recruitment_gang_separateposition_create,
urlParams: { recruitmentId },
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/i18n/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ export const KEY = {
recruitment_accepted_applicants: 'recruitment_accepted_applicants',
recruitment_show_applicants_without_interview: 'recruitment_show_applicants_without_interview',
recrutment_export_to_csv: 'recrutment_export_to_csv',
recruitment_gangs_with_separate_positions: 'recruitment_gangs_with_separate_positions',
recruitment_positions_with_separate_recruitment: 'recruitment_positions_with_separate_recruitment',
application_deadline: 'application_deadline',
recruitment_applicants_without_interview: 'recruitment_applicants_without_interview',
recruitment_applicants_without_interview_help_text: 'recruitment_applicants_without_interview_help_text',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/i18n/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ export const nb = prepareTranslations({
[KEY.recruitment_no_current_applications_gang]: 'Denne gjengen har ennå ikke fått noen søknader',
[KEY.recruitment_apply_for]: 'Søk verv hos',
[KEY.recruitment_position_categorized_by_gang]: 'kategorisert på gjeng',
[KEY.recruitment_gangs_with_separate_positions]: 'Gjenger med separat opptak',
[KEY.recruitment_positions_with_separate_recruitment]: 'Stillinger med separat opptak',
[KEY.error_recruitment_form_1]: 'Vist søknadfrist kan ikke være før opptaket blir synlig',
[KEY.error_recruitment_form_2]: 'Faktisk søknadsfrist kan ikke være før vist søknadsfrist',
[KEY.error_recruitment_form_3]: 'Omprioriteringsfrist kan ikke være før faktisk søknadsfrist',
Expand Down Expand Up @@ -860,7 +860,7 @@ export const en = prepareTranslations({
[KEY.recruitment_stats_date_header]: 'Total applicants per day',
[KEY.recruitment_apply_for]: 'Apply for position at',
[KEY.recruitment_position_categorized_by_gang]: 'categorized by gang',
[KEY.recruitment_gangs_with_separate_positions]: 'Groups with separate recruitment',
[KEY.recruitment_positions_with_separate_recruitment]: 'Positions with separate recruitment',
[KEY.error_recruitment_form_1]: 'Displayed deadline cannot be before the recruitment becomes visible',
[KEY.error_recruitment_form_2]: 'Actual deadline cannot be before the displayed deadline',
[KEY.error_recruitment_form_3]: 'Reprioritization deadline cannot be before the actual deadline',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/router/router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ export const router = createBrowserRouter(
handle={{
crumb: ({ pathname }: UIMatch) => (
<Link url={pathname}>
{t(KEY.common_create)} {t(KEY.recruitment_gangs_with_separate_positions)}
{t(KEY.common_create)} {t(KEY.recruitment_positions_with_separate_recruitment)}
</Link>
),
}}
Expand All @@ -482,7 +482,7 @@ export const router = createBrowserRouter(
handle={{
crumb: ({ pathname }: UIMatch, { separatePosition }: SeparatePositionLoader) => (
<Link url={pathname}>
{t(KEY.common_edit)} {t(KEY.recruitment_gangs_with_separate_positions)} -{' '}
{t(KEY.common_edit)} {t(KEY.recruitment_positions_with_separate_recruitment)} -{' '}
{separatePosition ? dbT(separatePosition, 'name') : t(KEY.common_unknown)}
</Link>
),
Expand Down
Loading