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

Spanish translations from catalina 01 29 24 #578

Merged
merged 4 commits into from
Jan 30, 2024
Merged

Spanish translations from catalina 01 29 24 #578

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
6f36b1d
WIP
Jan 30, 2024
333ba7e
improvements on translations in the income pages
Jan 30, 2024
81860d7
Merge branch 'main' into spanish-translations-from-catalina-01-29-24
analoo Jan 30, 2024
e24d41a
Apply suggestions from code review
analoo Jan 30, 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
1 change: 1 addition & 0 deletions src/main/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,7 @@ job-paid-by-hour-househould.header=Does {0} get paid by the hour?

job-hourly-wage.title=Hourly wage
job-hourly-wage.header=What is {0} hourly wage?
job-hourly-wage.header-self=What is your hourly wage?

job-hours-per-week.title=Hours a week
job-hours-per-week-self.header=How many hours a week do you work?
Expand Down
1,256 changes: 629 additions & 627 deletions src/main/resources/messages_es.properties
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/resources/messages_vi.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ sensitive-questions.subheader=Ch

personal-situations.title=Tình tr\u1ea1ng cá nhân
personal-situations.header=Có b\u1ea5t k\u1ef3 tình tr\u1ea1ng khó kh\u0103n nào cho ai trong gia \u0111ình quý v\u1ecb không th\u1ec3 \u0111i làm không?
personal-situations.subheader=<div class="notice-yellow"><span>Tr\u1ea3 l\u1eddi "có" <b> s\u1ebd không \u1ea3nh h\u01b0\u1edfng t\u1edbi </b> c\u01a1 h\u1ed9i \u0111\u0103ng ký c\u1ee7a quý v\u1ecb.</span></div><br\>Thông tin này có th\u1ec3 là c\u0103n c\u1ee9 mi\u1ec5n cho h\u1ecd \u0111i làm ho\u1eb7c h\u1ea1n ch\u1ebf kh\u1ed1i l\u01b0\u1ee3ng công vi\u1ec7c có th\u1ec3 \u0111\u1ea3m nh\u1eadn.
personal-situations.subheader=<div class="notice--warning><span>Tr\u1ea3 l\u1eddi "có" <b> s\u1ebd không \u1ea3nh h\u01b0\u1edfng t\u1edbi </b> c\u01a1 h\u1ed9i \u0111\u0103ng ký c\u1ee7a quý v\u1ecb.</span></div><br\>Thông tin này có th\u1ec3 là c\u0103n c\u1ee9 mi\u1ec5n cho h\u1ecd \u0111i làm ho\u1eb7c h\u1ea1n ch\u1ebf kh\u1ed1i l\u01b0\u1ee3ng công vi\u1ec7c có th\u1ec3 \u0111\u1ea3m nh\u1eadn.
personal-situations.content.l1=\u0110ang vô gia c\u01b0
personal-situations.content.l2=V\u1ea5n \u0111\u1ec1 v\u1edbi ma túy ho\u1eb7c r\u01b0\u1ee3u
personal-situations.content.l3=Quá trình t\u1eebng b\u1ea1o hành gia \u0111ình
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/laDigitalAssister/householdIncomeWho.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
content=~{::householdMembers})}">
<th:block th:ref="householdMembers">
<th:block
th:replace="~{fragments/inputs/radio :: radio(inputName=${inputName},value='you', label=${inputData.firstName + ' ' + inputData.lastName + ' (you) '})}"/>
th:replace="~{fragments/inputs/radio :: radio(inputName=${inputName},value='you', label=${inputData.firstName + ' ' + inputData.lastName + ' ' + #messages.msg('general.you')})}"/>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was causing issues with the spanish translation since the text always appeared as "(you)"

<th:block th:if="${inputData.containsKey('household')}">
<th:block th:each="householdMember, iter: ${inputData.household}"
class="spacing-below-15">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/laDigitalAssister/householdSelfEmployment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<li th:text="#{employment-status.more-info.expanded.li3}"></li>
<li th:text="#{employment-status.more-info.expanded.li4}"></li>
</ul>
<p th:text="#{employment-status.more-info.expanded.p2}"></p>
<p th:utext="#{employment-status.more-info.expanded.p2}"></p>
</th:block>
</th:block>

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/laDigitalAssister/jobHourlyWage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<main id="content" role="main" class="form-card spacing-above-35">
<p class="grey-text" th:text="${fieldData.get('employerName')}"></p>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader(header=${hhMemberUUID == 'you' ? #messages.msgWithParams('job-hourly-wage.header', 'your') : #messages.msgWithParams('job-hourly-wage.header', householdMemberName)})}"/>
th:replace="~{fragments/cardHeader :: cardHeader(header=${hhMemberUUID == 'you' ? #messages.msg('job-hourly-wage.header-self') : #messages.msgWithParams('job-hourly-wage.header', householdMemberName)})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
<div class="form-card__content">
Expand Down
Loading