Skip to content

Commit 80dc6bf

Browse files
markpitmarkpit
authored
Merge pull request #614 from companieshouse/lp-1402-address-content-change
LP-1402 Update text on registered office pages
2 parents 2b766c8 + 8f2cbac commit 80dc6bf

File tree

11 files changed

+74
-63
lines changed

11 files changed

+74
-63
lines changed

‎locales/cy/translations.json‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,6 @@
152152
"enterAddress": {
153153
"registeredOfficeAddress" : {
154154
"title": "WELSH - What is the registered office address of the partnership?",
155-
"newRequirement": "WELSH - This is a new requirement. We do not hold a registered office address for the limited partnership yet. It may be different from the principal place of business address that we already hold.",
156-
"titleHint1": "WELSH - We'll use this address to send official communications.",
157-
"titleHint2": "WELSH - It must be a physical address in the jurisdiction where the partnership was formed. You cannot use a PO Box address.",
158-
"titleHint3": "WELSH - You'll need to provide the principal place of business next.",
159155
"publicInformationLine1": "WELSH - We'll show the registered office address on the public register."
160156
},
161157
"principalPlaceOfBusinessAddress" : {
@@ -234,10 +230,6 @@
234230
"findPostcode": {
235231
"registeredOfficeAddress": {
236232
"whatIsOfficeAddress": "WELSH - What is the registered office address of the partnership?",
237-
"newRequirement": "WELSH - This is a new requirement. We do not hold a registered office address for the limited partnership yet. It may be different from the principal place of business address that we already hold.",
238-
"officialCommunication": "WELSH - We'll use this address to send official communications.",
239-
"physicalAddress": "WELSH - It must be a physical address in the jurisdiction where the partnership was formed. You cannot use a PO Box address.",
240-
"provideNext": "WELSH - You'll need to provide the principal place of business next.",
241233
"publicRegisterLine1": "WELSH - We'll show the registered office address on the public register."
242234
},
243235

@@ -290,6 +282,18 @@
290282
}
291283
},
292284

285+
"registeredOffice": {
286+
"appropriateAddressDetailsLine1": "WELSH - This means that:",
287+
"appropriateAddressDetailsPoint1": "WELSH - it is in the jurisdiction where the limited partnership is registered (England and Wales, Northern Ireland, or Scotland)",
288+
"appropriateAddressDetailsPoint2": "WELSH - someone acting on behalf of the limited partnership will be made aware of any post addressed and delivered to the limited partnership",
289+
"appropriateAddressDetailsPoint3": "WELSH - when the limited partnership receives post at this address, it's possible for the sender to get confirmation of delivery",
290+
"appropriateAddressDetailsSummary": "WELSH - What does 'appropriate' address mean?",
291+
"appropriateAddressWarning": "WELSH - The address must meet the requirements of an 'appropriate' address. If it does not, the partnership could be struck off the Companies House register.",
292+
"newRequirement": "WELSH - This is a new requirement. We do not hold a registered office address for the partnership yet. It may be different from the principal place of business address that we already hold.",
293+
"officialCommunication": "WELSH - We'll use this address to send official communications. It must be a physical address in the UK. You cannot use a PO Box address.",
294+
"provideNext": "WELSH - You'll need to provide the principal place of business next."
295+
},
296+
293297
"territoryChoice": {
294298
"generalPartnerPrincipalOfficeAddress": {
295299
"title": "WELSH - Where is the general partner's principal office address?",

‎locales/en/translations.json‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,6 @@
154154
"enterAddress": {
155155
"registeredOfficeAddress" : {
156156
"title": "What is the registered office address of the partnership?",
157-
"newRequirement": "This is a new requirement. We do not hold a registered office address for the limited partnership yet. It may be different from the principal place of business address that we already hold.",
158-
"titleHint1": "We'll use this address to send official communications.",
159-
"titleHint2": "It must be a physical address in the jurisdiction where the partnership was formed. You cannot use a PO Box address.",
160-
"titleHint3": "You'll need to provide the principal place of business next.",
161157
"publicInformationLine1": "We'll show the registered office address on the public register."
162158
},
163159
"principalPlaceOfBusinessAddress" : {
@@ -235,10 +231,6 @@
235231
"findPostcode": {
236232
"registeredOfficeAddress": {
237233
"whatIsOfficeAddress": "What is the registered office address of the partnership?",
238-
"newRequirement": "This is a new requirement. We do not hold a registered office address for the limited partnership yet. It may be different from the principal place of business address that we already hold.",
239-
"officialCommunication": "We'll use this address to send official communications.",
240-
"physicalAddress": "It must be a physical address in the jurisdiction where the partnership was formed. You cannot use a PO Box address.",
241-
"provideNext": "You'll need to provide the principal place of business next.",
242234
"publicRegisterLine1": "We'll show the registered office address on the public register."
243235
},
244236

@@ -291,6 +283,18 @@
291283
}
292284
},
293285

286+
"registeredOffice": {
287+
"appropriateAddressDetailsLine1": "This means that:",
288+
"appropriateAddressDetailsPoint1": "it is in the jurisdiction where the limited partnership is registered (England and Wales, Northern Ireland, or Scotland)",
289+
"appropriateAddressDetailsPoint2": "someone acting on behalf of the limited partnership will be made aware of any post addressed and delivered to the limited partnership",
290+
"appropriateAddressDetailsPoint3": "when the limited partnership receives post at this address, it's possible for the sender to get confirmation of delivery",
291+
"appropriateAddressDetailsSummary": "What does 'appropriate' address mean?",
292+
"appropriateAddressWarning": "The address must meet the requirements of an 'appropriate' address. If it does not, the partnership could be struck off the Companies House register.",
293+
"newRequirement": "This is a new requirement. We do not hold a registered office address for the partnership yet. It may be different from the principal place of business address that we already hold.",
294+
"officialCommunication": "We'll use this address to send official communications. It must be a physical address in the UK. You cannot use a PO Box address.",
295+
"provideNext": "You'll need to provide the principal place of business next."
296+
},
297+
294298
"territoryChoice": {
295299
"generalPartnerPrincipalOfficeAddress": {
296300
"title": "Where is the general partner's principal office address?",

‎src/presentation/test/integration/postTransition/limitedPartnership/enter-registered-office-address.test.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ describe("Enter Registered Office Address Page", () => {
4343
"correspondenceAddress",
4444
"principalPlaceOfBusinessAddress",
4545
"principalOfficeAddress",
46-
"errorMessages",
47-
"titleHint3",
48-
"newRequirement"
46+
"errorMessages"
4947
]);
48+
49+
testTranslations(res.text, enTranslationText.address.registeredOffice, ["newRequirement", "provideNext"]);
5050
expect(res.text).not.toContain("WELSH -");
5151
});
5252

@@ -62,10 +62,9 @@ describe("Enter Registered Office Address Page", () => {
6262
"correspondenceAddress",
6363
"principalPlaceOfBusinessAddress",
6464
"principalOfficeAddress",
65-
"errorMessages",
66-
"titleHint3",
67-
"newRequirement"
65+
"errorMessages"
6866
]);
67+
testTranslations(res.text, cyTranslationText.address.registeredOffice, ["newRequirement", "provideNext"]);
6968
});
7069
});
7170

‎src/presentation/test/integration/registration/address/enter-registered-office-address.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ describe("Enter Registered Office Address Page", () => {
3535
"correspondenceAddress",
3636
"principalPlaceOfBusinessAddress",
3737
"principalOfficeAddress",
38-
"errorMessages",
39-
"newRequirement"
38+
"errorMessages"
4039
]);
40+
testTranslations(res.text, enTranslationText.address.registeredOffice, ["newRequirement"]);
4141
expect(res.text).not.toContain("WELSH -");
4242
});
4343

@@ -53,9 +53,9 @@ describe("Enter Registered Office Address Page", () => {
5353
"correspondenceAddress",
5454
"principalPlaceOfBusinessAddress",
5555
"principalOfficeAddress",
56-
"errorMessages",
57-
"newRequirement"
56+
"errorMessages"
5857
]);
58+
testTranslations(res.text, cyTranslationText.address.registeredOffice, ["newRequirement"]);
5959
});
6060
});
6161

‎src/presentation/test/integration/registration/address/postcode-registered-office-address.test.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ describe("Postcode Registered Office Address Page", () => {
4848
"usualResidentialAddress",
4949
"principalOfficeAddress",
5050
"correspondenceAddress",
51-
"errorMessages",
52-
"newRequirement"
51+
"errorMessages"
5352
]);
53+
testTranslations(res.text, enTranslationText.address.registeredOffice, ["newRequirement"]);
5454
expect(res.text).not.toContain("WELSH -");
5555
});
5656

@@ -68,9 +68,10 @@ describe("Postcode Registered Office Address Page", () => {
6868
"usualResidentialAddress",
6969
"principalOfficeAddress",
7070
"correspondenceAddress",
71-
"errorMessages",
72-
"newRequirement"
71+
"errorMessages"
7372
]);
73+
testTranslations(res.text, cyTranslationText.address.registeredOffice, ["newRequirement"]);
74+
7475
});
7576
});
7677

‎src/presentation/test/integration/transition/address/enter-registered-office-address.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ describe("Enter Registered Office Address Page", () => {
3535
"correspondenceAddress",
3636
"principalPlaceOfBusinessAddress",
3737
"principalOfficeAddress",
38-
"errorMessages",
39-
"titleHint3"
38+
"errorMessages"
4039
]);
40+
testTranslations(res.text, enTranslationText.address.registeredOffice, ["provideNext"]);
4141
expect(res.text).not.toContain("WELSH -");
4242
});
4343

@@ -53,9 +53,9 @@ describe("Enter Registered Office Address Page", () => {
5353
"correspondenceAddress",
5454
"principalPlaceOfBusinessAddress",
5555
"principalOfficeAddress",
56-
"errorMessages",
57-
"titleHint3"
56+
"errorMessages"
5857
]);
58+
testTranslations(res.text, cyTranslationText.address.registeredOffice, ["provideNext"]);
5959
});
6060
});
6161

‎src/presentation/test/integration/transition/address/postcode-registered-office-address.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ describe("Postcode Registered Office Address Page", () => {
4848
"usualResidentialAddress",
4949
"principalOfficeAddress",
5050
"correspondenceAddress",
51-
"errorMessages",
52-
"provideNext"
51+
"errorMessages"
5352
]);
53+
testTranslations(res.text, enTranslationText.address.registeredOffice, ["provideNext"]);
5454
expect(res.text).not.toContain("WELSH -");
5555
});
5656

@@ -68,9 +68,9 @@ describe("Postcode Registered Office Address Page", () => {
6868
"usualResidentialAddress",
6969
"principalOfficeAddress",
7070
"correspondenceAddress",
71-
"errorMessages",
72-
"provideNext"
71+
"errorMessages"
7372
]);
73+
testTranslations(res.text, cyTranslationText.address.registeredOffice, ["provideNext"]);
7474
});
7575
});
7676

‎src/views/enter-registered-office-address.njk‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,9 @@
2323
{% include "includes/errors.njk" %}
2424
{% include "includes/proposed-name.njk" %}
2525

26-
<fieldset class="govuk-fieldset">
27-
<legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
28-
<h1 class="govuk-heading-xl">
29-
{{ pageTitle }}
30-
</h1>
31-
</legend>
32-
33-
{% if journeyTypes.isTransition %}
34-
<p class="govuk-hint">{{ i18n.address.findPostcode.registeredOfficeAddress.newRequirement }}</p>
35-
{% endif %}
36-
<p class="govuk-hint">{{ titleHint1 }}</p>
37-
<p class="govuk-hint">{{ titleHint2 }}</p>
38-
{% if journeyTypes.isRegistration %}
39-
<p class="govuk-hint">{{ titleHint3 }}</p>
40-
{% endif %}
41-
<br>
42-
</fieldset>
26+
<h1 class="govuk-heading-xl">{{ pageTitle }}</h1>
27+
28+
{% include "includes/registered-office-information.njk" %}
4329

4430
<form class="form" method="post">
4531
<input type="hidden" name="pageType" value={{ props.pageType }}>

‎src/views/includes/registered-office-information.njk‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{% if journeyTypes.isTransition %}
2+
<p class="govuk-body-m">{{ i18n.address.registeredOffice.newRequirement }}</p>
3+
{% endif %}
4+
5+
<p class="govuk-body-m">{{ i18n.address.registeredOffice.officialCommunication }}</p>
6+
7+
{{ govukWarningText({
8+
text: i18n.address.registeredOffice.appropriateAddressWarning
9+
}) }}
10+
11+
{{ govukDetails({
12+
summaryText: i18n.address.registeredOffice.appropriateAddressDetailsSummary,
13+
html: '<p>' + i18n.address.registeredOffice.appropriateAddressDetailsLine1 + '</p>'
14+
+ '<ul>'
15+
+ '<li>' + i18n.address.registeredOffice.appropriateAddressDetailsPoint1 | escape + '</li>'
16+
+ '<li>' + i18n.address.registeredOffice.appropriateAddressDetailsPoint2 | escape + '</li>'
17+
+ '<li>' + i18n.address.registeredOffice.appropriateAddressDetailsPoint3 | escape + '</li>'
18+
+ '</ul>'
19+
}) }}
20+
21+
{% if journeyTypes.isRegistration %}
22+
<p class="govuk-body-m">{{ i18n.address.registeredOffice.provideNext }}</p>
23+
{% endif %}

‎src/views/layout.njk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{% from "govuk/components/back-link/macro.njk" import govukBackLink %}
44
{% from "govuk/components/button/macro.njk" import govukButton %}
55
{% from "govuk/components/checkboxes/macro.njk" import govukCheckboxes %}
6+
{% from "govuk/components/details/macro.njk" import govukDetails %}
67
{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
78
{% from "govuk/components/footer/macro.njk" import govukFooter %}
89
{% from "govuk/components/header/macro.njk" import govukHeader %}

0 commit comments

Comments
 (0)