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

Jump to bottom

EY-4528 Fjerner stor forbokstav brukt feil #961

Merged
merged 4 commits into from
Oct 9, 2024
Merged

EY-4528 Fjerner stor forbokstav brukt feil #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7d2017
EY-4528: Fjerner bruk av stor forbokstav for adjustment allowance
henrikg Oct 9, 2024
fe65ea7
EY-4528: Fjerner stor forbokstav for recipients
henrikg Oct 9, 2024
e3e58a1
EY-4528: Fjerner store bokstaver i Activity Obligation
henrikg Oct 9, 2024
a487ed7
Merge branch 'main' into ey-4528-fjerner-stor-forbokstav-brukt-feil
henrikg Oct 9, 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
4 changes: 2 additions & 2 deletions .../nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadFellesFraser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ object OmstillingsstoenadFellesFraser {
English to "To receive the correct amount of the adjustment allowance, you are obligated " +
"to inform us about any changes to your income. We will adjust the adjustment " +
"allowance starting the month after you reported the change. You can read more " +
"about income reporting in the attachment: Information for Adjustment Allowance Recipients.",
"about income reporting in the attachment: Information for recipients of adjustment allowance.",
)
}
}
Expand Down Expand Up @@ -317,7 +317,7 @@ object OmstillingsstoenadFellesFraser {
English to "To receive the correct amount of adjustment allowance, you are obligated to " +
"inform us about any changes to your income. We will adjust the adjustment allowance " +
"starting the month after you reported the change. You can read more about income " +
"reporting in the attachment Information to Recipients of Adjustment Allowance. ",
"reporting in the attachment Information to recipients of adjustment allowance. ",
)
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadInnvilgelseFraser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,8 @@ object OmstillingsstoenadInnvilgelseFraser {
ifElse(tidligereFamiliepleier, "care period ended", "death") +
". After six months have passed, one condition for continuing " +
"to receive adjustment allowance is that you are at least 50 percent active. This is " +
"called the Activity Obligation. Read more about the activity obligation and what this " +
"involves in the attachment Information to Recipients of Adjustment Allowance.",
"called the activity obligation. Read more about the activity obligation and what this " +
"involves in the attachment Information to recipients of adjustment allowance.",
)
}

Expand Down
22 changes: 11 additions & 11 deletions ...pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadRevurderingFraser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ class OmstillingsstoenadRevurderingFraser {
formatertVirkningsdato + ". You will receive NOK " + formatertBeloep +
" each month before tax starting on " + formatertNyesteUtbetalingsperiodeDatoFom +
". Read more about amounts for previous periods and how we have calculated " +
"your Adjustment Allowance in the attachment: Calculation of " +
"Adjustment Allowance."
"your adjustment allowance in the attachment: Calculation of " +
"adjustment allowance."
)
}
}.orShow {
Expand Down Expand Up @@ -93,7 +93,7 @@ class OmstillingsstoenadRevurderingFraser {
Language.Nynorsk to "Du kan sjå i vedlegget «Utrekning av " +
"omstillingsstønad» korleis vi har rekna ut omstillingsstønaden din.",
Language.English to "Read more about how we calculated your Adjustment " +
"Allowance in the attachment: Calculation of Adjustment Allowance.",
"Allowance in the attachment: Calculation of adjustment allowance.",
)
}
}
Expand All @@ -112,7 +112,7 @@ class OmstillingsstoenadRevurderingFraser {
text(
Language.Bokmal to "Du får ikke utbetalt stønad. ",
Language.Nynorsk to "Du får ikkje utbetalt stønad. ",
Language.English to "You will not receive Adjustment Allowance because your " +
Language.English to "You will not receive adjustment allowance because your " +
"income is higher than the limit for receiving adjustment allowance. ",
)
}
Expand All @@ -122,8 +122,8 @@ class OmstillingsstoenadRevurderingFraser {
"«Beregning av omstillingsstønad».",
Language.Nynorsk to "Du kan sjå i vedlegget «Utrekning av omstillingsstønad» " +
"korleis vi har rekna ut omstillingsstønaden din.",
Language.English to "Read more about how we calculated your Adjustment Allowance in " +
"the attachment: Calculation of Adjustment Allowance.",
Language.English to "Read more about how we calculated your adjustment allowance in " +
"the attachment: Calculation of adjustment allowance.",
)
}
}
Expand All @@ -134,7 +134,7 @@ class OmstillingsstoenadRevurderingFraser {
textExpr(
Language.Bokmal to "Omstillingsstønaden din er stanset fra ".expr() + formatertVirkningsdato + ".",
Language.Nynorsk to "Omstillingsstønaden din er stansa frå ".expr() + formatertVirkningsdato + ".",
Language.English to "Your Adjustment Allowance has been stopped from ".expr() + formatertVirkningsdato + ".",
Language.English to "Your adjustment allowance has been stopped from ".expr() + formatertVirkningsdato + ".",
)
}
}.orShow {
Expand Down Expand Up @@ -167,8 +167,8 @@ class OmstillingsstoenadRevurderingFraser {
"«Beregning av omstillingsstønad».",
Language.Nynorsk to "Du kan sjå i vedlegget «Utrekning av omstillingsstønad» " +
"korleis vi har rekna ut omstillingsstønaden din.",
Language.English to "Read more about how we calculated your Adjustment Allowance in " +
"the attachment: Calculation of Adjustment Allowance.",
Language.English to "Read more about how we calculated your adjustment allowance in " +
"the attachment: Calculation of adjustment allowance.",
)
}
}
Expand Down Expand Up @@ -396,7 +396,7 @@ class OmstillingsstoenadRevurderingFraser {
Language.Nynorsk to "Ettersom omstillingsstønaden din blei avvikla tilbake i tid, har du " +
"fått for mykje utbetalt. Sjå vedlegget «Førehandsvarsel - vi vurderer om du må betale " +
"tilbake omstillingsstønad».",
Language.English to "You have been overpaid because your Adjustment Allowance has been " +
Language.English to "You have been overpaid because your adjustment allowance has been " +
"terminated retroactively. See the Attachment Advance notice – we are assessing whether " +
"you must repay adjustment allowance.",
)
Expand Down Expand Up @@ -434,7 +434,7 @@ class OmstillingsstoenadRevurderingFraser {
ifElse(tidligereFamiliepleier, "care period ended", "death") +
", you are obligated to be active at least 50 percent to receive the adjustment allowance. " +
"Read more about the activity obligation and what this involves in the attachment: " +
"Information for Adjustment Allowance Recipients.",
"Information for recipients of adjustment allowance.",
)
}
}
Expand Down
6 changes: 3 additions & 3 deletions .../nav/pensjon/etterlatte/maler/vedlegg/omstillingsstoenad/BeregningAvOmstillingsstoenad.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fun beregningAvOmstillingsstoenad(
newText(
Bokmal to "Beregning av omstillingsstønad",
Nynorsk to "Utrekning av omstillingsstønad",
English to "Calculation of Adjustment Allowance",
English to "Calculation of adjustment allowance",
),
includeSakspart = false,
) {
Expand Down Expand Up @@ -312,7 +312,7 @@ private fun OutlineOnlyScope<LangBokmalNynorskEnglish, OmstillingsstoenadBeregni
text(
Bokmal to "Sanksjon - stans i utbetalingen av omstillingsstønaden",
Nynorsk to "Sanksjon – stans i utbetaling av omstillingsstønad",
English to "Sanction – stoppage of payment of Adjustment Allowance",
English to "Sanction – stoppage of payment of adjustment allowance",
)
}

Expand All @@ -322,7 +322,7 @@ private fun OutlineOnlyScope<LangBokmalNynorskEnglish, OmstillingsstoenadBeregni
"“Utbetaling per måned” er derfor satt til 0 fra gjeldende tidspunkt, slik det fremgår i tabellen over.",
Nynorsk to "Då du ikkje har oppfylt kravet om aktivitetsplikt, har omstillingsstønaden din blitt stansa. " +
"«Utbetaling per månad» er difor sett til 0 frå gjeldande tidspunkt, slik det går fram av tabellen over.",
English to "Your Adjustment Allowance has been stopped because you have not met the mandatory activity requirements. " +
English to "Your adjustment allowance has been stopped because you have not met the mandatory activity requirements. " +
"«Payment per month is therefore set at «0» from the relevant date, as evident in the table above.",
)
}
Expand Down
4 changes: 2 additions & 2 deletions ...av/pensjon/etterlatte/maler/vedlegg/omstillingsstoenad/InformasjonOmOmstillingsstoenad.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fun informasjonOmOmstillingsstoenad(
title = newText(
Bokmal to "Informasjon til deg som mottar omstillingsstønad",
Nynorsk to "Informasjon til deg som får omstillingsstønad",
English to "Information for Recipients of adjustment allowance",
English to "Information for recipients of adjustment allowance",
),
includeSakspart = false,
) {
Expand Down Expand Up @@ -64,7 +64,7 @@ private fun OutlineOnlyScope<LangBokmalNynorskEnglish, Any>.aktivitet(
ifElse(tidligereFamiliepleier, "care period ended", "death") +
", receiving adjustment allowance is contingent upon working at least 50 percent or involved in " +
"another activity with the aim of finding employment. After one year, you will be expected to be " +
"active 100 percent. This is called the Activity Obligation.",
"active 100 percent. This is called the activity obligation.",
)
}
paragraph {
Expand Down