Skip to content

feat(web): clarify rhys and hys copy on comments and published detail… #1666

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

Draft
kostaspins wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(web): clarify rhys and hys copy on comments and published detail… #1666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions e2e-tests/cypress/e2e/register-to-say-about-national-infra-project.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ Feature: Registering to have your say about a national infrastructure project pa
| Links |
| Who can register |
| When to register |
| What you need to register |
| Registering to have your say |
| After you have registered |
| Register to have your say |
| More detailed advice |
When I click on "The Nationally Significant Infrastructure planning process step by step" link
Then I am on the "Having your say about a national infrastructure project" page
Expand Down
9 changes: 3 additions & 6 deletions ...say-about-national-infra-project/PageObjects/PO_RegisterToSayAboutNationalInfraProject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
class PO_RegisterToSayAboutNationalInfraProject {
assertLinksPresentOnPage(table) {
const contents = table.hashes();
cy.confirmTextOnPage(contents[0].Links);
cy.confirmTextOnPage(contents[1].Links);
cy.confirmTextOnPage(contents[2].Links);
cy.confirmTextOnPage(contents[3].Links);
cy.confirmTextOnPage(contents[4].Links);
cy.confirmTextOnPage(contents[5].Links);
contents.forEach((row) => {
cy.confirmTextOnPage(row.Links);
});
}
}
export default PO_RegisterToSayAboutNationalInfraProject;
25 changes: 12 additions & 13 deletions packages/forms-web-app/src/pages/have-your-say-guide/registering/_translations/cy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"heading2": "Pwy sy'n gallu cofrestru",
"heading2": "Pwy sy’n gallu cofrestru",
"paragraph1": "Gall unrhyw un gofrestru i leisio'i farn, gan gynnwys:",
"listItem1": "aelodau'r cyhoedd o'r ardal leol neu unrhyw le yn y Deyrnas Unedig",
"listItem2": "aelodau'r cyhoedd o wledydd eraill",
Expand All @@ -8,19 +8,18 @@
"heading3": "Pryd i gofrestru",
"paragraph2": "Bydd y cyfnod cofrestru ar agor am 30 niwrnod o leiaf ar gyfer pob prosiect, yn ystod y cam cyn-archwilio. Dyma'r cam paratoi ar gyfer archwilio'r cais. Mae'n rhaid i chi gofrestru yn ystod yr adeg hon i gael eich rhif cyfeirnod parti â buddiant a gwneud yn siŵr bod eich sylwadau'n cael eu hystyried.",
"paragraph3": "Bydd y datblygwr yn hysbysebu pan fydd y prosiect wedi cael ei dderbyn i'w archwilio. Mae'n rhaid iddo hefyd roi manylion ynglŷn â phryd y bydd y cyfnod cofrestru ar gyfer y prosiect yn agor a chau a sut gallwch gofrestru.",
"heading4": "Yr hyn y mae arnoch ei angen i gofrestru",
"paragraph4": "I gofrestru, bydd angen i chi roi'r canlynol i ni:",
"listItem5": "eich enw llawn",
"listItem6": "eich cyfeiriad post, eich cyfeiriad e-bost a'ch rhif ffôn",
"listItem7": "eich sylwadau ynglŷn â'r prosiect",
"paragraph5": "Ar ôl i chi gofrestru, rhoddir rhif cyfeirnod i chi. Y rhif cyfeirnod hwn fydd eich rhif cyfeirnod parti â buddiant. Bydd eich enw a'ch sylwadau'n cael eu cyhoeddi ar ein gwefan. Bydd eich cyfeiriad post, eich cyfeiriad e-bost a'ch rhif ffôn yn cael eu cadw'n breifat. {{-link}}.",
"paragraph5LinkText": "Gallwch ddarllen ein hysbysiad preifatrwydd i gael rhagor o wybodaeth (sy'n agor mewn tab newydd)",
"paragraph6": "You must include comments with your registration. Your comments must be about what you consider to be the main issues and impacts. You should include as much detail as possible and cover anything that may affect your day-to-day life.",
"heading4": "Cofrestru i leisio’ch barn",
"paragraph4": "I gofrestru, bydd angen i chi roi’r wybodaeth ganlynol i ni:",
"listItem5": "enw llawn",
"listItem6": "cyfeiriad cartref, cyfeiriad e-bost a rhif ffôn",
"listItem7": "sylwadau ar y prosiect",
"paragraph5": "Byddwn yn cyhoeddi eich enw a’ch sylwadau ar ein gwefan. Byddwn yn cadw eich cyfeiriad cartref, eich cyfeiriad e-bost a’ch rhif ffôn yn breifat. {{-link}} i gael rhagor o wybodaeth.",
"paragraph5LinkText": "Darllenwch ein hysbysiad preifatrwydd",
"paragraph6": "Mae’n rhaid i’ch sylwadau sôn am y prif faterion ac effeithiau, yn eich barn chi. Dylech gynnwys cymaint o fanylion â phosibl ac ymdrin ag unrhyw beth a allai effeithio ar eich bywyd beunyddiol.",
"heading5": "Ar ôl i chi gofrestru",
"paragraph7": "Pan fyddwch wedi cofrestru i leisio'ch barn, bydd eich enw a'ch sylwadau'n cael eu cyhoeddi ar y dudalen gwybodaeth am y prosiect ar gyfer pob prosiect. Pan fydd y cyfnod cofrestru'n cau, gallwch weld yr holl sylwadau cofrestredig eraill (a elwir hefyd yn sylwadau perthnasol) gan bobl eraill.",
"paragraph8": "Pan fydd yr archwiliad o'r cais yn dechrau, gallwch gyflwyno rhagor o wybodaeth erbyn y terfynau amser yn yr amserlen. Gallwch wneud hyn gan ddefnyddio'r ffurflen gyflwyno ar-lein yn adran y prosiect penodol ar y wefan hon.",
"heading6": "Cofrestru i leisio'ch barn",
"paragraph9": "Bydd y dyddiad cau ar gyfer cofrestru yn cael ei nodi yn hysbyseb y datblygwr, neu fe allwch wirio tudalen y prosiect.",
"paragraph7": "Ar ôl i’r cyfnod cofrestru gau a’n bod wedi adolygu sylwadau pawb, byddwn yn eu cyhoeddi yn yr adran sylwadau cofrestru (a adwaenir hefyd fel sylwadau perthnasol) ar dudalen y prosiect. Fe allai hyn gymryd rhywfaint o amser. Os ydych wedi cofrestru i gael diweddariadau ar y prosiect, byddwn yn rhoi gwybod i chi pan fydd yr holl sylwadau ar gael.",
"paragraph8": "Pan fyddwch wedi cofrestru i leisio’ch barn, byddwch yn cael rhif cyfeirnod cofrestru. Dyma fydd eich rhif cyfeirnod parti â buddiant pan fyddwn wedi adolygu’ch sylwadau. Pan fyddwch yn barti â buddiant, fe allwch wneud sylwadau ychwanegol, mynychu rhai cyfarfodydd a derbyn hysbysiadau.",
"paragraph9": "Pan fydd yr archwiliad o’r cais yn dechrau, fe allwch gyflwyno mwy o wybodaeth erbyn y dyddiadau cau yn yr amserlen.",
"heading7": "Cyngor manylach",
"paragraph10": "Os oes arnoch angen cyngor manylach, gallwch gyfeirio at ein tudalennau cyngor i gael rhagor o wybodaeth.",
"linkText1": "Darllenwch y gyfres lawn o tudalennau cyngor (sy'n agor mewn tab newydd)"
Expand Down
26 changes: 12 additions & 14 deletions packages/forms-web-app/src/pages/have-your-say-guide/registering/_translations/cy.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const cyRegisteringTranslations = require('./cy.json');
describe('pages/have-your-say-guide/registering/_translations/cy', () => {
it('should return the welsh have your say guide registering translations', () => {
expect(cyRegisteringTranslations).toEqual({
heading2: "Pwy sy'n gallu cofrestru",
heading2: 'Pwy sy’n gallu cofrestru',
paragraph1: "Gall unrhyw un gofrestru i leisio'i farn, gan gynnwys:",
listItem1: "aelodau'r cyhoedd o'r ardal leol neu unrhyw le yn y Deyrnas Unedig",
listItem2: "aelodau'r cyhoedd o wledydd eraill",
Expand All @@ -15,25 +15,23 @@ describe('pages/have-your-say-guide/registering/_translations/cy', () => {
"Bydd y cyfnod cofrestru ar agor am 30 niwrnod o leiaf ar gyfer pob prosiect, yn ystod y cam cyn-archwilio. Dyma'r cam paratoi ar gyfer archwilio'r cais. Mae'n rhaid i chi gofrestru yn ystod yr adeg hon i gael eich rhif cyfeirnod parti â buddiant a gwneud yn siŵr bod eich sylwadau'n cael eu hystyried.",
paragraph3:
"Bydd y datblygwr yn hysbysebu pan fydd y prosiect wedi cael ei dderbyn i'w archwilio. Mae'n rhaid iddo hefyd roi manylion ynglŷn â phryd y bydd y cyfnod cofrestru ar gyfer y prosiect yn agor a chau a sut gallwch gofrestru.",
heading4: 'Yr hyn y mae arnoch ei angen i gofrestru',
paragraph4: "I gofrestru, bydd angen i chi roi'r canlynol i ni:",
listItem5: 'eich enw llawn',
listItem6: "eich cyfeiriad post, eich cyfeiriad e-bost a'ch rhif ffôn",
listItem7: "eich sylwadau ynglŷn â'r prosiect",
heading4: 'Cofrestru i leisio’ch barn',
paragraph4: 'I gofrestru, bydd angen i chi roi’r wybodaeth ganlynol i ni:',
listItem5: 'enw llawn',
listItem6: 'cyfeiriad cartref, cyfeiriad e-bost a rhif ffôn',
listItem7: 'sylwadau ar y prosiect',
paragraph5:
"Ar ôl i chi gofrestru, rhoddir rhif cyfeirnod i chi. Y rhif cyfeirnod hwn fydd eich rhif cyfeirnod parti â buddiant. Bydd eich enw a'ch sylwadau'n cael eu cyhoeddi ar ein gwefan. Bydd eich cyfeiriad post, eich cyfeiriad e-bost a'ch rhif ffôn yn cael eu cadw'n breifat. {{-link}}.",
paragraph5LinkText:
"Gallwch ddarllen ein hysbysiad preifatrwydd i gael rhagor o wybodaeth (sy'n agor mewn tab newydd)",
'Byddwn yn cyhoeddi eich enw a’ch sylwadau ar ein gwefan. Byddwn yn cadw eich cyfeiriad cartref, eich cyfeiriad e-bost a’ch rhif ffôn yn breifat. {{-link}} i gael rhagor o wybodaeth.',
paragraph5LinkText: 'Darllenwch ein hysbysiad preifatrwydd',
paragraph6:
'You must include comments with your registration. Your comments must be about what you consider to be the main issues and impacts. You should include as much detail as possible and cover anything that may affect your day-to-day life.',
'Mae’n rhaid i’ch sylwadau sôn am y prif faterion ac effeithiau, yn eich barn chi. Dylech gynnwys cymaint o fanylion â phosibl ac ymdrin ag unrhyw beth a allai effeithio ar eich bywyd beunyddiol.',
heading5: 'Ar ôl i chi gofrestru',
paragraph7:
"Pan fyddwch wedi cofrestru i leisio'ch barn, bydd eich enw a'ch sylwadau'n cael eu cyhoeddi ar y dudalen gwybodaeth am y prosiect ar gyfer pob prosiect. Pan fydd y cyfnod cofrestru'n cau, gallwch weld yr holl sylwadau cofrestredig eraill (a elwir hefyd yn sylwadau perthnasol) gan bobl eraill.",
'Ar ôl i’r cyfnod cofrestru gau a’n bod wedi adolygu sylwadau pawb, byddwn yn eu cyhoeddi yn yr adran sylwadau cofrestru (a adwaenir hefyd fel sylwadau perthnasol) ar dudalen y prosiect. Fe allai hyn gymryd rhywfaint o amser. Os ydych wedi cofrestru i gael diweddariadau ar y prosiect, byddwn yn rhoi gwybod i chi pan fydd yr holl sylwadau ar gael.',
paragraph8:
"Pan fydd yr archwiliad o'r cais yn dechrau, gallwch gyflwyno rhagor o wybodaeth erbyn y terfynau amser yn yr amserlen. Gallwch wneud hyn gan ddefnyddio'r ffurflen gyflwyno ar-lein yn adran y prosiect penodol ar y wefan hon.",
heading6: "Cofrestru i leisio'ch barn",
'Pan fyddwch wedi cofrestru i leisio’ch barn, byddwch yn cael rhif cyfeirnod cofrestru. Dyma fydd eich rhif cyfeirnod parti â buddiant pan fyddwn wedi adolygu’ch sylwadau. Pan fyddwch yn barti â buddiant, fe allwch wneud sylwadau ychwanegol, mynychu rhai cyfarfodydd a derbyn hysbysiadau.',
paragraph9:
'Bydd y dyddiad cau ar gyfer cofrestru yn cael ei nodi yn hysbyseb y datblygwr, neu fe allwch wirio tudalen y prosiect.',
'Pan fydd yr archwiliad o’r cais yn dechrau, fe allwch gyflwyno mwy o wybodaeth erbyn y dyddiadau cau yn yr amserlen.',
heading7: 'Cyngor manylach',
paragraph10:
'Os oes arnoch angen cyngor manylach, gallwch gyfeirio at ein tudalennau cyngor i gael rhagor o wybodaeth.',
Expand Down
19 changes: 9 additions & 10 deletions packages/forms-web-app/src/pages/have-your-say-guide/registering/_translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@
"heading3": "When to register",
"paragraph2": "Registration will be open for at least 30 days for each project, during the pre-examination stage. This is the preparation stage for the examination of the application. You must register during this time to get your interested party reference number and make sure your comments are taken into account.",
"paragraph3": "The developer will advertise when the project has been accepted for examination. They must also give details about when registration opens and closes for the project and how you can register.",
"heading4": "What you need to register",
"heading4": "Registering to have your say",
"paragraph4": "To register, you will need to give us your:",
"listItem5": "full name",
"listItem6": "address, email and telephone number",
"listItem7": "your comments about the project",
"paragraph5": "After you register, you will be given a reference number. This reference number will become your interested party reference number. Your name and comments will be published on our website. Your address, email address and phone number will be kept private. {{-link}}.",
"paragraph5LinkText": "You can view our privacy notice for more information (opens a new tab)",
"paragraph6": "You must include comments with your registration. Your comments must be about what you consider to be the main issues and impacts. You should include as much detail as possible and cover anything that may affect your day-to-day life.",
"listItem6": "address, email address and phone number",
"listItem7": "comments about the project",
"paragraph5": "We'll publish your name and comments on our website. We'll keep your address, email address and phone number private. {{-link}} for more information.",
"paragraph5LinkText": "View our privacy notice",
"paragraph6": "Your comments must be about what you consider to be the main issues and impacts. You should include as much detail as possible and cover anything that may affect your day-to-day life.",
"heading5": "After you have registered",
"paragraph7": "Once you have registered to have your say, your name and comments will be published on the project information page for each project. Once the registration period closes, you can see all of the other registration comments (also known as relevant representations) from other people.",
"paragraph8": "Once the examination of the application starts, you will be able to submit more information at the deadlines in the timetable. You can do this using the online submission form in the specific project section of this website.",
"heading6": "Register to have your say",
"paragraph9": "The deadline for registering will be in the developer's advert, or you can check the project page.",
"paragraph7": "After the registration period closes and we've reviewed everyone's comments, we'll publish these in the registration comments (also known as relevant representations) section of the project page. This may take some time. If you've signed up for project updates, we'll notify you once all the comments are available.",
"paragraph8": "When you complete your registration to have your say, you'll receive a registration reference number. This will become your interested party reference number once we've reviewed your comments. As an interested party you can make further comments, attend certain meetings and receive notifications.",
"paragraph9": "When the examination of the application starts, you can submit more information at the deadlines in the timetable.",
"heading7": "More detailed advice",
"paragraph10": "If you need more detailed advice, you can check our advice pages for more information.",
"linkText1": "Read the full set of advice pages (opens in a new tab)"
Expand Down
19 changes: 9 additions & 10 deletions packages/forms-web-app/src/pages/have-your-say-guide/registering/_translations/en.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,23 @@ describe('pages/have-your-say-guide/registering/_translations/en', () => {
'Registration will be open for at least 30 days for each project, during the pre-examination stage. This is the preparation stage for the examination of the application. You must register during this time to get your interested party reference number and make sure your comments are taken into account.',
paragraph3:
'The developer will advertise when the project has been accepted for examination. They must also give details about when registration opens and closes for the project and how you can register.',
heading4: 'What you need to register',
heading4: 'Registering to have your say',
paragraph4: 'To register, you will need to give us your:',
listItem5: 'full name',
listItem6: 'address, email and telephone number',
listItem7: 'your comments about the project',
listItem6: 'address, email address and phone number',
listItem7: 'comments about the project',
paragraph5:
'After you register, you will be given a reference number. This reference number will become your interested party reference number. Your name and comments will be published on our website. Your address, email address and phone number will be kept private. {{-link}}.',
paragraph5LinkText: 'You can view our privacy notice for more information (opens a new tab)',
"We'll publish your name and comments on our website. We'll keep your address, email address and phone number private. {{-link}} for more information.",
paragraph5LinkText: 'View our privacy notice',
paragraph6:
'You must include comments with your registration. Your comments must be about what you consider to be the main issues and impacts. You should include as much detail as possible and cover anything that may affect your day-to-day life.',
'Your comments must be about what you consider to be the main issues and impacts. You should include as much detail as possible and cover anything that may affect your day-to-day life.',
heading5: 'After you have registered',
paragraph7:
'Once you have registered to have your say, your name and comments will be published on the project information page for each project. Once the registration period closes, you can see all of the other registration comments (also known as relevant representations) from other people.',
"After the registration period closes and we've reviewed everyone's comments, we'll publish these in the registration comments (also known as relevant representations) section of the project page. This may take some time. If you've signed up for project updates, we'll notify you once all the comments are available.",
paragraph8:
'Once the examination of the application starts, you will be able to submit more information at the deadlines in the timetable. You can do this using the online submission form in the specific project section of this website.',
heading6: 'Register to have your say',
"When you complete your registration to have your say, you'll receive a registration reference number. This will become your interested party reference number once we've reviewed your comments. As an interested party you can make further comments, attend certain meetings and receive notifications.",
paragraph9:
"The deadline for registering will be in the developer's advert, or you can check the project page.",
'When the examination of the application starts, you can submit more information at the deadlines in the timetable.',
heading7: 'More detailed advice',
paragraph10:
'If you need more detailed advice, you can check our advice pages for more information.',
Expand Down
17 changes: 5 additions & 12 deletions packages/forms-web-app/src/pages/have-your-say-guide/registering/view.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
<li>
<a class="govuk-link" href="#after-you-have-registered">{{ t('haveYourSayGuideRegistering.heading5') }}</a>
</li>
<li>
<a class="govuk-link" href="#register-to-have-your-say">{{ t('haveYourSayGuideRegistering.heading6') }}</a>
</li>
<li>
<a class="govuk-link" href="#more-detailed-advice">{{ t('haveYourSayGuideRegistering.heading7') }}</a>
</li>
Expand Down Expand Up @@ -88,22 +85,18 @@
{{ t('haveYourSayGuideRegistering.paragraph6') }}
</p>

<h2 class="govuk-heading-m" id="after-you-have-registered">
{{ t('haveYourSayGuideRegistering.heading5') }}
</h2>

<p class="govuk-body">
{{ t('haveYourSayGuideRegistering.paragraph7') }}
</p>

<h2 class="govuk-heading-m" id="after-you-have-registered">
{{ t('haveYourSayGuideRegistering.heading5') }}
</h2>

<p class="govuk-body">
{{ t('haveYourSayGuideRegistering.paragraph8') }}
</p>

<h2 class="govuk-heading-m" id="register-to-have-your-say">
{{ t('haveYourSayGuideRegistering.heading6') }}
</h2>

<p class="govuk-body">
{{ t('haveYourSayGuideRegistering.paragraph9') }}
</p>
Expand All @@ -128,4 +121,4 @@
{% include "have-your-say-guide/_includes/have-your-say-guide-steps.njk" %}
</div>
</div>
{% endblock %}
{% endblock %}
Loading