Skip to content

Commit ce85998

Browse files
use correct quotes
1 parent d00dedd commit ce85998

11 files changed

Lines changed: 22 additions & 22 deletions

File tree

app/components/admin/editions/document_type_change_summary.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ def compute_diffs
3030
schema = @old_type.properties[key]
3131
{
3232
field: schema["title"] || key.humanize,
33-
value: "Will be deleted. A '#{@new_type.label}' does not have a '#{schema['title'] || key.humanize}' field.",
33+
value: "Will be deleted. A #{@new_type.label} does not have a #{schema['title'] || key.humanize} field.",
3434
}
3535
end
3636

3737
@new_property_items = added_prop_keys.map do |key|
3838
schema = @new_type.properties[key]
3939
{
4040
field: schema["title"] || key.humanize,
41-
value: "Will need to be added. A '#{@new_type.label}' has a '#{schema['title'] || key.humanize}' field. This field will be blank after the change.",
41+
value: "Will need to be added. A #{@new_type.label} has a #{schema['title'] || key.humanize} field. This field will be blank after the change.",
4242
}
4343
end
4444

@@ -47,7 +47,7 @@ def compute_diffs
4747

4848
{
4949
field:,
50-
value: "Will be deleted. A '#{@new_type.label}' does not have a '#{field}' association.",
50+
value: "Will be deleted. A #{@new_type.label} does not have a #{field} association.",
5151
}
5252
end
5353

@@ -56,7 +56,7 @@ def compute_diffs
5656

5757
{
5858
field:,
59-
value: "Will need to be added. A '#{@new_type.label}' has a '#{field}' association. This field will be blank after the change.",
59+
value: "Will need to be added. A #{@new_type.label} has a #{field} association. This field will be blank after the change.",
6060
}
6161
end
6262

app/models/configurable_document_types/government_response.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"key": "government_response",
33
"title": "Government response",
4-
"description": "Government statements in response to media coverage, such as rebuttals and 'myth busters'. Do not use for: statements to Parliament. Use the 'Speech' format for those.",
4+
"description": "Government statements in response to media coverage, such as rebuttals and myth busters. Do not use for: statements to Parliament. Use the Speech format for those.",
55
"forms": {
66
"documents": {
77
"fields": {

app/models/configurable_document_types/press_release.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"key": "press_release",
33
"title": "Press release",
4-
"description": "Unedited press releases as sent to the media, and official statements from the organisation or a minister. Do not use for: statements to Parliament. Use the 'Speech' format for those.",
4+
"description": "Unedited press releases as sent to the media, and official statements from the organisation or a minister. Do not use for: statements to Parliament. Use the Speech format for those.",
55
"forms": {
66
"documents": {
77
"fields": {

app/models/publication_type.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ class PublicationType
88
FORMAT_ADVICE = {
99
1 => "<p>A policy paper explains the government’s position on something. It doesn’t include instructions on how to carry out a task, only the policy itself and how it’ll be implemented.</p><p>Read the <a href=\"https://www.gov.uk/guidance/content-design/content-types#policy-paper\" target=\"_blank\" class=\"govuk-link\">policy papers guidance</a> in full.</p>",
1010
2 => "<p>Cost-benefit analyses and other assessments of the impact of proposed initiatives, or changes to regulations or legislation.</p>",
11-
3 => "<p>Non-statutory guidance publications. Includes: manuals, handbooks and other documents that offer advice.</p><p>Do not use for: statutory guidance (use the 'statutory guidance' publication type) or guidance about completing a form (attach to same publication as the form itself).</p>",
12-
4 => "<p>Pro-forma or form documents that need to be completed by the user. Can include guidance on how to fill in forms (ie no need to create a separate 'guidance' publication for form instructions).</p>",
11+
3 => "<p>Non-statutory guidance publications. Includes: manuals, handbooks and other documents that offer advice.</p><p>Do not use for: statutory guidance (use the statutory guidance publication type) or guidance about completing a form (attach to same publication as the form itself).</p>",
12+
4 => "<p>Pro-forma or form documents that need to be completed by the user. Can include guidance on how to fill in forms (ie no need to create a separate guidance publication for form instructions).</p>",
1313
5 => "<p>Statistics governed by the UK Statistics Authority and produced by members of the Government Statistical Service.</p>",
1414
6 => "<p>Research and evaluation papers. Can be conducted by government, commissioned by government or independent of government.</p>",
15-
7 => "<p>Publications about what an organisation does (eg business plans, annual reports, accounts), or any plans that affect the organisation (eg structural reform plans, efficiency reviews). Corporate reports are shown automatically on the organisation’s 'What we do' page.</p>",
16-
8 => "<p>Ministerial or departmental responses (eg to campaign letters), announcements, or statements;regularly issued circulars or bulletins (eg fire service circulars), official correspondence to professionals (eg 'Dear chief planning officer' letters);letters to individuals or organisations that are published to share with a wider audience than their original recipient;online versions of e-bulletins or newsletters.</p><p>Do not use for: minutes, agendas or other meeting papers. Attach them to relevant 'policy detail', 'team' or 'our governance' pages instead.</p>",
15+
7 => "<p>Publications about what an organisation does (eg business plans, annual reports, accounts), or any plans that affect the organisation (eg structural reform plans, efficiency reviews). Corporate reports are shown automatically on the organisation’s What we do page.</p>",
16+
8 => "<p>Ministerial or departmental responses (eg to campaign letters), announcements, or statements;regularly issued circulars or bulletins (eg fire service circulars), official correspondence to professionals (eg Dear chief planning officer letters);letters to individuals or organisations that are published to share with a wider audience than their original recipient;online versions of e-bulletins or newsletters.</p><p>Do not use for: minutes, agendas or other meeting papers. Attach them to relevant policy detail’, ’team or our governance pages instead.</p>",
1717
10 => "<p>Information made available about departmental operations with the intent of making government more transparent.Includes organisation charts, staff survey results, departmental spending, salaries, contracts, meetings with ministers, etc.</p><p>Do not use for: FOI responses.</p>",
1818
12 => "<p>Responses to Freedom of Information requests. Ensure the title describes specifically what the request is about.</p>",
1919
13 => "<p>Leaflets, posters, fact sheets and marketing collateral.</p>",
2020
14 => "<p>Reviews, inquiries and other reports commissioned from or conducted by independent (ie non-governmental) bodies for consideration by the government.</p>",
2121
15 => "<p>Official Statistics that have been produced in accordance with the Code of Practice for Official Statistics, which is indicated using the Accredited Official Statistics quality mark.</p>",
2222
17 => "<p>Drawn maps and geographical data.</p>",
2323
18 => "<p>Treaties and memoranda of understanding between the UK and other nations.</p>",
24-
19 => "<p>Guidance which relevant users are legally obliged to follow. (For non-statutory guidance publications, use the 'guidance' sub-type).</p>",
24+
19 => "<p>Guidance which relevant users are legally obliged to follow. (For non-statutory guidance publications, use the guidance sub-type).</p>",
2525
20 => "<p>Permit and licence applications published temporarily for public awareness.</p>",
2626
21 => "<p>Formal decisions by tribunals, regulators or adjudicators (including courts and Secretaries of State).</p>",
2727
22 => "<p>Regulations imposed by an independent regulatory authority only.</p><p>Do not use for: statutory guidance.</p>",

app/views/admin/editions/edit.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
<% unless @edition.editable? %>
4141
<%= render "govuk_publishing_components/components/inset_text", {} do %>
42-
This is a read-only view of the current (<%= @edition.state %>) edition. To edit, please return to the summary page and choose 'Create new edition'.
42+
This is a read-only view of the current (<%= @edition.state %>) edition. To edit, please return to the summary page and choose Create new edition.
4343
<% end %>
4444
<% end %>
4545

app/views/admin/speeches/_form.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="format-advice">
22
<p class="govuk-body"><strong>Use this format for:</strong> Public speeches by ministers or other named spokespeople, ministerial statements to Parliament and bylined articles.</p>
3-
<p class="govuk-body">Do not use for: statements <em>not</em> made to Parliament (use the 'news article' format for those).</p>
3+
<p class="govuk-body">Do not use for: statements <em>not</em> made to Parliament (use the news article format for those).</p>
44
</div>
55

66
<%= standard_edition_form(edition) do |form| %>

app/views/admin/standard_editions/change_type_preview.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<h1 class="govuk-heading-l"><%= page_heading %></h1>
1212

1313
<p class="govuk-body">
14-
You're about to change the document type of '<%= @edition.title %>'
14+
You're about to change the document type of <%= @edition.title %>
1515
from <strong><%= @old_type.label %></strong>
1616
to <strong><%= @new_type.label %></strong>. A summary of what this change means is shown below. Please review carefully before confirming the change.
1717
</p>

app/views/admin/statistical_data_sets/_form.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="format-advice">
2-
<p class="govuk-body"><strong>Use this format for:</strong> Frequently updated ('live') statistical data files.</p>
2+
<p class="govuk-body"><strong>Use this format for:</strong> Frequently updated (live) statistical data files.</p>
33
<p class="govuk-body">Do not use for: less frequently updated (eg quarterly) data. Use a publication (subtype: statistics) instead.</p>
44
</div>
55

spec/javascripts/admin/modules/edition-form.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ describe('GOVUK.Modules.EditionForm', function () {
178178

179179
function subtypeFields() {
180180
return (
181-
"<div class=\"app-view-edition-form__subtype-fields js-app-view-edition-form__subtype-fields\" data-format-advice=\"{&quot;1&quot;:&quot;\u003cp\u003eNews written exclusively for GOV.UK which users need, can act on and can’t get from other sources. Avoid duplicating press releases.\u003c/p\u003e&quot;,&quot;2&quot;:&quot;\u003cp\u003eUnedited press releases as sent to the media, and official statements from the organisation or a minister.\u003c/p\u003e\u003cp\u003eDo \u003cem\u003enot\u003c/em\u003e use for: statements to Parliament. Use the 'Speech' format for those.\u003c/p\u003e&quot;,&quot;3&quot;:&quot;\u003cp\u003eGovernment statements in response to media coverage, such as rebuttals and 'myth busters'.\u003c/p\u003e\u003cp\u003eDo \u003cem\u003enot\u003c/em\u003e use for: statements to Parliament. Use the 'Speech' format for those.\u003c/p\u003e&quot;,&quot;4&quot;:&quot;\u003cp\u003eAnnouncements specific to one or more world location. Do not duplicate news published by another department.\u003c/p\u003e&quot;}\">" +
181+
'<div class="app-view-edition-form__subtype-fields js-app-view-edition-form__subtype-fields" data-format-advice="{&quot;1&quot;:&quot;\u003cp\u003eNews written exclusively for GOV.UK which users need, can act on and can’t get from other sources. Avoid duplicating press releases.\u003c/p\u003e&quot;,&quot;2&quot;:&quot;\u003cp\u003eUnedited press releases as sent to the media, and official statements from the organisation or a minister.\u003c/p\u003e\u003cp\u003eDo \u003cem\u003enot\u003c/em\u003e use for: statements to Parliament. Use the ‘Speech’ format for those.\u003c/p\u003e&quot;,&quot;3&quot;:&quot;\u003cp\u003eGovernment statements in response to media coverage, such as rebuttals and ‘myth busters’.\u003c/p\u003e\u003cp\u003eDo \u003cem\u003enot\u003c/em\u003e use for: statements to Parliament. Use the \'Speech\' format for those.\u003c/p\u003e&quot;,&quot;4&quot;:&quot;\u003cp\u003eAnnouncements specific to one or more world location. Do not duplicate news published by another department.\u003c/p\u003e&quot;}">' +
182182
'<div class="govuk-form-group gem-c-select">' +
183183
'<label class="govuk-label govuk-label--s" for="edition_news_article_type_id">News article type</label>' +
184184
'<select name="edition[news_article_type_id]" id="edition_news_article_type_id" class="govuk-select gem-c-select__select--full-width">' +

test/components/admin/editions/document_type_change_summary_test.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,23 @@ def build_type(label:, properties: {}, associations: [])
5151

5252
# Lost field (image)
5353
assert_text "Custom lead image"
54-
assert_text "Will be deleted. A 'New type' does not have a 'Custom lead image' field."
54+
assert_text "Will be deleted. A New type does not have a Custom lead image field."
5555

5656
# New field (summary)
5757
assert_text "Summary"
58-
assert_text "Will need to be added. A 'New type' has a 'Summary' field. This field will be blank after the change."
58+
assert_text "Will need to be added. A New type has a Summary field. This field will be blank after the change."
5959

6060
# Lost association (world_locations)
6161
assert_text "World locations"
62-
assert_text "Will be deleted. A 'New type' does not have a 'World locations' association."
62+
assert_text "Will be deleted. A New type does not have a World locations association."
6363

6464
# Association with a different label to name
6565
assert_text "Ministers"
66-
assert_text "Will be deleted. A 'New type' does not have a 'Ministers' association."
66+
assert_text "Will be deleted. A New type does not have a Ministers association."
6767

6868
# New association (topical_events)
6969
assert_text "Topical events"
70-
assert_text "Will need to be added. A 'New type' has a 'Topical events' association. This field will be blank after the change."
70+
assert_text "Will need to be added. A New type has a Topical events association. This field will be blank after the change."
7171

7272
assert_text "Organisations"
7373
assert_text "These associations will be carried over, you will not have to fill them in again."

0 commit comments

Comments
 (0)