diff --git a/README.md b/README.md index 8ac7122bb0..4dabe1501d 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,10 @@ Transaction start pages: * https://www.gov.uk/vehicle-tax * https://www.gov.uk/find-a-job +### Detailed Guide + + * https://www.gov.uk/guidance/guidance-on-devolution + ### Help * https://www.gov.uk/help/browsers diff --git a/app/assets/stylesheets/components/_back-to-top.scss b/app/assets/stylesheets/components/_back-to-top.scss new file mode 100644 index 0000000000..d6ecf7b6ff --- /dev/null +++ b/app/assets/stylesheets/components/_back-to-top.scss @@ -0,0 +1,15 @@ +@import "govuk_publishing_components/individual_component_support"; + +.app-c-back-to-top { + display: inline-block; + margin-bottom: govuk-spacing(2); + margin-left: govuk-spacing(3); + margin-right: govuk-spacing(3); +} + +.app-c-back-to-top__icon { + float: left; + margin-right: .3em; + width: .8em; + height: .968em; +} diff --git a/app/assets/stylesheets/components/_contents-list-with-body.scss b/app/assets/stylesheets/components/_contents-list-with-body.scss new file mode 100644 index 0000000000..e0156c61f7 --- /dev/null +++ b/app/assets/stylesheets/components/_contents-list-with-body.scss @@ -0,0 +1,49 @@ +@import "govuk_publishing_components/individual_component_support"; + +.app-c-contents-list-with-body__link-container { + margin: 0 auto; + padding: 0; + + @include govuk-media-query($from: tablet) { + max-width: 1024px; + } + + .app-c-back-to-top { + margin-left: 0; + margin-right: 0; + } +} + +.app-c-contents-list-with-body__link-wrapper { + padding-bottom: govuk-spacing(2); + + .app-c-back-to-top { + padding-bottom: govuk-spacing(2); + } +} + +.app-c-contents-list-with-body__link-wrapper.sticky-element--stuck-to-window { + background-color: govuk-colour("light-grey"); + bottom: -1px; // 'Fix' for anomalous 1px margin which sporadically appears below this element. + left: 0; + margin: 0; + padding: 0; + padding-left: 0; + position: fixed; + width: 100%; + z-index: 10; + + @include govuk-media-query($from: tablet) { + padding-left: govuk-spacing(2); + } + + .app-c-back-to-top { + margin-bottom: 0; + padding: govuk-spacing(3); + width: 66%; + + @include govuk-media-query($from: tablet) { + padding: govuk-spacing(4); + } + } +} diff --git a/app/assets/stylesheets/views/_published-dates-button-group.scss b/app/assets/stylesheets/views/_published-dates-button-group.scss new file mode 100644 index 0000000000..6d8faedfa2 --- /dev/null +++ b/app/assets/stylesheets/views/_published-dates-button-group.scss @@ -0,0 +1,17 @@ +@import "govuk_publishing_components/individual_component_support"; + +.published-dates-button-group { + @include govuk-media-query($from: tablet) { + display: flex; + flex-direction: row; + } +} + +.published-dates-button-group form { + @include govuk-media-query($until: tablet) { + margin-bottom: govuk-spacing(3); + } + @include govuk-media-query($from: tablet) { + margin-right: govuk-spacing(4); + } +} \ No newline at end of file diff --git a/app/controllers/content_items_controller.rb b/app/controllers/content_items_controller.rb index 1b1c06d013..bca0067825 100644 --- a/app/controllers/content_items_controller.rb +++ b/app/controllers/content_items_controller.rb @@ -1,4 +1,6 @@ class ContentItemsController < ApplicationController + include GovukPersonalisation::ControllerConcern + before_action :set_locale, if: -> { request.format.html? } private diff --git a/app/controllers/detailed_guide_controller.rb b/app/controllers/detailed_guide_controller.rb new file mode 100644 index 0000000000..63941b3674 --- /dev/null +++ b/app/controllers/detailed_guide_controller.rb @@ -0,0 +1,3 @@ +class DetailedGuideController < ContentItemsController + def show; end +end diff --git a/app/helpers/govuk_personalisation_helper.rb b/app/helpers/govuk_personalisation_helper.rb new file mode 100644 index 0000000000..6f2116de7c --- /dev/null +++ b/app/helpers/govuk_personalisation_helper.rb @@ -0,0 +1,15 @@ +module GovukPersonalisationHelper + def email_subscription_success_banner_heading(account_flash, locale = nil) + if account_flash.include?("email-subscription-success") + sanitize(t("email.subscribe_title", locale:)) + elsif account_flash.include?("email-unsubscribe-success") + sanitize(t("email.unsubscribe_title", locale:)) + elsif account_flash.include?("email-subscription-already-subscribed") + sanitize(t("email.already_subscribed_title", locale:)) + end + end + + def show_email_subscription_success_banner?(account_flash) + account_flash.include?("email-subscription-success") || account_flash.include?("email-unsubscribe-succe ss") || account_flash.include?("email-subscription-already-subscribed") + end +end diff --git a/app/models/concerns/contents_list.rb b/app/models/concerns/contents_list.rb new file mode 100644 index 0000000000..6bdaf853d2 --- /dev/null +++ b/app/models/concerns/contents_list.rb @@ -0,0 +1,108 @@ +module ContentsList + extend ActiveSupport::Concern + + MINIMUM_CHARACTER_COUNT = 415 + MINIMUM_CHARACTER_COUNT_IF_IMAGE_PRESENT = 224 + MINIMUM_TABLE_ROW_COUNT = 13 + MINIMUM_TABLE_ROW_COUNT_IF_IMAGE_PRESENT = 6 + + included do + def contents + @contents ||= + if show_contents_list? + contents_items.each { |item| item[:href] = "##{item[:id]}" } + else + [] + end + end + + def contents_items + extract_headings_with_ids + end + + def show_contents_list? + return true if contents_items.present? + return false if no_first_item? + + first_item_size_requirements_met?(character_count, table_row_count) + end + end + +private + + def first_item_size_requirements_met?(char_count, table_row_count) + first_item_character_count > char_count || first_item_table_rows > table_row_count + end + + def character_count + first_item_has_image? ? MINIMUM_CHARACTER_COUNT_IF_IMAGE_PRESENT : MINIMUM_CHARACTER_COUNT + end + + def table_row_count + first_item_has_image? ? MINIMUM_TABLE_ROW_COUNT_IF_IMAGE_PRESENT : MINIMUM_TABLE_ROW_COUNT + end + + def extract_headings_with_ids + headings = parsed_body.css("h2").map do |heading| + id = heading.attribute("id") + { text: heading.text.gsub(/:$/, ""), id: id.value } if id + end + headings.compact + end + + def first_item_content + element = first_item + first_item_text = "" + allowed_elements = %w[p ul ol] + + until element.name == "h2" + first_item_text += element.text if element.name.in?(allowed_elements) + element = element.next_element + break if element.nil? + end + first_item_text + end + + def first_item_character_count + @first_item_character_count ||= first_item_content.length + end + + def find_first_table + element = first_item + + until element.name == "h2" + return element if element.name == "table" + + element = element.next_element + break if element.nil? + end + end + + def first_item_table_rows + @table ||= find_first_table + @table.present? ? @table.css("tr").count : 0 + end + + def first_item_has_image? + element = first_item + + until element.name == "h2" + return true if element.name == "div" && element["class"] == "img" + + element = element.next_element + return false if element.nil? + end + end + + def parsed_body + @parsed_body ||= Nokogiri::HTML(body) + end + + def first_item + parsed_body.css("h2").first.try(:next_element) + end + + def no_first_item? + first_item.nil? + end +end diff --git a/app/models/concerns/national_applicability.rb b/app/models/concerns/national_applicability.rb new file mode 100644 index 0000000000..16c22e1560 --- /dev/null +++ b/app/models/concerns/national_applicability.rb @@ -0,0 +1,9 @@ +module NationalApplicability + extend ActiveSupport::Concern + + included do + def national_applicability + content_store_hash.dig("details", "national_applicability")&.deep_symbolize_keys + end + end +end diff --git a/app/models/concerns/political.rb b/app/models/concerns/political.rb new file mode 100644 index 0000000000..59b911ae80 --- /dev/null +++ b/app/models/concerns/political.rb @@ -0,0 +1,32 @@ +module Political + extend ActiveSupport::Concern + + included do + def historically_political? + political? && historical? + end + + def publishing_government + content_store_hash.dig( + "links", "government", 0, "title" + ) + end + end + +private + + def political? + content_store_hash.dig("details", "political") + end + + def historical? + government_current = content_store_hash.dig( + "links", "government", 0, "details", "current" + ) + + # Treat no government as not historical + return false if government_current.nil? + + !government_current + end +end diff --git a/app/models/concerns/single_page_notification_button.rb b/app/models/concerns/single_page_notification_button.rb new file mode 100644 index 0000000000..c43a9fabc0 --- /dev/null +++ b/app/models/concerns/single_page_notification_button.rb @@ -0,0 +1,17 @@ +module SinglePageNotificationButton + extend ActiveSupport::Concern + + # Add the content id of the publication, detailed_guide or consultation that should be exempt from having the single page notification button + EXEMPTION_LIST = %w[ + c5c8d3cd-0dc2-4ca3-8672-8ca0a6e92165 + 70bd3a76-6606-45dd-9fb5-2b95f8667b4d + a457220c-915c-4cb1-8e41-9191fba42540 + 5f9c6c15-7631-11e4-a3cb-005056011aef + ].freeze + + included do + def display_single_page_notification_button? + !(EXEMPTION_LIST.include? content_store_response["content_id"]) && I18n.locale == :en + end + end +end diff --git a/app/models/detailed_guide.rb b/app/models/detailed_guide.rb new file mode 100644 index 0000000000..07a9ebbb2c --- /dev/null +++ b/app/models/detailed_guide.rb @@ -0,0 +1,8 @@ +class DetailedGuide < ContentItem + include ContentsList + include NationalApplicability + include Organisations + include Political + include SinglePageNotificationButton + include Updatable +end diff --git a/app/presenters/detailed_guide_presenter.rb b/app/presenters/detailed_guide_presenter.rb new file mode 100644 index 0000000000..9f25a59bd6 --- /dev/null +++ b/app/presenters/detailed_guide_presenter.rb @@ -0,0 +1,2 @@ +class DetailedGuidePresenter < ContentItemPresenter +end diff --git a/app/views/components/_back_to_top.html.erb b/app/views/components/_back_to_top.html.erb new file mode 100644 index 0000000000..f0fcde6ff2 --- /dev/null +++ b/app/views/components/_back_to_top.html.erb @@ -0,0 +1,11 @@ +<% add_app_component_stylesheet("back-to-top") %> +<% + text ||= t("content_item.contents", default: "Contents") +%> + + + <%= text %> + diff --git a/app/views/components/_contents_list_with_body.html.erb b/app/views/components/_contents_list_with_body.html.erb new file mode 100644 index 0000000000..e9bc66b33c --- /dev/null +++ b/app/views/components/_contents_list_with_body.html.erb @@ -0,0 +1,29 @@ +<% add_app_component_stylesheet("contents-list-with-body") %> +<% block = yield %> +<% unless block.empty? %> + <% + contents ||= [] + sticky_attr = "sticky-element-container" if contents.any? + %> + <%= tag.div( + id: "contents", + class: "app-c-contents-list-with-body", + data: { + module: sticky_attr, + }, + ) do %> + <% if contents.any? %> +
+ <%= render "govuk_publishing_components/components/contents_list", contents: contents %> +
+ <% end %> + <%= block %> + <% if contents.any? %> +
+
+ <%= render "components/back_to_top", href: "#contents" %> +
+
+ <% end %> + <% end %> +<% end %> diff --git a/app/views/components/docs/back_to_top.yml b/app/views/components/docs/back_to_top.yml new file mode 100644 index 0000000000..bd14f1fd71 --- /dev/null +++ b/app/views/components/docs/back_to_top.yml @@ -0,0 +1,17 @@ +name: Back to top link +description: An anchor link intended to allow users to return to the top of the content. +shared_accessibility_criteria: + - link +examples: + default: + data: + href: "#contents" + with_different_text: + data: + href: "#contents" + text: "Back to top" + right_to_left: + data: + href: "#contents" + context: + right_to_left: true diff --git a/app/views/components/docs/contents_list_with_body.yml b/app/views/components/docs/contents_list_with_body.yml new file mode 100644 index 0000000000..9094b27e07 --- /dev/null +++ b/app/views/components/docs/contents_list_with_body.yml @@ -0,0 +1,89 @@ +name: Contents list with body +description: Combines contents-list and back-to-top components with block of body markup +body: | + Wraps the HTML/ERB block passed with a content list and back to top link. + + Expects one argument: + + * `contents` - The contents to build a contents list, if this item is empty the contents-list and back-to-top links are excluded but the block passed is still rendered. + +accessibility_criteria: | + - The component must have a text contrast ratio higher than 4.5:1 against the background colour to meet WCAG AA. + - The component embeds contents-list and back-to-top components. Please see the relevant accessibility criteria: + + * [back-to-top](/component-guide/back_to_top) + * [contents-list](/component-guide/contents_list) +shared_accessibility_criteria: + - link +examples: + default: + data: + contents: + - href: "#reference-unless-undertakings-accepted" + text: Reference unless undertakings accepted + - href: "#notice-of-extension-of-the-preliminary-assessment-period" + text: Notice of extension of the preliminary assessment period + - href: "#invitation-to-comment-closes-13-november-2017" + text: "Invitation to comment: closes 13 November 2017" + - href: "#launch-of-merger-inquiry" + text: Launch of merger inquiry + block: | +
+

Statutory timetable

+ + + + + + + + + + + + + + + + + + + + + +
Phase 1 dateAction
3 January 2018Decision announced
30 October to 13 November 2017Invitation to comment
27 October 2017Launch of merger inquiry
+ +

Phase 1

+ +

Reference unless undertakings accepted

+ +

3 January 2018: The CMA has decided, on the information currently available to it, that it is or may be the case that this merger may be expected to result in a substantial lessening of competition within a market or markets in the United Kingdom. This merger will be referred for a phase 2 investigation unless the parties offer acceptable undertakings to address these competition concerns. The full text of the decision will be available shortly.

+ +

Notice of extension of the preliminary assessment period

+ +

Invitation to comment: closes 13 November 2017

+

30 October 2017: The Competition and Markets Authority (CMA) is considering whether it is or may be the case that this transaction, if carried into effect, will result in the creation of a relevant merger situation under the merger provisions of the Enterprise Act 2002 and, if so, whether the creation of that situation may be expected to result in a substantial lessening of competition within any market or markets in the United Kingdom for goods or services.

+

Launch of merger inquiry

+

27 October 2017: The CMA announced the launch of its merger inquiry by notice to the parties.

+ +

Contact

+

Please send written representations about any competition issues to:

+

+
Competition and Markets Authority +
Victoria House +
Southampton Row +
London +
WC1B 4AD +
+

+
diff --git a/app/views/detailed_guide/show.html.erb b/app/views/detailed_guide/show.html.erb new file mode 100644 index 0000000000..737534c879 --- /dev/null +++ b/app/views/detailed_guide/show.html.erb @@ -0,0 +1,67 @@ +<% content_for :title do %> + <%= @content_item.title %> - GOV.UK +<% end %> + +<% content_for :extra_headers do %> + <%= render "govuk_publishing_components/components/machine_readable_metadata", { content_item: @content_item.to_h, schema: :faq } %> + +<% end %> + +<%= render "shared/email_subscribe_unsubscribe_flash", { title: @content_item.title } %> + +
+
+ <%= render "govuk_publishing_components/components/heading", { + text: content_item.title, + context: I18n.t("formats.#{content_item.document_type}", count: 1), + context_locale: t_locale_fallback("formats.#{content_item.document_type}", count: 1), + average_title_length: "long", + heading_level: 1, + font_size: "l", + margin_bottom: 8, + } %> +
+ <%= render "shared/translations" %> +
+ <%= render "govuk_publishing_components/components/lead_paragraph", text: @content_item.description %> +
+
+ +<%= render "shared/publisher_metadata", locals: { + from: govuk_styled_links_list(content_item.contributors), + first_published: display_date(content_item.first_public_at || content_item.first_published_at), + last_updated: display_date(content_item.updated), + see_updates_link: true, + } %> +<%= render "shared/single_page_notification_button", content_item: @content_item %> +<%= render "shared/history_notice", content_item: @content_item %> +<% if @content_item.withdrawn? %> + <%= render "govuk_publishing_components/components/notice", @content_item.withdrawal_notice_component %> +<% end %> +
+
+ <% if @content_item.national_applicability.present? %> + <%= render "govuk_publishing_components/components/devolved_nations", { + national_applicability: @content_item.national_applicability, + type: @content_item.schema_name, + } %> + <% end %> + + <%= render "components/contents_list_with_body", contents: @content_item.contents do %> + <%= render "govuk_publishing_components/components/print_link", { + margin_top: 0, + margin_bottom: 6, + } %> + + <%= render "govuk_publishing_components/components/govspeak", { + direction: page_text_direction, + } do %> + <%= raw(content_item.body) %> + <% end %> + + <%= render "shared/published_dates_with_notification_button" %> + <% end %> +
+ <%= render "shared/sidebar_navigation" %> +
+<%= render "shared/footer_navigation" %> diff --git a/app/views/shared/_email_subscribe_unsubscribe_flash.html.erb b/app/views/shared/_email_subscribe_unsubscribe_flash.html.erb new file mode 100644 index 0000000000..627a7c3495 --- /dev/null +++ b/app/views/shared/_email_subscribe_unsubscribe_flash.html.erb @@ -0,0 +1,31 @@ +<% banner_description = capture do %> + <%= t("email.description") %> +<% end %> + +<% if show_email_subscription_success_banner?(@account_flash) %> +
+
+ <% + ga4_data = { + event_name: "form_complete", + type: "email subscription", + text: email_subscription_success_banner_heading(@account_flash, :en), + section: local_assigns[:title], + action: "complete", + tool_name: "Get emails from GOV.UK", + }.to_json + %> + <%= content_tag(:div, + data: { + module: "ga4-auto-tracker", + ga4_auto: ga4_data, + }) do %> + <%= render "govuk_publishing_components/components/success_alert", { + message: email_subscription_success_banner_heading(@account_flash), + description: banner_description, + margin_bottom: 0, + } %> + <% end %> +
+
+<% end %> diff --git a/app/views/shared/_history_notice.html.erb b/app/views/shared/_history_notice.html.erb new file mode 100644 index 0000000000..91becded08 --- /dev/null +++ b/app/views/shared/_history_notice.html.erb @@ -0,0 +1,8 @@ +<% if content_item.historically_political? %> + <%= render "govuk_publishing_components/components/notice", { + title: sanitize( + t("shared.historically_political", government: "#{content_item.publishing_government}"), + attributes: %w(lang dir), + ), + } %> +<% end %> diff --git a/app/views/shared/_published_dates_with_notification_button.html.erb b/app/views/shared/_published_dates_with_notification_button.html.erb new file mode 100644 index 0000000000..ea0c0c1c6c --- /dev/null +++ b/app/views/shared/_published_dates_with_notification_button.html.erb @@ -0,0 +1,41 @@ +<% add_view_stylesheet("published-dates-button-group") %> +<% skip_account = skip_account || "false" %> + +<%= render "components/published_dates", { + published: display_date(content_item.first_public_at), + last_updated: display_date(content_item.updated), + history: content_item.history, + margin_bottom: 5, + } %> + +
+

+ <% if @content_item.display_single_page_notification_button? %> + <%= I18n.t("common.email_and_print_link") %> + <% else %> + <%= I18n.t("common.print_link") %> + <% end %> +

+ + <%= render "govuk_publishing_components/components/single_page_notification_button", { + base_path: @content_item.base_path, + js_enhancement: @has_govuk_account, + button_location: "bottom", + margin_bottom: 3, + skip_account: skip_account, + ga4_data_attributes: { + module: "ga4-link-tracker", + ga4_link: { + event_name: "navigation", + type: "subscribe", + index_link: 2, + index_total: 2, + section: "Footer", + }, + }, + } if @content_item.display_single_page_notification_button? %> + <%= render "govuk_publishing_components/components/print_link", { + margin_top: 0, + margin_bottom: 8, + } %> +
diff --git a/app/views/shared/_single_page_notification_button.html.erb b/app/views/shared/_single_page_notification_button.html.erb new file mode 100644 index 0000000000..c56da47632 --- /dev/null +++ b/app/views/shared/_single_page_notification_button.html.erb @@ -0,0 +1,26 @@ +<% if @content_item.display_single_page_notification_button? %> + <% + default_ga4_data_attributes = { + module: "ga4-link-tracker", + ga4_link: { + event_name: "navigation", + type: "subscribe", + index_link: 1, + index_total: 2, + section: "Top", + }, + } + %> + + <% ga4_data_attributes = ga4_data_attributes || default_ga4_data_attributes %> + <% skip_account = skip_account || "false" %> + + <%= render "govuk_publishing_components/components/single_page_notification_button", { + base_path: @content_item.base_path, + js_enhancement: @has_govuk_account, + ga4_data_attributes: ga4_data_attributes, + margin_bottom: 6, + button_location: "top", + skip_account: skip_account, + } %> +<% end %> diff --git a/config/govuk_examples.yml b/config/govuk_examples.yml index 1f78519a43..40da6dc845 100644 --- a/config/govuk_examples.yml +++ b/config/govuk_examples.yml @@ -5,6 +5,7 @@ --- calendar: /bank-holidays case-studies: /government/case-studies/doing-business-in-spain +detailed_guide: /guidance/guidance-on-devolution licence_transaction: /find-licences/tv-licence local_transaction: /contact-electoral-registration-office help_page: /help/browsers diff --git a/config/initializers/dartsass.rb b/config/initializers/dartsass.rb index 9ff92b80bf..07a684b764 100644 --- a/config/initializers/dartsass.rb +++ b/config/initializers/dartsass.rb @@ -1,7 +1,9 @@ APP_STYLESHEETS = { "application.scss" => "application.css", "static-error-pages.scss" => "static-error-pages.css", + "components/_back-to-top.scss" => "components/_back-to-top.css", "components/_calendar.scss" => "components/_calendar.css", + "components/_contents-list-with-body.scss" => "components/_contents-list-with-body.css", "components/_download-link.scss" => "components/_download-link.css", "components/_figure.scss" => "components/_figure.css", "components/_published-dates.scss" => "components/_published-dates.css", @@ -15,6 +17,7 @@ "views/_location_form.scss" => "views/_location_form.css", "views/_place-list.scss" => "views/_place-list.css", "views/_popular_links.scss" => "views/_popular_links.css", + "views/_published-dates-button-group.scss" => "views/_published-dates-button-group.css", "views/_publisher_metadata.scss" => "views/_publisher_metadata.css", "views/_sidebar-navigation.scss" => "views/_sidebar-navigation.css", "views/_travel-advice.scss" => "views/_travel-advice.css", diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 9cd8a60eaa..a5dc34344a 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -79,6 +79,7 @@ ar: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ ar: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'تفضّل بزيارة:' components: figure: image_credit: 'حقوق ملكية الصورة: %{credit}' @@ -677,6 +680,8 @@ ar: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -687,6 +692,13 @@ ar: other: دراسات الحالة two: zero: + detailed_guide: + few: + many: + one: + other: توجيه + two: + zero: find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/az.yml b/config/locales/az.yml index 4e2121e550..70f5959ef2 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -79,6 +79,7 @@ az: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ az: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Baş çəkin:' components: figure: image_credit: 'Təqdim edilmiş qrafik material: %{credit}' @@ -385,12 +388,17 @@ az: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Nümunə üzrə araşdırma other: Nümunə üzrə araşdırmalar + detailed_guide: + one: Göstəriş + other: Göstəriş find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/be.yml b/config/locales/be.yml index 9afbe3d33d..d5ce0035f9 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -79,6 +79,7 @@ be: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ be: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Наведайце:' components: figure: image_credit: 'Крэдыт выявы: %{credit}' @@ -531,6 +534,8 @@ be: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -539,6 +544,11 @@ be: many: one: Тэматычнае даследаванне other: Тэматычныя даследаванні + detailed_guide: + few: + many: + one: Кіраўніцтва + other: Кіраўніцтва find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 80fc77ca60..e61a180412 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -79,6 +79,7 @@ bg: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ bg: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Посетете:' components: figure: image_credit: 'Изображението е от: %{credit}' @@ -385,12 +388,17 @@ bg: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Казус other: Казуси + detailed_guide: + one: Насока + other: Насока find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 388b3c1116..9361e5dede 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -79,6 +79,7 @@ bn: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ bn: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'ভিজিট করুন:' components: figure: image_credit: 'ছবির কৃতিত্ব: %{credit}' @@ -385,12 +388,17 @@ bn: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: কেস স্টাডি other: কেস স্টাডিসমূহ + detailed_guide: + one: পরিচালনা + other: পরিচালনা find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 634708bbb8..ad77da5d7a 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -79,6 +79,7 @@ cs: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ cs: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Navštivte:' components: figure: image_credit: zobrazení úvěru %{credit} @@ -458,6 +461,8 @@ cs: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -465,6 +470,10 @@ cs: few: one: Případová studie other: Případové studie + detailed_guide: + few: + one: Směrnice + other: Směrnice find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 109a0bd1eb..19055fac4f 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -79,6 +79,7 @@ cy: bank_holiday_on_wkend: Os yw gŵyl banc yn cwympo ar benwythnos, bydd dydd o'r wythnos yn dod yn ŵyl banc 'amgen' yn ei le, fel arfer y dydd Llun canlynol. bank_holiday_translation_html: Mae'r canllaw hwn hefyd ar gael yn Saesneg (English). download_ics: Llwythwch y dyddiadau hyn i lawr er mwyn eu hychwanegu at raglen calendr fel iCal neu Outlook + email_and_print_link: extra_bank_holiday: Gŵyl banc ychwanegol holiday_entitlement_html: Nid oes yn rhaid i'ch cyflogwr roi gwyliau â thâl i chi ar wyliau banc neu gyhoeddus. nations: @@ -96,10 +97,12 @@ cy: scotland_slug: yr-alban next_holiday_in_is: Yr ŵyl banc nesaf %{in_nation} yw past_bank_holidays: Gwyliau banc blaenorol + print_link: substitute_day: Diwrnod amgen today: heddiw united-kingdom_slug: upcoming_bank_holidays: Gwyliau banc i ddod + visit: 'Ymweld:' components: figure: image_credit: 'Delwedd gan: %{credit}' @@ -679,6 +682,8 @@ cy: matched_postcode_html: Rydyn ni wedi paru'r cod post %{postcode} i %{electoral_service_name}. search_postcode_html: Chwiliwch am god post gwahanol title: Eich cyngor lleol + email: + description: error: find: Ffeindio formats: @@ -689,6 +694,13 @@ cy: other: Astudiaethau achos two: zero: + detailed_guide: + few: + many: + one: Canllawiau + other: Canllawiau + two: + zero: find_my_nearest: valid_postcode_no_locations: Doedden ni ddim yn gallu dod o hyd i unrhyw ganlyniadau ar gyfer y cod post hwn. get_involved: diff --git a/config/locales/da.yml b/config/locales/da.yml index 64d4c37422..079dde8e7e 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -79,6 +79,7 @@ da: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ da: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Besøge:' components: figure: image_credit: 'Billede kredit: %{credit}' @@ -385,12 +388,17 @@ da: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Casestudie other: Casestudie + detailed_guide: + one: Vejledning + other: Vejledning find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/de.yml b/config/locales/de.yml index cd1389df50..98c78f1633 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -79,6 +79,7 @@ de: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ de: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Besuchen Sie:' components: figure: image_credit: 'Abbildung: %{credit}' @@ -385,12 +388,17 @@ de: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Fallstudie other: Fallstudien + detailed_guide: + one: Detaillierte Hinweise + other: Detaillierte Hinweise find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/dr.yml b/config/locales/dr.yml index ceb193d6ac..0fc1a0729f 100644 --- a/config/locales/dr.yml +++ b/config/locales/dr.yml @@ -79,6 +79,7 @@ dr: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ dr: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'بازدید:' components: figure: image_credit: "%{credit}:کریدت تصویر\n" @@ -385,12 +388,17 @@ dr: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: مطالعه موردی other: مطالعات موردی + detailed_guide: + one: راهنمایی + other: راهنمایی find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/el.yml b/config/locales/el.yml index 1a2a72832d..423820921b 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -79,6 +79,7 @@ el: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ el: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Επίσκεψη:' components: figure: image_credit: 'Εικόνα από: %{credit}' @@ -385,12 +388,17 @@ el: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Μελέτη περίπτωσης other: Μελέτες περιπτώσεων + detailed_guide: + one: Οδηγία + other: Οδηγία find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/en.yml b/config/locales/en.yml index 2ec9b51bce..eb3a636205 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -79,6 +79,7 @@ en: bank_holiday_on_wkend: If a bank holiday is on a weekend, a ‘substitute’ weekday becomes a bank holiday, normally the following Monday. bank_holiday_translation_html: This guide is also available in Welsh (Cymraeg). download_ics: Download these dates so you can add them to a calendar application such as iCal or Outlook + email_and_print_link: Sign up for emails or print this page extra_bank_holiday: Extra bank holiday holiday_entitlement_html: Your employer does not have to give you paid leave on bank or public holidays. nations: @@ -96,10 +97,12 @@ en: scotland_slug: scotland next_holiday_in_is: The next bank holiday %{in_nation} is past_bank_holidays: Past bank holidays + print_link: Print this page substitute_day: Substitute day today: today united-kingdom_slug: united-kingdom upcoming_bank_holidays: Upcoming bank holidays + visit: 'Visit:' components: figure: image_credit: 'Image credit: %{credit}' @@ -387,12 +390,17 @@ en: matched_postcode_html: We’ve matched the postcode %{postcode} to %{electoral_service_name}. search_postcode_html: Search for a different postcode title: Your local council + email: + description: See and manage all your GOV.UK email subscriptions error: Error find: Find formats: case_study: one: Case study other: Case studies + detailed_guide: + one: Guidance + other: Guidance find_my_nearest: valid_postcode_no_locations: We couldn't find any results for this postcode. get_involved: diff --git a/config/locales/es-419.yml b/config/locales/es-419.yml index ab73a5b867..7642e36074 100644 --- a/config/locales/es-419.yml +++ b/config/locales/es-419.yml @@ -79,6 +79,7 @@ es-419: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ es-419: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Visite:' components: figure: image_credit: 'Crédito de la imagen: %{credit}' @@ -385,12 +388,17 @@ es-419: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Estudio de caso other: Estudios de caso + detailed_guide: + one: Orientación + other: Orientación find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/es.yml b/config/locales/es.yml index 852e0e9156..b7ca7da061 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -79,6 +79,7 @@ es: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ es: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Visite:' components: figure: image_credit: 'Crédito de la imagen: %{credit}' @@ -385,12 +388,17 @@ es: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Caso de estudio práctico other: Casos de estudio práctico + detailed_guide: + one: Orientación detallada + other: Orientación detallada find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/et.yml b/config/locales/et.yml index b797de8d8c..7b6f4a1c26 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -79,6 +79,7 @@ et: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ et: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Külastus:' components: figure: image_credit: 'Pildi autoriõigus: %{credit}' @@ -385,12 +388,17 @@ et: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Juhtumiuuring other: Juhtumiuuringud + detailed_guide: + one: Juhised + other: Juhised find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 7f472d9728..f0ab66bad5 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -79,6 +79,7 @@ fa: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ fa: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'بازدید کنید:' components: figure: image_credit: 'اعتبار تصویر: %{credit}' @@ -385,12 +388,17 @@ fa: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: مطالعه موردی other: مطالعات موردی + detailed_guide: + one: راهنمایی + other: راهنمایی find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 3fbc05642f..b1b44e994a 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -79,6 +79,7 @@ fi: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ fi: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Vierailla:' components: figure: image_credit: 'Kuvaluotto: %{credit}' @@ -385,12 +388,17 @@ fi: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Tapaustutkimus other: Tapaustutkimuksia + detailed_guide: + one: Ohjaus + other: Ohjaus find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2600a44965..c030712d66 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -79,6 +79,7 @@ fr: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ fr: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Visiter:' components: figure: image_credit: Crédit d'image : %{credit} @@ -385,12 +388,17 @@ fr: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Etude de cas other: Etudes de cas + detailed_guide: + one: Orientations + other: Orientations find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 0e22d05d6e..a9d11eed13 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -79,6 +79,7 @@ gd: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ gd: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Cuairt:' components: figure: image_credit: 'Creidmheas íomhá: %{credit}' @@ -531,6 +534,8 @@ gd: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -539,6 +544,11 @@ gd: one: Cás-staidéir other: Tuarascálacha staidéir two: + detailed_guide: + few: + one: Treoshuíomh + other: Treoshuíomh + two: find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/gu.yml b/config/locales/gu.yml index 1215dc9d4d..71f44ca77a 100644 --- a/config/locales/gu.yml +++ b/config/locales/gu.yml @@ -79,6 +79,7 @@ gu: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ gu: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'મુલાકાત લો:' components: figure: image_credit: ઇમેજ ક્રેડિટ:%{credit} @@ -385,12 +388,17 @@ gu: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: કેસ સ્ટડી other: કેસ સ્ટડીઝ + detailed_guide: + one: માર્ગદર્શન + other: માર્ગદર્શન find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/he.yml b/config/locales/he.yml index 264b2e1593..84a58c4c60 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -79,6 +79,7 @@ he: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ he: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'בקר:' components: figure: image_credit: 'קרדיט תמונה: %{credit}' @@ -385,12 +388,17 @@ he: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: מקרה בוחן other: מקרי בוחן + detailed_guide: + one: הדרכה + other: הדרכה find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 2917ff565d..87e9abad34 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -79,6 +79,7 @@ hi: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ hi: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'इस पर जाएं:' components: figure: image_credit: 'इमेज क्रेडिट: %{credit}' @@ -385,12 +388,17 @@ hi: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: विषय अध्ययन other: विषय अध्ययन + detailed_guide: + one: मार्गदर्शन + other: मार्गदर्शन find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/hr.yml b/config/locales/hr.yml index a923ea84f1..376a2e92d4 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -79,6 +79,7 @@ hr: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ hr: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Posjetite:' components: figure: image_credit: 'Zasluga za sliku: %{credit}' @@ -458,6 +461,8 @@ hr: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -465,6 +470,10 @@ hr: few: one: Studija slučaja other: Studije slučaja + detailed_guide: + few: + one: Upute + other: Upute find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 97ade03c2d..47fa19beb2 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -79,6 +79,7 @@ hu: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ hu: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Látogassa meg:' components: figure: image_credit: 'Képaláírás: %{credit}' @@ -385,12 +388,17 @@ hu: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Esettanulmány other: Esettanulmányok + detailed_guide: + one: Útmutató + other: Útmutató find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/hy.yml b/config/locales/hy.yml index 3fcc7d881c..91c0b50032 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -79,6 +79,7 @@ hy: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ hy: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: Այցելել՝ components: figure: image_credit: Նկարը՝ %{credit} @@ -385,12 +388,17 @@ hy: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Մասնավոր դեպքի ուսումնասիրություն other: Մասնավոր դեպքի ուսումնասիրություններ + detailed_guide: + one: Ուղեցույց + other: Ուղեցույց find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/id.yml b/config/locales/id.yml index c02d83af39..c20addfa1e 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -79,6 +79,7 @@ id: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ id: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Kunjungan:' components: figure: image_credit: 'Kredit gambar: %{credit}' @@ -312,11 +315,15 @@ id: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: other: Studi kasus + detailed_guide: + other: Panduan find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/is.yml b/config/locales/is.yml index 99d0fb6aea..53578e2600 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -79,6 +79,7 @@ is: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ is: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Heimsæktu:' components: figure: image_credit: Uppruni myndar %{credit} @@ -385,12 +388,17 @@ is: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Ferilsathugun other: Ferilsathuganir + detailed_guide: + one: Leiðsögn + other: Leiðsögn find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/it.yml b/config/locales/it.yml index f2908a072a..6cddb0911c 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -79,6 +79,7 @@ it: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ it: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Visita:' components: figure: image_credit: 'Credito d’immagine: %{credit}' @@ -385,12 +388,17 @@ it: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Caso di studio other: Casi di studio + detailed_guide: + one: Guida + other: Guida find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 8cbf8d51ae..19d9576557 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -79,6 +79,7 @@ ja: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ ja: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 訪問： components: figure: image_credit: 画像著作権：%{credit} @@ -312,11 +315,15 @@ ja: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: other: ケーススタディ + detailed_guide: + other: ガイダンス find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 2d85939f49..e76067c883 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -79,6 +79,7 @@ ka: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ ka: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'ეწვიეთ:' components: figure: image_credit: 'სურათ: %{credit}' @@ -385,12 +388,17 @@ ka: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: შემთხვევის კვლევა other: შემთხვევის კვლევები + detailed_guide: + one: ხელძღვანელობა + other: ხელძღვანელობა find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 9d9bba5cdf..0421212f7f 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -79,6 +79,7 @@ kk: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ kk: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Мұнда өтіңіз:' components: figure: image_credit: 'Суретті түсірген: %{credit}' @@ -385,12 +388,17 @@ kk: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Тақырыптық зерттеу other: Тақырыптық зерттеулер + detailed_guide: + one: Нұсқаулық + other: Нұсқаулық find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 1ebb218bee..38b6f13c72 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -79,6 +79,7 @@ ko: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ ko: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: '방문:' components: figure: image_credit: '이미지 저작권: %{credit}' @@ -312,11 +315,15 @@ ko: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: other: 사례 연구 + detailed_guide: + other: 지침 find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 8eca5d843e..f15082b299 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -79,6 +79,7 @@ lt: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ lt: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Apsilankykite:' components: figure: image_credit: 'Nuotrauka: %{credit}' @@ -458,6 +461,8 @@ lt: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -465,6 +470,10 @@ lt: few: one: Atvejo analizė other: Atvejų analizės + detailed_guide: + few: + one: Detalesnė informacija + other: Detalesnė informacija find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index d409c27336..3207bf2db9 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -79,6 +79,7 @@ lv: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ lv: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Apmeklējiet:' components: figure: image_credit: 'Attēla autortiesības: %{credit}' @@ -385,12 +388,17 @@ lv: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Piemērs other: Piemēri + detailed_guide: + one: Detalizētas norādes + other: Detalizētas norādes find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/ms.yml b/config/locales/ms.yml index a0260b5d00..048e6db94d 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -79,6 +79,7 @@ ms: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ ms: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Lawati:' components: figure: image_credit: 'Imej kredit: %{credit}' @@ -312,11 +315,15 @@ ms: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: other: Kajian kes + detailed_guide: + other: Panduan find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/mt.yml b/config/locales/mt.yml index 00fc996573..8941157cc9 100644 --- a/config/locales/mt.yml +++ b/config/locales/mt.yml @@ -79,6 +79,7 @@ mt: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ mt: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Żur:' components: figure: image_credit: 'Kreditu għall-immaġni: %{credit}' @@ -531,6 +534,8 @@ mt: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -539,6 +544,11 @@ mt: many: one: Studju ta' Każ other: Studju ta' Każijiet + detailed_guide: + few: + many: + one: Gwida + other: Gwida find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 610d7672bb..683633fe3b 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -79,6 +79,7 @@ ne: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ ne: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'भ्रमण:' components: figure: image_credit: 'छवि श्रेय: %{credit}' @@ -385,12 +388,17 @@ ne: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: मामिला अध्ययन other: मामिला अध्ययनहरू + detailed_guide: + one: मार्गदर्शन + other: मार्गदर्शन find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index ca4b91a0fa..6a171c8817 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -79,6 +79,7 @@ nl: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ nl: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Bezoek:' components: figure: image_credit: 'Image credit: %{credit}' @@ -385,12 +388,17 @@ nl: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Casestudy other: Casestudies + detailed_guide: + one: Richtsnoer + other: Begeleiding find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/no.yml b/config/locales/no.yml index 80f4e21659..61a2249aa7 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -79,6 +79,7 @@ bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Besøk:' components: figure: image_credit: 'Bildekreditt: %{credit}' @@ -385,12 +388,17 @@ matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Casestudie other: Casestudier + detailed_guide: + one: Veiledning + other: Veiledning find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/pa-pk.yml b/config/locales/pa-pk.yml index 9577836125..b9ddf2e7ac 100644 --- a/config/locales/pa-pk.yml +++ b/config/locales/pa-pk.yml @@ -79,6 +79,7 @@ pa-pk: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ pa-pk: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'ویکھو:' components: figure: image_credit: 'امیج کریڈٹ: %{credit}' @@ -385,12 +388,17 @@ pa-pk: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: کیس دی پڑھائی other: کیس دی پڑھائی + detailed_guide: + one: 'رہنمائی ' + other: 'رہنمائی ' find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 495808e734..25b6e766cb 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -79,6 +79,7 @@ pa: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ pa: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'ਮੁਲਾਕਾਤ:' components: figure: image_credit: 'ਚਿੱਤਰ ਕ੍ਰੈਡਿਟ: %{credit}' @@ -385,12 +388,17 @@ pa: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: ਕੇਸ ਅਧਿਐਨ other: ਕੇਸ ਅਧਿਐਨ + detailed_guide: + one: ਸੇਧ + other: ਸੇਧ find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 1f76e388d1..ccf74090d6 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -79,6 +79,7 @@ pl: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ pl: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Odwiedź:' components: figure: image_credit: Obrazek:%{credit} @@ -531,6 +534,8 @@ pl: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -539,6 +544,11 @@ pl: many: one: Studium przypadku other: Studia przypadku + detailed_guide: + few: + many: + one: Szczegółowe wskazówki + other: Szczegółowe wskazówki find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/ps.yml b/config/locales/ps.yml index 5bc40c806a..6bda574f28 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -79,6 +79,7 @@ ps: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ ps: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'لیدنه:' components: figure: image_credit: د انځور کریډیټ:%{credit} @@ -385,12 +388,17 @@ ps: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: موردي مطالعه other: موردي مطالعات + detailed_guide: + one: لارښود + other: لارښود find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 1fcde50499..fc8e256b26 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -79,6 +79,7 @@ pt: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ pt: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Visite:' components: figure: image_credit: 'Crédito da imagem: %{credit}' @@ -385,12 +388,17 @@ pt: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Estudo de caso other: Estudos de caso + detailed_guide: + one: Orientação + other: Orientação find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/ro.yml b/config/locales/ro.yml index bcaa84296a..6aeb4e8049 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -79,6 +79,7 @@ ro: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ ro: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Accesați:' components: figure: image_credit: 'Autor imagine: %{credit}' @@ -458,6 +461,8 @@ ro: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -465,6 +470,10 @@ ro: few: one: Studiu de caz other: Studii de caz + detailed_guide: + few: + one: Orientări + other: Orientări find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index b568d8d745..47b5c71d47 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -79,6 +79,7 @@ ru: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ ru: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Посетите:' components: figure: image_credit: 'Графические материалы предоставлены: %{credit}' @@ -531,6 +534,8 @@ ru: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -539,6 +544,11 @@ ru: many: one: Причинный анализ other: Причинные анализы + detailed_guide: + few: + many: + one: Подробное руководство + other: Руководство find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/si.yml b/config/locales/si.yml index 5b57ea1e77..aa10607c27 100644 --- a/config/locales/si.yml +++ b/config/locales/si.yml @@ -79,6 +79,7 @@ si: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ si: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'පිවිසෙන්න:' components: figure: image_credit: 'රූප සඳහා ස්තූතියි: %{credit}' @@ -385,12 +388,17 @@ si: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: සිද්ධි අධ්යයනය other: සිද්ධි අධ්යයන + detailed_guide: + one: මාර්ගෝපදේශය + other: මාර්ගෝපදේශය find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 8859b05662..7c7834df35 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -79,6 +79,7 @@ sk: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ sk: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Navštívte:' components: figure: image_credit: 'Obrázok: %{credit}' @@ -458,6 +461,8 @@ sk: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -465,6 +470,10 @@ sk: few: one: Prípadová štúdia other: Prípadové štúdie + detailed_guide: + few: + one: Poradenstvo + other: Poradenstvo find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 5a6448b110..a149d85a5a 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -79,6 +79,7 @@ sl: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ sl: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Obiščite:' components: figure: image_credit: 'Avtor slike: %{credit}' @@ -531,6 +534,8 @@ sl: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -539,6 +544,11 @@ sl: one: Študija primera other: Študije primera two: + detailed_guide: + few: + one: Smernice + other: Smernice + two: find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/so.yml b/config/locales/so.yml index f1a4f8ec95..21050eca0f 100644 --- a/config/locales/so.yml +++ b/config/locales/so.yml @@ -79,6 +79,7 @@ so: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ so: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Booqo:' components: figure: image_credit: 'Xuquuqda sawirka: %{credit}' @@ -385,12 +388,17 @@ so: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Daraasad other: Daraasado + detailed_guide: + one: Tilmaam + other: Tilmaam find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index d03be0d1f8..8d40bf355b 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -79,6 +79,7 @@ sq: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ sq: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Vizitoni:' components: figure: image_credit: 'Kreditet e imazhit: %{credit}' @@ -385,12 +388,17 @@ sq: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Rast studimi other: Raste studimi + detailed_guide: + one: Udhëzim + other: Udhëzim find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 7d9e8cd438..91e007de0c 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -79,6 +79,7 @@ sr: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ sr: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Posetite:' components: figure: image_credit: 'Vlasnik slike: %{credit}' @@ -458,6 +461,8 @@ sr: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -465,6 +470,10 @@ sr: few: one: Studija slučaja other: Studije slučaja + detailed_guide: + few: + one: Detaljno uputstvo + other: Detaljno uputstvo find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 2f69605caf..b530f233b6 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -79,6 +79,7 @@ sv: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ sv: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Besök:' components: figure: image_credit: 'Bild: %{credit}' @@ -385,12 +388,17 @@ sv: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Fallstudie other: Fallstudier + detailed_guide: + one: Vägledning + other: Vägledning find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/sw.yml b/config/locales/sw.yml index 17224acd55..84d1c69cf7 100644 --- a/config/locales/sw.yml +++ b/config/locales/sw.yml @@ -79,6 +79,7 @@ sw: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ sw: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Tembelea:' components: figure: image_credit: 'Mpiga picha: %{credit}' @@ -385,12 +388,17 @@ sw: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Uchunguzi kifani other: Uchunguzi kifani + detailed_guide: + one: Mwongozo + other: Mwongozo find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/ta.yml b/config/locales/ta.yml index b442ecc1e3..05598e04ad 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -79,6 +79,7 @@ ta: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ ta: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'வருகை:' components: figure: image_credit: 'பட உதவி: %{credit}' @@ -385,12 +388,17 @@ ta: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: நிகழ்வு ஆய்வு other: நிகழ்வு ஆய்வுகள் + detailed_guide: + one: வழிகாட்டுதல் + other: வழிகாட்டுதல் find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/th.yml b/config/locales/th.yml index d17077539a..e90c25b080 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -79,6 +79,7 @@ th: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ th: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'เยี่ยมชม:' components: figure: image_credit: 'เครดิตภาพ: %{credit}' @@ -312,11 +315,15 @@ th: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: other: กรณีศึกษา + detailed_guide: + other: คำแนะนำ find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/tk.yml b/config/locales/tk.yml index a8c967caa3..77562bc4f7 100644 --- a/config/locales/tk.yml +++ b/config/locales/tk.yml @@ -79,6 +79,7 @@ tk: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ tk: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Serediň:' components: figure: image_credit: 'Surat krediti: %{credit}' @@ -385,12 +388,17 @@ tk: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Ýagdaý seljermesi other: Ýagdaý seljermeleri + detailed_guide: + one: Gözkezme + other: Gözkezme find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 0f3777c295..7a696c6a59 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -79,6 +79,7 @@ tr: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ tr: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Ziyaret et:' components: figure: image_credit: 'Resim sahibi: %{credit}' @@ -385,12 +388,17 @@ tr: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Vaka incelemesi other: Vaka incelemeleri + detailed_guide: + one: Rehberlik + other: Rehberlik find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 569720a183..5bc837f4a2 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -79,6 +79,7 @@ uk: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ uk: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Відвідайте:' components: figure: image_credit: 'Зображення: %{credit}' @@ -531,6 +534,8 @@ uk: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: @@ -539,6 +544,11 @@ uk: many: one: Аналіз ситуації other: Аналізи ситуації + detailed_guide: + few: + many: + one: Керівництво + other: Керівництво find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/ur.yml b/config/locales/ur.yml index e12fee5ae8..4f2437f0cb 100644 --- a/config/locales/ur.yml +++ b/config/locales/ur.yml @@ -79,6 +79,7 @@ ur: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ ur: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'ملاحظہ کریں:' components: figure: image_credit: 'تصویری کریڈٹ: %{credit}' @@ -385,12 +388,17 @@ ur: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: کیس اسٹڈی other: کیس اسٹڈیز + detailed_guide: + one: رہنمائی + other: رہنمائی find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/uz.yml b/config/locales/uz.yml index b5cd6aa0c9..03ec50ab15 100644 --- a/config/locales/uz.yml +++ b/config/locales/uz.yml @@ -79,6 +79,7 @@ uz: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ uz: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Ташриф буюринг:' components: figure: image_credit: 'График материаллар тақдим этилган: %{credit}' @@ -385,12 +388,17 @@ uz: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: Ҳолатларнинг таҳлили other: Ҳолатларнинг таҳлиллари + detailed_guide: + one: Қўлланма + other: Қўлланма find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 12e8a95275..06ae0f4e5c 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -79,6 +79,7 @@ vi: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ vi: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 'Truy cập:' components: figure: image_credit: 'Nguồn hình ảnh: %{credit}' @@ -312,11 +315,15 @@ vi: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: other: Nghiên cứu điển hình + detailed_guide: + other: Hướng dẫn find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/yi.yml b/config/locales/yi.yml index 72c8e3337f..a36f69d026 100644 --- a/config/locales/yi.yml +++ b/config/locales/yi.yml @@ -79,6 +79,7 @@ yi: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ yi: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: components: figure: image_credit: @@ -385,12 +388,17 @@ yi: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: one: other: + detailed_guide: + one: + other: find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml index c049b8b80b..86fbacde11 100644 --- a/config/locales/zh-hk.yml +++ b/config/locales/zh-hk.yml @@ -79,6 +79,7 @@ zh-hk: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ zh-hk: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 訪問： components: figure: image_credit: 圖片來源： %{credit} @@ -312,11 +315,15 @@ zh-hk: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: other: 案例研究 + detailed_guide: + other: 詳細指引 find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/zh-tw.yml b/config/locales/zh-tw.yml index e360f81569..f2ae792153 100644 --- a/config/locales/zh-tw.yml +++ b/config/locales/zh-tw.yml @@ -79,6 +79,7 @@ zh-tw: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ zh-tw: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 探訪： components: figure: image_credit: 圖片來源： %{credit} @@ -312,11 +315,15 @@ zh-tw: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: other: 案例分析 + detailed_guide: + other: 指導 find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 3e50e37dbb..914550a0e4 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -79,6 +79,7 @@ zh: bank_holiday_on_wkend: bank_holiday_translation_html: download_ics: + email_and_print_link: extra_bank_holiday: holiday_entitlement_html: nations: @@ -96,10 +97,12 @@ zh: scotland_slug: next_holiday_in_is: past_bank_holidays: + print_link: substitute_day: today: united-kingdom_slug: upcoming_bank_holidays: + visit: 访问： components: figure: image_credit: 图片提供：%{credit} @@ -312,11 +315,15 @@ zh: matched_postcode_html: search_postcode_html: title: + email: + description: error: find: formats: case_study: other: 案例研究 + detailed_guide: + other: 指南 find_my_nearest: valid_postcode_no_locations: get_involved: diff --git a/config/routes.rb b/config/routes.rb index 730282ffec..927e9ff912 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -48,6 +48,11 @@ get "/home", to: "account_home#show", as: :account_home end + # Detailed guidance pages + scope "/guidance" do + get "/:slug", to: "detailed_guide#show", as: :detailed_guide + end + # Help pages scope "/help" do get "/:slug", to: "help_page#show", constraints: { slug: /(?!(ab-testing|cookies)$).*/ } diff --git a/spec/components/back_to_top_spec.rb b/spec/components/back_to_top_spec.rb new file mode 100644 index 0000000000..3f097843a7 --- /dev/null +++ b/spec/components/back_to_top_spec.rb @@ -0,0 +1,17 @@ +RSpec.describe "BackToTopComponent" do + def component_name + "back_to_top" + end + + it "fails to render a back to top link when no parameters given" do + expect { render_component({}) }.to raise_error(ActionView::Template::Error) + end + + it "renders a back to top link when a href is given" do + expect { render_component(href: "#contents") }.to have_css(".app-c-back-to-top[href='#contents']") + end + + it "renders a back to top link with custom text" do + expect { render_component(href: "#contents", text: "Back to top") }.to have_css(".app-c-back-to-top[href='#contents']", text: "Back to top") + end +end diff --git a/spec/components/contents_list_with_body_spec.rb b/spec/components/contents_list_with_body_spec.rb new file mode 100644 index 0000000000..919fd64066 --- /dev/null +++ b/spec/components/contents_list_with_body_spec.rb @@ -0,0 +1,48 @@ +RSpec.describe "ContentsListWithBodyComponent", type: :view do + def component_path + "components/contents_list_with_body" + end + + def contents_list + [ + { href: "/one", text: "1. One" }, + { href: "/two", text: "2. Two" }, + ] + end + + def block + "

Foo

".html_safe + end + + it "renders nothing without a block" do + expect(render(component_path, contents: contents_list)).to be_empty + end + + it "yields the block without contents data" do + expect(render(component_path, {}) { block }).to include(block) + end + + it "renders a sticky-element-container" do + render(component_path, contents: contents_list) { block } + + expect(rendered).to have_selector("#contents.app-c-contents-list-with-body") + expect(rendered).to have_selector("#contents[data-module='sticky-element-container']") + end + + it "does not apply the sticky-element-container data-module without contents data" do + expect(render(component_path, {}) { block }).not_to have_selector("#contents[data-module='sticky-element-container']") + end + + it "renders a contents-list component" do + render(component_path, contents: contents_list) { block } + + expect(rendered).to have_css(".app-c-contents-list-with-body .gem-c-contents-list") + expect(rendered).to have_css(".gem-c-contents-list__link[href='/one']", text: "1. One") + end + + it "renders a back-to-top component" do + render(component_path, contents: contents_list) { block } + expect(rendered).to have_css(".app-c-contents-list-with-body + .app-c-contents-list-with-body__link-wrapper .app-c-contents-list-with-body__link-container .app-c-back-to-top[href='#contents']") + end +end diff --git a/spec/models/detailed_guide_spec.rb b/spec/models/detailed_guide_spec.rb new file mode 100644 index 0000000000..64596fb6fb --- /dev/null +++ b/spec/models/detailed_guide_spec.rb @@ -0,0 +1,5 @@ +RSpec.describe DetailedGuide do + let(:content_store_response) { GovukSchemas::Example.find("detailed_guide", example_name: "detailed_guide") } + + it_behaves_like "it can have single page notifications", "detailed_guide", "detailed_guide" +end diff --git a/spec/requests/detailed_guide_spec.rb b/spec/requests/detailed_guide_spec.rb new file mode 100644 index 0000000000..435aac66a6 --- /dev/null +++ b/spec/requests/detailed_guide_spec.rb @@ -0,0 +1,13 @@ +RSpec.describe "Detailed Guide" do + before do + content_store_has_example_item("/guidance/salary-sacrifice-and-the-effects-on-paye", schema: :detailed_guide) + end + + describe "GET show" do + it "returns 200" do + get "/guidance/salary-sacrifice-and-the-effects-on-paye" + + expect(response).to have_http_status(:ok) + end + end +end diff --git a/spec/support/concerns/national_applicability.rb b/spec/support/concerns/national_applicability.rb new file mode 100644 index 0000000000..4e0c84dd61 --- /dev/null +++ b/spec/support/concerns/national_applicability.rb @@ -0,0 +1,7 @@ +RSpec.shared_examples "it can have national applicability" do |document_type, example_name| + it "knows its national applicability information" do + content_store_response = GovukSchemas::Example.find(document_type, example_name:) + expected_national_applicability = content_store_response.dig("details", "national_applicability")&.deep_symbolize_keys + expect(described_class.new(content_store_response).national_applicability).to eq(expected_national_applicability) + end +end diff --git a/spec/support/concerns/political.rb b/spec/support/concerns/political.rb new file mode 100644 index 0000000000..fb86a2eda2 --- /dev/null +++ b/spec/support/concerns/political.rb @@ -0,0 +1,23 @@ +RSpec.shared_examples "it has historical government information" do |document_type, example_name| + let(:content_store_response) { GovukSchemas::Example.find(document_type, example_name:) } + + it "knows it is part of historical government if it is not the current government" do + content_store_response["links"]["government"][0]["details"]["current"] = false + expect(described_class.new(content_store_response).historically_political?).to be(true) + end + + it "knows it is not part of historical government if it is the current government" do + content_store_response["links"]["government"][0]["details"]["current"] = true + expect(described_class.new(content_store_response).historically_political?).to be(false) + end + + it "knows it would be part of historical government if there is no government" do + content_store_response["links"]["government"][0]["details"]["current"] = nil + expect(described_class.new(content_store_response).historically_political?).to be(false) + end + + it "knows it's publishing government" do + expected_publishing_government = content_store_response.dig("links", "government", 0, "title") + expect(described_class.new(content_store_response).publishing_government).to eq(expected_publishing_government) + end +end diff --git a/spec/support/concerns/single_page_notification_button.rb b/spec/support/concerns/single_page_notification_button.rb new file mode 100644 index 0000000000..27f7b252e1 --- /dev/null +++ b/spec/support/concerns/single_page_notification_button.rb @@ -0,0 +1,6 @@ +RSpec.shared_examples "it can have single page notifications" do |document_type, example_name| + it "knows it has single page notifications" do + content_store_response = GovukSchemas::Example.find(document_type, example_name:) + expect(described_class.new(content_store_response).display_single_page_notification_button?).to be(true) + end +end