diff --git a/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadFellesFraser.kt b/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadFellesFraser.kt index 909980d00..c31f3fb9e 100644 --- a/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadFellesFraser.kt +++ b/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadFellesFraser.kt @@ -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.", ) } } @@ -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. ", ) } } diff --git a/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadInnvilgelseFraser.kt b/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadInnvilgelseFraser.kt index 0d45e81f9..00317c79c 100644 --- a/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadInnvilgelseFraser.kt +++ b/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadInnvilgelseFraser.kt @@ -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.", ) } diff --git a/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadRevurderingFraser.kt b/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadRevurderingFraser.kt index a9d744f7a..055e368d3 100644 --- a/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadRevurderingFraser.kt +++ b/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/omstillingsstoenad/OmstillingsstoenadRevurderingFraser.kt @@ -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 { @@ -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.", ) } } @@ -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. ", ) } @@ -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.", ) } } @@ -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 { @@ -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.", ) } } @@ -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.", ) @@ -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.", ) } } diff --git a/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/vedlegg/omstillingsstoenad/BeregningAvOmstillingsstoenad.kt b/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/vedlegg/omstillingsstoenad/BeregningAvOmstillingsstoenad.kt index 8eb783617..3e3cdb433 100644 --- a/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/vedlegg/omstillingsstoenad/BeregningAvOmstillingsstoenad.kt +++ b/pensjon-brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/vedlegg/omstillingsstoenad/BeregningAvOmstillingsstoenad.kt @@ -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, ) { @@ -312,7 +312,7 @@ private fun OutlineOnlyScope.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 {