Merge pull request #1053 from ValerieKenyon/deNestExpenses

de-nests the first section of CurrentExpenses.js and en.js
codeforboston · Dec 19, 2018 · 024f209 · 024f209
2 parents 3d0882b + f1c0502
commit 024f209
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 31 deletions.
diff --git a/src/forms/CurrentExpenses.js b/src/forms/CurrentExpenses.js
@@ -200,31 +200,31 @@ const ExpensesFormContent = function ({ current, time, updateClientValue, transl
 const Under13 = function ({ translations, type, sharedProps, current, updateClientValue }) {
   return (
     <div>
-      <ContentH1 subheading={ translations.unreimbursedNonMedicalChildCare.i_subheading }>
-        { translations.unreimbursedNonMedicalChildCare.i_sectionHeading }
+      <ContentH1 subheading={ translations.i_childCareSubheading }>
+        { translations.i_childCareSectionHeading }
       </ContentH1>
 
       <IntervalColumnHeadings type={ type } />
 
       <CashFlowInputsRow
         { ...sharedProps }
         generic = { `childDirectCare` }>
-        { translations.unreimbursedNonMedicalChildCare.childDirectCare.i_label }
+        { translations.i_childDirectCareLabel }
       </CashFlowInputsRow>
       <CashFlowInputsRow
         { ...sharedProps }
         generic = { `childBeforeAndAfterSchoolCare` }>
-        { translations.unreimbursedNonMedicalChildCare.childBeforeAndAfterSchoolCare.i_label}
+        { translations.i_childBeforeAndAfterSchoolCareLabel}
       </CashFlowInputsRow>
       <CashFlowInputsRow
         { ...sharedProps }
         generic = { `childTransportation` }>
-        { translations.unreimbursedNonMedicalChildCare.childTransportation.i_label }
+        { translations.i_childTransportationLabel }
       </CashFlowInputsRow>
       <CashFlowInputsRow
         { ...sharedProps }
         generic = { `childOtherCare` }>
-        { translations.unreimbursedNonMedicalChildCare.childOtherCare.i_label }
+        { translations.i_childOtherCareLabel }
       </CashFlowInputsRow>
 
       <EarnedFrom

diff --git a/src/localization/en.js b/src/localization/en.js
@@ -173,31 +173,21 @@ const en = {
     },
 
     currentExpenses: {
-      title_v1:                        `Current Household Expenses`,
-      unreimbursedNonMedicalChildCare: {
-        sectionHeading_v1:    `Reasonable Unreimbursed Non-Medical Child(ren) Care`,
-        subheading_v1:        `A "child" is a person 12 or younger. Don't include amounts that are paid for by other benefit programs.`,
-        columnExpenseType_v1: `Expense`,
-        childDirectCare:      {
-          label_v1: `Direct care costs`,
-          hint_v1:  `How much do you pay for child care out of pocket?`,
-        },
-        childBeforeAndAfterSchoolCare: {
-          label_v1: `Before- and after-school care`,
-          hint_v1:  `How much do you pay for child care for times before or after school?`,
-        },
-        childTransportation: {
-          label_v1: `Transportation costs`,
-          hint_v1:  `How much do you pay for transportation?`,
-        },
-        childOtherCare: {
-          label_v1: `Other care`,
-          hint_v1:  `How much do you pay for other child care?`,
-        },
-        doEarnBecauseOfChildCare_v1: `Does child care allow you to make additional income?`,
-        earnedBecauseOfChildCare_v1: `Income made possible by childcare expenses`,
-      },
-      childSupport: {
+      title_v1:                              `Current Household Expenses`,
+      childCareSectionHeading_v1:            `Reasonable Unreimbursed Non-Medical Child(ren) Care`,
+      childCareSubheading_v1:                `A "child" is a person 12 or younger. Don't include amounts that are paid for by other benefit programs.`,
+      columnExpenseType_v1:                  `Expense`,
+      childDirectCareLabel_v1:               `Direct care costs`,
+      childDirectCareHint_v1:                `How much do you pay for child care out of pocket?`,
+      childBeforeAndAfterSchoolCareLabel_v1: `Before- and after-school care`,
+      childBeforeAndAfterSchoolCareHint_v1:  `How much do you pay for child care for times before or after school?`,
+      childTransportationLabel_v1:           `Transportation costs`,
+      childTransportationHint_v1:            `How much do you pay for transportation?`,
+      childOtherCareLabel_v1:                `Other care`,
+      childOtherCareHint_v1:                 `How much do you pay for other child care?`,
+      doEarnBecauseOfChildCare_v1:           `Does child care allow you to make additional income?`,
+      earnedBecauseOfChildCare_v1:           `Income made possible by childcare expenses`,
+      childSupport:                          {
         sectionHeading_v1:      `Child Support`,
         columnExpenseType_v1:   `Expense`,
         childSupportPaidOut_v1: `Child support you pay that is legally required`,