diff --git a/README.md b/README.md index afa8d5439..19b099c00 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ Government Frontend is a public-facing app to display the majority of documents | Speech | [View on GOV.UK](https://www.gov.uk/government/speeches/government-at-your-service-ben-gummer-speech) | | Take part | [View on GOV.UK](https://www.gov.uk/government/get-involved/take-part/become-a-councillor) | | Topical event about page | [View on GOV.UK](https://www.gov.uk/government/topical-events/2014-overseas-territories-joint-ministerial-council/about) | -| Travel advice | [View on GOV.UK](https://www.gov.uk/foreign-travel-advice/nepal) | | Working group | [View on GOV.UK](https://www.gov.uk/government/groups/abstraction-reform) | | Worldwide corporate information page | [View on GOV.UK](https://www.gov.uk/world/organisations/british-embassy-madrid/about/complaints-procedure) | | Worldwide office | [View on GOV.UK](https://www.gov.uk/world/organisations/british-embassy-paris/office/british-embassy) | diff --git a/app/assets/stylesheets/components/_download-link.scss b/app/assets/stylesheets/components/_download-link.scss deleted file mode 100644 index 35f61a358..000000000 --- a/app/assets/stylesheets/components/_download-link.scss +++ /dev/null @@ -1,19 +0,0 @@ -@import "govuk_publishing_components/individual_component_support"; - -.app-c-download-link { - display: inline-block; - margin-top: govuk-spacing(3); - margin-bottom: govuk-spacing(3); - @include govuk-font(19, $weight: bold); - - @include govuk-media-query($from: tablet) { - margin-top: govuk-spacing(6); - } -} - -.app-c-download-link__icon { - margin-right: .5em; - height: 1.3158em; // 25 / 19 - width: 1.3158em; - vertical-align: middle; -} diff --git a/app/assets/stylesheets/views/_travel-advice.scss b/app/assets/stylesheets/views/_travel-advice.scss deleted file mode 100644 index 99726b615..000000000 --- a/app/assets/stylesheets/views/_travel-advice.scss +++ /dev/null @@ -1,46 +0,0 @@ -@import "govuk_publishing_components/individual_component_support"; -@import "../helpers/parts"; - -.travel-advice { - @include parts; - - .part-navigation { - margin-bottom: govuk-spacing(8); - } - - // TODO: Remove this when components can accept variable unidirectional spacing, - // the component above should have a bigger margin-bottom. - .map { - margin-top: govuk-spacing(6); - @include responsive-bottom-margin; - - .map-image { - max-width: 100%; - } - } -} - -.metadata__update { - display: block; - margin-bottom: govuk-spacing(2); -} - -.travel-advice-notice { - background-color: govuk-colour("light-grey"); - border: 1px solid $govuk-border-colour; - margin-bottom: govuk-spacing(7); - position: relative; -} - -.travel-advice-notice__header { - padding: govuk-spacing(4) govuk-spacing(4) 0 govuk-spacing(3); -} - -.travel-advice-notice__content { - margin-top: - govuk-spacing(3); - padding: 0 govuk-spacing(4) 0 govuk-spacing(9); -} - -.travel-advice-notice__icon { - margin-left: govuk-spacing(3); -} diff --git a/app/controllers/content_items_controller.rb b/app/controllers/content_items_controller.rb index fce914e36..0bf57fef6 100644 --- a/app/controllers/content_items_controller.rb +++ b/app/controllers/content_items_controller.rb @@ -31,7 +31,6 @@ def show elsif is_history_page? show_history_page else - set_access_control_allow_origin_header if request.format.atom? set_guide_draft_access_token if @content_item.is_a?(GuidePresenter) render_template end @@ -191,7 +190,6 @@ def render_template respond_to do |format| format.html - format.atom end with_locale do @@ -199,10 +197,6 @@ def render_template end end - def set_access_control_allow_origin_header - response.headers["Access-Control-Allow-Origin"] = "*" - end - def set_expiry expires_in( @content_item.cache_control_max_age(request.format), diff --git a/app/controllers/development_controller.rb b/app/controllers/development_controller.rb index 14bbe1421..e623b5ec5 100644 --- a/app/controllers/development_controller.rb +++ b/app/controllers/development_controller.rb @@ -24,7 +24,6 @@ def index statistics_announcement take_part topical_event_about_page - travel_advice working_group] @paths = YAML.load_file(Rails.root.join("config/govuk_examples.yml")) diff --git a/app/presenters/travel_advice_presenter.rb b/app/presenters/travel_advice_presenter.rb deleted file mode 100644 index d680a5c50..000000000 --- a/app/presenters/travel_advice_presenter.rb +++ /dev/null @@ -1,124 +0,0 @@ -class TravelAdvicePresenter < ContentItemPresenter - include ContentItem::Parts - - ATOM_CACHE_CONTROL_MAX_AGE = 300 - - def page_title - if no_part_slug_provided? - super - else - "#{current_part_title} - #{super}" - end - end - - def metadata - reviewed_at = content_item["details"]["reviewed_at"] - updated_at = content_item["details"]["updated_at"] - - other = { - I18n.t("travel_advice.still_current_at") => I18n.l(Time.zone.now, format: "%-d %B %Y"), - I18n.t("travel_advice.updated") => display_date(reviewed_at || updated_at), - } - - other["Latest update"] = view_context.simple_format(latest_update, { class: "metadata__update" }, wrapper_tag: "span") if latest_update.present? - - { - other:, - } - end - - def body_for_metadata - current_part || "" - end - - def title_and_context - { - context: I18n.t("travel_advice.context"), - title: country_name, - } - end - - def country_name - content_item["details"]["country"]["name"] - end - - def ireland? - country_name == "Ireland" - end - - def no_part_slug_provided? - @part_slug.nil? - end - - def map - content_item["details"]["image"] - end - - def map_download_url - content_item["details"].dig("document", "url") - end - - def email_signup_link - content_item["details"]["email_signup_link"] - end - - def feed_link - "#{base_path}.atom" - end - - def print_link - "#{base_path}/print" - end - - # Deprecated feature - # Exists in travel advice publisher but isn't used by FCDO - # Feature included as it _could_ still be used - # Remove when alert status boxes no longer in travel advice publisher - def alert_status - allowed_statuses = %w[ - avoid_all_but_essential_travel_to_parts - avoid_all_travel_to_parts - avoid_all_but_essential_travel_to_whole_country - avoid_all_travel_to_whole_country - ] - alert_statuses = content_item["details"]["alert_status"] || [] - alert_statuses.map do |alert| - if allowed_statuses.include?(alert) - I18n.t("travel_advice.alert_status.#{alert}_html", country: country_name).html_safe - end - end - end - - def atom_change_description - view_context.simple_format(HTMLEntities.new.encode(change_description, :basic, :decimal)) - end - - def atom_public_updated_at - Time.zone.parse(content_item["public_updated_at"]) - end - - def cache_control_max_age(format) - return ATOM_CACHE_CONTROL_MAX_AGE if format == "atom" - - content_item.cache_control.max_age - end - -private - - def change_description - content_item["details"]["change_description"] - end - - # FIXME: Update publishing app UI and remove from content - # Change description is used as "Latest update" but isn't labelled that way - # in the publisher. The frontend didn't add this label before. - # This led to users appending (in a variety of formats) - # "Latest update:" to the start of the change description. The frontend now - # has a latest update label, so we can strip this out. - # Avoids: "Latest update: Latest update - ..." - def latest_update - change_description.sub(/^Latest update:?\s-?\s?/i, "").tap do |latest| - latest[0] = latest[0].capitalize if latest.present? - end - end -end diff --git a/app/views/components/_download_link.html.erb b/app/views/components/_download_link.html.erb deleted file mode 100644 index d8c261233..000000000 --- a/app/views/components/_download_link.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -<% add_app_component_stylesheet("download-link") %> -<% - link_text ||= "Download File" -%> - - - <%= link_text %> - diff --git a/app/views/components/docs/download_link.yml b/app/views/components/docs/download_link.yml deleted file mode 100644 index f50bf25f5..000000000 --- a/app/views/components/docs/download_link.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Download link -description: A link with a file download icon -body: | - For usability the provided link text should indicate the file type and size of the download. -accessibility_criteria: | - The download icon must: - - - be presentational and ignored by screen readers -shared_accessibility_criteria: - - link -examples: - default: - data: - href: '/download-this' - custom_link_text: - data: - href: '/download-map' - link_text: 'Download Map (PDF)' diff --git a/app/views/components/docs/figure.yml b/app/views/components/docs/figure.yml index 7e39361a6..ac90ce485 100644 --- a/app/views/components/docs/figure.yml +++ b/app/views/components/docs/figure.yml @@ -6,7 +6,6 @@ body: | Examples: - [Case Study containing an image](/government/case-studies/2013-elections-in-swaziland) - - [Travel Advice containing a map (image)](/foreign-travel-advice/nepal) accessibility_criteria: | The figure must: diff --git a/app/views/content_items/travel_advice.atom.builder b/app/views/content_items/travel_advice.atom.builder deleted file mode 100644 index 0fd712fa9..000000000 --- a/app/views/content_items/travel_advice.atom.builder +++ /dev/null @@ -1,14 +0,0 @@ -atom_feed(root_url: @content_item.web_url, id: @content_item.web_url) do |feed| - feed.title("Travel Advice Summary") - feed.updated @content_item.atom_public_updated_at - feed.author do |author| - author.name "GOV.UK" - end - feed.entry(@content_item, id: "#{@content_item.web_url}##{@content_item.atom_public_updated_at}", url: @content_item.web_url, updated: @content_item.atom_public_updated_at) do |entry| - entry.title(@content_item.title) - entry.link(rel: "self", type: "application/atom+xml", href: "#{@content_item.web_url}.atom") - entry.summary(type: :xhtml) do |summary| - summary << @content_item.atom_change_description - end - end -end diff --git a/app/views/content_items/travel_advice.html+print.erb b/app/views/content_items/travel_advice.html+print.erb deleted file mode 100644 index f6a96461b..000000000 --- a/app/views/content_items/travel_advice.html+print.erb +++ /dev/null @@ -1,45 +0,0 @@ -<% add_view_stylesheet("travel-advice") %> -<% - content_for :title, "Print #{@content_item.page_title}" - content_for :simple_header, true - content_for :extra_head_content do %> - -<% end %> - -
-
-
- <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %> -
- -
- <%= render 'govuk_publishing_components/components/lead_paragraph', { - margin_bottom: 6, - text: t("multi_page.printable_version"), - } %> -
- - <%= render 'govuk_publishing_components/components/print_link', { - margin_bottom: 8, - text: t("components.print_link.text"), - } %> - - <% @content_item.parts.each_with_index do |part, i| %> -
-

- <%= part['title'] %> -

- - <%= render 'shared/travel_advice_first_part', content_item: @content_item if i == 0 %> - - <%= render 'govuk_publishing_components/components/govspeak', - content: part['body'].html_safe, - direction: page_text_direction %> -
- <% end %> - - <%= render 'govuk_publishing_components/components/print_link', { - text: t("components.print_link.text") - } %> -
-
diff --git a/app/views/content_items/travel_advice.html.erb b/app/views/content_items/travel_advice.html.erb deleted file mode 100644 index 2fe5ee7de..000000000 --- a/app/views/content_items/travel_advice.html.erb +++ /dev/null @@ -1,78 +0,0 @@ -<% add_view_stylesheet("travel-advice") %> -<% content_for :simple_header, true %> - -<% content_for :extra_head_content do %> - <%= auto_discovery_link_tag :atom, @content_item.feed_link, title: "Recent updates for #{@content_item.country_name}" %> - - <%= machine_readable_metadata( - schema: :article, - canonical_url: @content_item.canonical_url, - title: @content_item.page_title, - body: @content_item.body_for_metadata - ) %> -<% end %> - -
-
- <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %> - - <%= render "govuk_publishing_components/components/govspeak", { - } do %> - <% @content_item.alert_status.each do |text| %> - <%= render "govuk_publishing_components/components/warning_text", - text: text - %> - <% end %> - <% end %> - - -
-
- -
- <% unless @content_item.parts.empty? %> -
- <%= render 'govuk_publishing_components/components/heading', heading_level: 1, font_size: 'l', margin_bottom: 6, text: @content_item.current_part_title %> - - <% if @content_item.no_part_slug_provided? %> - <%= render 'shared/travel_advice_first_part', content_item: @content_item %> - <% end %> - - <%= render 'govuk_publishing_components/components/govspeak', { - direction: page_text_direction, - } do %> - <%= raw(@content_item.current_part_body) %> - <% end %> - - <%= render 'govuk_publishing_components/components/previous_and_next_navigation', @content_item.previous_and_next_navigation %> - -
- "><%= t("multi_page.print_entire_guide") %> -
- <% end %> -
- <%= render 'shared/sidebar_navigation' %> -
- -<%= render 'shared/footer_navigation' %> diff --git a/app/views/shared/_travel_advice_first_part.html.erb b/app/views/shared/_travel_advice_first_part.html.erb deleted file mode 100644 index 749aab3b7..000000000 --- a/app/views/shared/_travel_advice_first_part.html.erb +++ /dev/null @@ -1,11 +0,0 @@ -<%= render 'govuk_publishing_components/components/metadata', content_item.metadata %> -<% if content_item.map %> -
- " alt="<%= content_item.map["alt_text"] %>" class="map-image"> - <% if content_item.map_download_url %> -
- <%= render 'components/download_link', href: content_item.map_download_url, link_text: "Download a more detailed map (PDF)" %> -
- <% end %> -
-<% end %> diff --git a/config/govuk_examples.yml b/config/govuk_examples.yml index f19693a31..b17740724 100644 --- a/config/govuk_examples.yml +++ b/config/govuk_examples.yml @@ -163,23 +163,6 @@ topical_event_about_page_7: '/government/topical-events/supporting-syria-confere topical_event_about_page_8: '/government/topical-events/farming/about' topical_event_about_page_9: '/government/topical-events/girl-summit-2014/about' -# Most visited travel advice (2 March 2017) -travel_advice_1: '/foreign-travel-advice/usa/entry-requirements' -travel_advice_2: '/foreign-travel-advice/turkey' -travel_advice_3: '/foreign-travel-advice/usa' -travel_advice_4: '/foreign-travel-advice/egypt' -travel_advice_5: '/foreign-travel-advice/morocco' -travel_advice_6: '/foreign-travel-advice/spain' -travel_advice_7: '/foreign-travel-advice/india/entry-requirements' -travel_advice_8: '/foreign-travel-advice/australia/entry-requirements' -travel_advice_9: '/foreign-travel-advice/thailand' -travel_advice_10: '/foreign-travel-advice/france' - -# Travel advice atom feeds -travel_advice_atom_1: '/foreign-travel-advice/turkey.atom' -travel_advice_atom_2: '/foreign-travel-advice/usa.atom' -travel_advice_atom_3: '/foreign-travel-advice/egypt.atom' - working_group_long: '/government/groups/benefits-credits-consultation-group-bccg' working_group_short: '/government/groups/aviation-statistics-team' working_group_with_policies: '/government/groups/better-regulation-executive' diff --git a/config/initializers/dartsass.rb b/config/initializers/dartsass.rb index 7611ffd9b..76921abb4 100644 --- a/config/initializers/dartsass.rb +++ b/config/initializers/dartsass.rb @@ -3,7 +3,6 @@ "components/_back-to-top.scss" => "components/_back-to-top.css", "components/_banner.scss" => "components/_banner.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", "views/_guide.scss" => "views/_guide.css", @@ -12,7 +11,6 @@ "views/_published-dates-button-group.scss" => "views/_published-dates-button-group.css", "views/_service_manual_guide.scss" => "views/_service_manual_guide.css", "views/_specialist-document.scss" => "views/_specialist-document.css", - "views/_travel-advice.scss" => "views/_travel-advice.css", }.freeze all_stylesheets = APP_STYLESHEETS.merge(GovukPublishingComponents::Config.all_stylesheets) diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 6f9d7eaeb..d7957d0be 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -841,17 +841,6 @@ ar: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: ينصح FCO بعدم السفر إلى بعض أجزاء البلد إلا للضرورة. - avoid_all_but_essential_travel_to_whole_country_html: ينصح FCO بعد السفر إلى جميع أنحاء البلد إلا للضرورة. - avoid_all_travel_to_parts_html: ينصح FCO بعدم السفر إلى بعض أجزاء البلد. - avoid_all_travel_to_whole_country_html: ينصح FCO بعدم السفر إلى جميع أنحاء البلد. - context: نصائح السفر إلى الخارج - pages: - still_current_at: لا يزال ساريًا في - summary: ملخص - updated: تاريخ التحديث working_group: contact_details: تفاصيل جهة الاتصال policies: سياسات diff --git a/config/locales/az.yml b/config/locales/az.yml index 04c47b7ba..b4a80c958 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -529,17 +529,6 @@ az: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO ölkənin bölgələrinə zəruri səyahət istisna olmaqla heç birini məsləhət görmürlər. - avoid_all_but_essential_travel_to_whole_country_html: FCO ölkəyə ümumi zəruri səyahət istisna olmaqla heç birini məsləhət görmürlər. - avoid_all_travel_to_parts_html: FCO ölkənin bölgələrinə bütün səyahətləri məsləhət görmürlər. - avoid_all_travel_to_whole_country_html: FCO ölkəyə ümumilikdə bütün səyahətləri məsləhət görmürlər. - context: Xaricə səyahət üzrə məsləhət - pages: - still_current_at: Hələ də qüvvədədir - summary: İcmal - updated: Yenilənib working_group: contact_details: Əlaqə məlumatları policies: Siyasətlər diff --git a/config/locales/be.yml b/config/locales/be.yml index 0c3966b06..e59154d84 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -685,17 +685,6 @@ be: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Міністэрства замежных спраў і па справах Садружнасці FCO раяць устрымацца ад усіх падарожжаў, апроч самых патрэбных, у некаторыя раёны краіны. - avoid_all_but_essential_travel_to_whole_country_html: Міністэрства замежных спраў і па справах Садружнасці FCO раяць устрымацца ад усіх падарожжаў, апроч самых патрэбных, у некаторыя раёны краіны. - avoid_all_travel_to_parts_html: Міністэрства замежных спраў і па справах Садружнасці FCO раяць устрымацца ад усіх падарожжаў, апроч самых патрэбных, у некаторыя раёны краіны. - avoid_all_travel_to_whole_country_html: Міністэрства замежных спраў і па справах Садружнасці FCO раяць устрымацца ад усіх падарожжаў, апроч самых патрэбных, у некаторыя раёны краіны. - context: Рады па замежных падарожжах - pages: - still_current_at: Усё яшчэ актуальна - summary: Рэзюмэ - updated: Адноўлена working_group: contact_details: Кантактныя дадзеныя policies: Напрамкі дзейнасці diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 253aa5c45..8bbe884b4 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -529,17 +529,6 @@ bg: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO препоръчва да не се пътува до някои части на страната, освен ако това не е необходимо. - avoid_all_but_essential_travel_to_whole_country_html: FCO препоръчва да не се пътува из цялата страна, освен ако не е необходимо. - avoid_all_travel_to_parts_html: FCO препоръчва да не се пътува до някои части на страната. - avoid_all_travel_to_whole_country_html: FCO препоръчва да не се пътува из цялата страна. - context: Съвети при пътуване в чужбина - pages: - still_current_at: Все още актуален в - summary: Обобщение - updated: Актуализиран working_group: contact_details: Данни за контакти policies: Политики diff --git a/config/locales/bn.yml b/config/locales/bn.yml index b39be16dd..e7904523f 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -529,17 +529,6 @@ bn: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO দেশের কিছু অংশে শুধু প্রয়োজনীয় ভ্রমণ ছাড়া সকল ধরনের ভ্রমণের বিরুদ্ধে পরামর্শ দিয়েছে। - avoid_all_but_essential_travel_to_whole_country_html: FCO সমগ্র দেশে শুধু প্রয়োজনীয় ভ্রমণ ছাড়া সকল ধরনের ভ্রমণের বিরুদ্ধে পরামর্শ দিয়েছে। - avoid_all_travel_to_parts_html: FCO দেশের কিছু অংশে সকল ধরনের ভ্রমণের বিরুদ্ধে পরামর্শ দিয়েছে। - avoid_all_travel_to_whole_country_html: FCO সমগ্র দেশে সকল ধরনের ভ্রমণের বিরুদ্ধে পরামর্শ দিয়েছে। - context: বিদেশ ভ্রমণ সম্পর্কিত পরামর্শ - pages: - still_current_at: এখানে এখনও চলমান - summary: সারসংক্ষেপ - updated: হালনাগাদ করা হয়েছে working_group: contact_details: যোগাযোগের বিস্তারিত তথ্য policies: নীতিমালা diff --git a/config/locales/cs.yml b/config/locales/cs.yml index cb371338f..0b2c0ac62 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -607,17 +607,6 @@ cs: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Úřad pro zahraniční věci, společenství národů a rozvoj nedoporučuje cestovat do některých částí země, s výjimkou nezbytných. - avoid_all_but_essential_travel_to_whole_country_html: Úřad pro zahraniční věci, společenství národů a rozvoj nedoporučuje cestovat do celé země, kromě nezbytných. - avoid_all_travel_to_parts_html: Úřad pro zahraniční věci, společenství národů a rozvoj nedoporučuje do některých částí země cestovat. - avoid_all_travel_to_whole_country_html: Úřad pro zahraniční věci, společenství národů a rozvoj nedoporučuje cestovat do celé země. - context: Rady pro cestování do zahraničí - pages: - still_current_at: Stále aktuální na - summary: Shrnutí - updated: Aktualizováno working_group: contact_details: Kontaktní údaje policies: Politik diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 8164e1ddb..48e39d2ea 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -841,17 +841,6 @@ cy: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Mae'r Swyddfa Dramor, y Gymanwlad a Datblygu yn cynghori yn erbyn pob taith, oni fo'n hanfodol, i rannau o'r wlad. - avoid_all_but_essential_travel_to_whole_country_html: Mae'r Swyddfa Dramor, y Gymanwlad a Datblygu yn cynghori yn erbyn pob taith, oni fo'n hanfodol, i'r wlad gyfan. - avoid_all_travel_to_parts_html: Mae'r Swyddfa Dramor, y Gymanwlad a Datblygu yn cynghori yn erbyn pob taith i rannau o'r wlad. - avoid_all_travel_to_whole_country_html: Mae'r Swyddfa Dramor, y Gymanwlad a Datblygu yn cynghori yn erbyn pob taith i'r wlad gyfan. - context: Cyngor ar deithio dramor - pages: - still_current_at: Yn gyfredol o hyd ar - summary: Crynodeb - updated: Diweddarwyd working_group: contact_details: Manylion cyswllt policies: Polisïau diff --git a/config/locales/da.yml b/config/locales/da.yml index 2e9476fd0..f50af379d 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -541,17 +541,6 @@ da: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Den FCO fraråde alle, men væsentlige rejser til dele af landet. - avoid_all_but_essential_travel_to_whole_country_html: Den FCO fraråde alle, men væsentlige rejser til hele landet. - avoid_all_travel_to_parts_html: Den FCO fraråde alle, men væsentlige rejser til dele af landet. - avoid_all_travel_to_whole_country_html: Den FCO fraråde alle, men væsentlige rejser til dele af landet. - context: Udenlandsk rejserådgivning - pages: - still_current_at: Stadig aktuel på - summary: Resumé - updated: Opdateret working_group: contact_details: Kontaktoplysninger policies: Politikker diff --git a/config/locales/de.yml b/config/locales/de.yml index 908652f22..5232ac74b 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -529,17 +529,6 @@ de: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Das FCO rät von allen Reisen in Teile des Landes ab, die nicht unbedingt erforderlich sind. - avoid_all_but_essential_travel_to_whole_country_html: Das FCO rät von allen Reisen in das ganze Land ab, die nicht unbedingt notwendig sind. - avoid_all_travel_to_parts_html: Das FCO rät von allen Reisen in Teile des Landes ab. - avoid_all_travel_to_whole_country_html: Das FCO rät von allen Reisen in das ganze Land ab. - context: Hinweise für Auslandsreisen - pages: - still_current_at: Aktuell noch bei - summary: Zusammenfassung - updated: Aktualisiert working_group: contact_details: Kontaktdaten policies: Richtlinien diff --git a/config/locales/dr.yml b/config/locales/dr.yml index 8322f268d..c395e0a55 100644 --- a/config/locales/dr.yml +++ b/config/locales/dr.yml @@ -532,17 +532,6 @@ dr: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: اینFCO در مورد هر گونه سفر ضروری به تمام نقاط کشور توصیه مینماید. - avoid_all_but_essential_travel_to_whole_country_html: اینFCO در مورد هرگونه سفر ضروری به تمام کشور توصیه مینماید. - avoid_all_travel_to_parts_html: اینFCO درمورد سفر به تمام نقاط کشور توصیه مینماید. - avoid_all_travel_to_whole_country_html: اینFCOدر مورد سفر به تمام کشور توصیه مینماید. - context: مشاوره سفر هایی خارجی - pages: - still_current_at: هنور هم در - summary: خلاصه - updated: آپدیت شده working_group: contact_details: جزیٔیات تماس policies: سیاست ها diff --git a/config/locales/el.yml b/config/locales/el.yml index fcb0fc898..41f00f6d7 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -529,17 +529,6 @@ el: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Το FCO σας συμβουλεύει να αποφύγετε τα ταξίδια, πλην των απαραίτητων, σε μέρη της χώρας. - avoid_all_but_essential_travel_to_whole_country_html: Το FCO σας συμβουλεύει να αποφύγετε τα ταξίδια, πλην των απαραίτητων, σε ολόκληρη την χώρα. - avoid_all_travel_to_parts_html: Το FCO σας συμβουλεύει να αποφύγετε τα ταξίδια σε μέρη της χώρας. - avoid_all_travel_to_whole_country_html: Το FCO σας συμβουλεύει να αποφύγετε τα ταξίδια σε ολόκληρη την χώρα. - context: Συμβουλές για ταξίδια στο εξωτερικό - pages: - still_current_at: Ακόμα επίκαιρο στο - summary: Περίληψη - updated: Ενημερωμένο working_group: contact_details: Στοιχεία επικοινωνίας policies: Πολιτικές diff --git a/config/locales/en.yml b/config/locales/en.yml index c36938c3c..143a8e87e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -531,17 +531,6 @@ en: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCDO advises against all but essential travel to parts of %{country}. - avoid_all_but_essential_travel_to_whole_country_html: FCDO advises against all but essential travel to %{country}. - avoid_all_travel_to_parts_html: FCDO advises against all travel to parts of %{country}. - avoid_all_travel_to_whole_country_html: FCDO advises against all travel to %{country}. - context: Foreign travel advice - pages: Travel advice pages - still_current_at: Still current at - summary: Summary - updated: Updated working_group: contact_details: Contact details policies: Policies diff --git a/config/locales/es-419.yml b/config/locales/es-419.yml index c719049bf..db460ae65 100644 --- a/config/locales/es-419.yml +++ b/config/locales/es-419.yml @@ -529,17 +529,6 @@ es-419: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: El FCO desaconseja todos los viajes que no sean imprescindibles a algunas zonas del país. - avoid_all_but_essential_travel_to_whole_country_html: El FCO desaconseja todo viaje que no sea imprescindible a todo el país. - avoid_all_travel_to_parts_html: El FCO desaconseja todo viaje a partes del país. - avoid_all_travel_to_whole_country_html: El FCO desaconseja todo viaje a todo el país. - context: Consejos para viajar al extranjero - pages: - still_current_at: Todavía vigente en - summary: Resumen - updated: Actualizado working_group: contact_details: Datos de contacto policies: Normativas diff --git a/config/locales/es.yml b/config/locales/es.yml index 443f6be24..2e8683753 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -529,17 +529,6 @@ es: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: La FCO aconseja que no se viaje a partes del país, salvo viajes esenciales. - avoid_all_but_essential_travel_to_whole_country_html: La FCO aconseja que no se vuale a todo el país, salvo viajes esenciales. - avoid_all_travel_to_parts_html: La FCO aconseja que no se viaje a partes del país. - avoid_all_travel_to_whole_country_html: La FCO aconseja que no se viaje a todo el país. - context: Consejos de viajes al extranjero - pages: - still_current_at: Sigue siendo actual en - summary: Resumen - updated: Actualizado working_group: contact_details: Datos de contacto policies: Políticas diff --git a/config/locales/et.yml b/config/locales/et.yml index f47598c1e..d4da72072 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -529,17 +529,6 @@ et: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO soovitab mitte reisida riigi osadesse muidu kui hädavajadusel. - avoid_all_but_essential_travel_to_whole_country_html: FCO soovitab mitte reisida kogu riigis muidu kui hädavajadusel. - avoid_all_travel_to_parts_html: FCO soovitab mitte reisida riigi osades. - avoid_all_travel_to_whole_country_html: FCO soovitab mitte reisida kogu riigis. - context: Välisreiside nõuanded - pages: - still_current_at: Ikka praegune - summary: Kokkuvõte - updated: Uuendatud working_group: contact_details: Kontaktandmed policies: Eeskirjad diff --git a/config/locales/fa.yml b/config/locales/fa.yml index a7e524882..8654060b0 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -529,17 +529,6 @@ fa: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: وزارت امور خارجه بریتانیا (FCO) توصیه می‌کند از سفرهای غیر ضروری به بخش‌هایی از این کشور خودداری کنید. - avoid_all_but_essential_travel_to_whole_country_html: وزارت امور خارجه بریتانیا (FCO) توصیه می‌کند از سفرهای غیر ضروری به تمام نقاط این کشور خودداری کنید. - avoid_all_travel_to_parts_html: وزارت امور خارجه بریتانیا (FCO) توصیه می‌کند از سفر به بخش‌هایی از این کشور خودداری کنید. - avoid_all_travel_to_whole_country_html: وزارت امور خارجه بریتانیا (FCO) توصیه می‌کند از سفر به تمام نقاط این کشور خودداری کنید. - context: توصیه‌های مربوط به سفر خارجی - pages: - still_current_at: همچنان جاری است در - summary: خلاصه - updated: بروز شده working_group: contact_details: جزئیات اطلاعات تماس policies: سیاست ها diff --git a/config/locales/fi.yml b/config/locales/fi.yml index cae31268c..e2580ac0a 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -529,17 +529,6 @@ fi: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO kehottaa välttämään kaikkia muita kuin välttämättömiä matkoja osissa maata. - avoid_all_but_essential_travel_to_whole_country_html: FCO kehottaa välttämään kaikkia muita kuin välttämättömiä matkoja koko maahan. - avoid_all_travel_to_parts_html: FCO kehottaa välttämään kaikkia matkoja osissa maata. - avoid_all_travel_to_whole_country_html: FCO kehottaa välttämään kaikkia matkoja koko maahan. - context: Ulkomaan matkustusneuvonta - pages: - still_current_at: Vielä ajankohtainen klo - summary: Yhteenveto - updated: Päivitetty working_group: contact_details: Yhteystiedot policies: Käytännöt diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 3af2690bb..277be3c73 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -529,17 +529,6 @@ fr: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Le Bureau des affaires étrangères et du Commonwealth (FCO) déconseille tout voyage dans certaines parties du pays, à l'exception de ceux qui sont indispensables. - avoid_all_but_essential_travel_to_whole_country_html: Le Bureau des affaires étrangères et du Commonwealth (FCO) déconseille tout voyage dans l'ensemble du pays, à l'exception de ceux qui sont indispensables. - avoid_all_travel_to_parts_html: Le Bureau des affaires étrangères et du Commonwealth (FCO) déconseille tout voyage dans certaines parties du pays. - avoid_all_travel_to_whole_country_html: Le Bureau des affaires étrangères et du Commonwealth (FCO) déconseille tout voyage dans l'ensemble du pays. - context: Conseils concernant les voyages à l'étranger - pages: - still_current_at: Toujours d'actualité à - summary: Sommaire - updated: Mis à jour working_group: contact_details: Détails du contact policies: Politiques générales diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 68c47fe58..f8069be4f 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -685,17 +685,6 @@ gd: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Molann an FCO gach taisteal ach an taisteal is riachtanaí chuig áiteanna áirithe sa tír a sheachaint. - avoid_all_but_essential_travel_to_whole_country_html: Molann an FCO gach taisteal, seachas taisteal riachtanach, a sheachaint ar fud na tíre. - avoid_all_travel_to_parts_html: Molann an FCO gach taisteal chuig codanna den tír a sheachaint. - avoid_all_travel_to_whole_country_html: Molann an FCO duit gach taisteal ar fud na tíre a sheachaint. - context: Comhairle phraiticiúil do thaistealaithe eachtracha - pages: - still_current_at: Bailí i gcónaí ar - summary: Coimriú - updated: Athnuachan working_group: contact_details: Sonraí teagmhála policies: Polasaithe diff --git a/config/locales/gu.yml b/config/locales/gu.yml index 06282f40d..61374b9dc 100644 --- a/config/locales/gu.yml +++ b/config/locales/gu.yml @@ -529,17 +529,6 @@ gu: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: વિદેશી - કોમનવેલ્થ અને વિકાસ કચેરી જરૂરી મુસાફરી સિવાય દેશના કેટલાક ભાગોમાં પ્રવાસ ન કરવાની સલાહ આપે છે. - avoid_all_but_essential_travel_to_whole_country_html: વિદેશી - કોમનવેલ્થ અને વિકાસ કચેરી જરૂરી મુસાફરી સિવાય, સંપૂર્ણ દેશમાં પ્રવાસ ન કરવાની સલાહ આપે છે. - avoid_all_travel_to_parts_html: વિદેશી - કોમનવેલ્થ અને વિકાસ કચેરી દેશના કેટલાક ભાગોમાં કોઈ પણ પ્રકારનો પ્રવાસ ન કરવાની સલાહ આપે છે. - avoid_all_travel_to_whole_country_html: વિદેશી - કોમનવેલ્થ અને વિકાસ કચેરી સંપૂર્ણ દેશમાં કોઈ પણ પ્રકારનો પ્રવાસ ન કરવાની સલાહ આપે છે. - context: વિદેશ પ્રવાસ અંગે સલાહ - pages: - still_current_at: પર હજુ પણ ચાલુ - summary: સારાંશ - updated: અપડેટ કરેલ working_group: contact_details: સંપર્ક વિગતો policies: નીતિઓ diff --git a/config/locales/he.yml b/config/locales/he.yml index 5dc05af7b..0e1cd2696 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -529,17 +529,6 @@ he: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: ' FCO להמליץ על כל נסיעות מלבד חיוניות לחלקי הארץ.' - avoid_all_but_essential_travel_to_whole_country_html: ' FCOלהמנע מכל נסיעה חיונית לכל הארץ.' - avoid_all_travel_to_parts_html: ' FCO ממליץ לא לנסוע לאזורים שונים בארץ.' - avoid_all_travel_to_whole_country_html: ' FCO ממליץ לא לטייל בכל רחבי הארץ.' - context: ייעוץ לטיולי חוץ - pages: - still_current_at: עדיין עדכני ב - summary: סיכום - updated: מעודכן working_group: contact_details: פרטי קשר policies: מדיניות diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 7c65c22c0..ff9d2c6de 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -529,17 +529,6 @@ hi: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO देश के कुछ हिस्सों में अनिवार्य यात्रा को छोड़कर बाकी सबके विरुद्ध सलाह देता है। - avoid_all_but_essential_travel_to_whole_country_html: FCO देश के पूरे हिस्से में अनिवार्य यात्रा को छोड़कर बाकी सबके विरुद्ध सलाह देता है। - avoid_all_travel_to_parts_html: FCO देश के कुछ हिस्सों में सभी यात्राओं के विरुद्ध सलाह देता है। - avoid_all_travel_to_whole_country_html: FCO देश के पूरे हिस्से में सभी यात्राओं के विरुद्ध सलाह देता है। - context: विदेश यात्रा का सुझाव - pages: - still_current_at: अभी भी चालू है - summary: सारांश - updated: अपडेट किया गया working_group: contact_details: संपर्क के विवरण policies: नीतियां diff --git a/config/locales/hr.yml b/config/locales/hr.yml index a1d6f6694..0d48e0009 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -607,17 +607,6 @@ hr: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO savjetuje protiv svih, osim bitnih putovanja u dijelova zemlje. - avoid_all_but_essential_travel_to_whole_country_html: FCO savjetuje protiv svih, osim bitnih putovanja u cijeloj zemlji. - avoid_all_travel_to_parts_html: FCO savjetuje protiv svih putovanja u dijelove zemlje. - avoid_all_travel_to_whole_country_html: FCO savjetuje protiv svih putovanja u cijeloj zemlji. - context: Savjeti za putovanja u inozemstvo - pages: - still_current_at: Još uvijek aktualno u - summary: Sažetak - updated: Ažurirano working_group: contact_details: Kontakt podaci policies: Pravila diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 8547ccd41..57fbcebf1 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -529,17 +529,6 @@ hu: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: A FCO azt javasolja, hogy az ország bizonyos részeire csak feltétlenül szükséges esetben utazzanak. - avoid_all_but_essential_travel_to_whole_country_html: A FCO azt javasolja, hogy az országba csak feltétlenül szükséges esetben utazzanak. - avoid_all_travel_to_parts_html: A FCO azt javasolja, hogy az ország bizonyos részeire semmilyen körülmények között ne utazzanak. - avoid_all_travel_to_whole_country_html: A FCO azt javasolja, hogy az országba semmilyen körülmények között ne utazzanak. - context: Külföldi utazásra vonatkozó tanácsok - pages: - still_current_at: 'Még érvényben itt:' - summary: Összefoglalás - updated: Frissítve working_group: contact_details: Elérhetőségek policies: Irányelvek diff --git a/config/locales/hy.yml b/config/locales/hy.yml index 779df8cb2..183793791 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -529,17 +529,6 @@ hy: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO-ը խորհուրդ է տալիս չմեկնել տվյալ երկրի ամբողջ տարածք, բացառությամբ էական նշանակություն ունեցող հատվածների։ - avoid_all_but_essential_travel_to_whole_country_html: FCO-ը խորհուրդ է տալիս չմեկնել տվյալ երկիր, բացառությամբ էական նշանակություն ունեցող դեպքերի։ - avoid_all_travel_to_parts_html: FCO-ը խորհուրդ է տալիս չմեկնել տվյալ երկրի որոշ հատվածներ։ - avoid_all_travel_to_whole_country_html: FCO-ը խորհուրդ է տալիս չմեկնել տվյալ երկիր։ - context: Օտար երկիր ճամփորդելու վերաբերյալ օգտակար խորհուրդներ - pages: - still_current_at: Դեռևս ընթացիկ - summary: Ամփոփ - updated: Թարմացված working_group: contact_details: Կոնտակտային տվյալներ policies: Քաղաքականություններ diff --git a/config/locales/id.yml b/config/locales/id.yml index b38035856..762c35aee 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -451,17 +451,6 @@ id: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: The FCO melarang semua perjalanan yang tidak esensial ke bagian-bagian dari negara itu. - avoid_all_but_essential_travel_to_whole_country_html: The FCO melarang semua perjalanan yang tidak esensial ke seluruh negara itu. - avoid_all_travel_to_parts_html: The FCO melarang semua perjalanan ke bagian-bagian dari negara itu. - avoid_all_travel_to_whole_country_html: The FCO melarang semua perjalanan ke seluruh bagian dari negara itu. - context: Nasihat perjalanan luar negeri - pages: - still_current_at: Masih berlaku di - summary: Rangkuman - updated: Diperbarui working_group: contact_details: Detail kontak policies: Kebijakan diff --git a/config/locales/is.yml b/config/locales/is.yml index 431f592e5..97b2183ef 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -529,17 +529,6 @@ is: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO ráðleggur gegn öllum ferðalögum til hluta landsins nema þeim allra nauðsynlegustu. - avoid_all_but_essential_travel_to_whole_country_html: FCO ráðleggur gegn öllum ferðalögum til alls landsins nema þeim allra nauðsynlegustu. - avoid_all_travel_to_parts_html: FCO ráðleggur gegn öllum ferðalögum til hluta landsins. - avoid_all_travel_to_whole_country_html: FCO ráðleggur gegn öllum ferðalögum til alls landsins. - context: Ráðleggingar um ferðalög erlendis - pages: - still_current_at: Enn uppfært þann - summary: Samantekt - updated: Uppfært working_group: contact_details: Upplýsingar til að hafa samband policies: Stefnur diff --git a/config/locales/it.yml b/config/locales/it.yml index 931dd0349..33535722e 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -529,17 +529,6 @@ it: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: L’FCO sconsiglia tutti i viaggi tranne quelli essenziali in alcune parti del paese. - avoid_all_but_essential_travel_to_whole_country_html: L’FCO sconsiglia tutti i viaggi tranne quelli essenziali in tutto il paese. - avoid_all_travel_to_parts_html: L’FCO sconsiglia tutti i viaggi in alcune parti del paese. - avoid_all_travel_to_whole_country_html: L’FCO sconsiglia tutti i viaggi in tutto il paese. - context: Consigli per viaggi all'estero - pages: - still_current_at: Ancora in corso il - summary: Riepilogo - updated: Aggiornato working_group: contact_details: Dettagli di contatto policies: Informative diff --git a/config/locales/ja.yml b/config/locales/ja.yml index cfc98a18b..571547eca 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -451,17 +451,6 @@ ja: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO は、国内一部地域への必要不可欠ものを除くすべての移動を控えるよう勧告しています。 - avoid_all_but_essential_travel_to_whole_country_html: FCO は、国内での必要不可欠ものを除くすべての移動を控えるよう勧告しています。 - avoid_all_travel_to_parts_html: FCO は、国内一部地域へのすべての移動を控えるよう勧告しています。 - avoid_all_travel_to_whole_country_html: FCO は、国内すべての移動を控えるよう勧告しています。 - context: 海外旅行のアドバイス - pages: - still_current_at: 現状： - summary: 概要 - updated: 更新済み working_group: contact_details: 連絡先の詳細 policies: 方針 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 7956c5e03..3ceeba512 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -529,17 +529,6 @@ ka: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: The FCO რჩევა ყველას წინააღმდეგ, გარდა ესენციური მოგზაურობებისა ქვეყნის ზოგიერთ ნაწილებში. - avoid_all_but_essential_travel_to_whole_country_html: The FCO რჩევა ყველას წინააღმდეგ, გარდა ესენციური მოგზაურობებისა მთელს ქვეყანაში. - avoid_all_travel_to_parts_html: The FCO რჩევა ყველა მოგზაურობების წინააღმდეგ ქვეყნის ზოგიერთ ნაწილებში. - avoid_all_travel_to_whole_country_html: The FCO რჩევა ყველა მოგზაურობების წინააღმდეგ მთელ ქვეყანაში. - context: უცხოეთში მოგზაურობის რჩევა - pages: - still_current_at: ჯერ კიდევ აქტუალურია - summary: შეჯამება - updated: განახლებული working_group: contact_details: საკონტაქტო დეტალები policies: კანონები diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 238f146ac..0e4e94809 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -529,17 +529,6 @@ kk: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO маңыздысынан басқа елдің барлық аймақтарына барудан бас тартуға кеңес береді. - avoid_all_but_essential_travel_to_whole_country_html: FCO қажеттісінен басқа бүкіл елге барудан бас тартуға кеңес береді. - avoid_all_travel_to_parts_html: FCO елдің барлық аймақтарына барудан бас тартуға кеңес береді. - avoid_all_travel_to_whole_country_html: FCO бүкіл елге баруға тыйым салады. - context: Шетелге саяхат туралы кеңес - pages: - still_current_at: Әлі де ағымдағы - summary: Қысқаша мазмұны - updated: Жаңартылды working_group: contact_details: Байланысу мәліметтері policies: Саясаттар diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 4482ea5b0..39672df1d 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -451,17 +451,6 @@ ko: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO 는 해당 국가의 각지를 여행하지 말라고 권고합니다. - avoid_all_but_essential_travel_to_whole_country_html: FCO 는 해당 국가의 전역을 여행하지 말라고 권고합니다. - avoid_all_travel_to_parts_html: FCO 는 해당 국가 각지로의 모든 여행을 삼가라고 권고합니다. - avoid_all_travel_to_whole_country_html: FCO 는 해당 국가 전역으로의 모든 여행을 삼가라고 권고합니다. - context: 외국 여행 권고 - pages: - still_current_at: 최신 상태 - summary: 요약 - updated: 업데이트 working_group: contact_details: 콘택트 세부 정보 policies: 정책 diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 42a75c6df..f27fc1bfc 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -607,17 +607,6 @@ lt: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO pataria keliauti į skirtingas šalies vietas tik būtinais tikslais. - avoid_all_but_essential_travel_to_whole_country_html: FCO pataria keliauti po šalį tik būtinais tikslais. - avoid_all_travel_to_parts_html: FCO nepataria keliauti į skirtingas šalies veitas. - avoid_all_travel_to_whole_country_html: FCO nepataria keliauti po šalį. - context: Patarimai dėl keliavimo po užsienį - pages: - still_current_at: Vis dar - summary: Santrauka - updated: Atnaujinta working_group: contact_details: Kontaktiniai duomenys policies: Strategijos diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 4c6bb8dbe..aa89efdb4 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -529,17 +529,6 @@ lv: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO iesaka izvairīties no jebkādas ceļošanas, izņemot neatliekamus braucienus uz noteiktām valsts daļām. - avoid_all_but_essential_travel_to_whole_country_html: FCO iesaka izvairīties no jebkādas ceļošanas, izņemot neatliekamus braucienus pa valsti. - avoid_all_travel_to_parts_html: FCO iesaka izvairīties no jebkādas ceļošanas uz noteiktām valsts daļām. - avoid_all_travel_to_whole_country_html: FCO iesaka izvairīties no jebkādas ceļošanas pa valsti. - context: Ieteikums ārzemju ceļojumiem - pages: - still_current_at: Joprojām aktuāli - summary: Kopsavilkums - updated: Atjaunināts working_group: contact_details: Kontaktinformācija policies: Politikas diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 14580549e..fd20da470 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -451,17 +451,6 @@ ms: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: The FCO menasihati supaya tidak membuat perjalanan kecuali yang perlu sahaja ke bahagian-bahagian tertentu negara ini. - avoid_all_but_essential_travel_to_whole_country_html: The FCO menasihati supaya tidak membuat perjalanan kecuali yang perlu sahaja ke seluruh negara. - avoid_all_travel_to_parts_html: The FCO menasihati supaya tidak membuat sebarang perjalanan ke bahagian-bahagian tertentu negara ini. - avoid_all_travel_to_whole_country_html: The FCO menasihati supaya tidak membuat sebarang perjalanan ke seluruh negara.. - context: Nasihat perjalanan ke negara luar - pages: - still_current_at: Masih semasa di - summary: Ringkasan - updated: Dikemas kini working_group: contact_details: Butiran hubungan policies: Dasar diff --git a/config/locales/mt.yml b/config/locales/mt.yml index bb3f551be..ac764cb08 100644 --- a/config/locales/mt.yml +++ b/config/locales/mt.yml @@ -685,17 +685,6 @@ mt: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Il- FCO jirrakkomanda li ma jsiru l-ebda vjaġġi ħlief dawk essenzjali. - avoid_all_but_essential_travel_to_whole_country_html: Il- FCO jirrakkomanda li ma jsiru l-ebda vjaġġi ħlief dawk essenzjali fil-pajjiż kollu. - avoid_all_travel_to_parts_html: Il- FCO jirrakkomanda li ma jsiru l-ebda vjaġġi lejn xi partijiet tal-pajjiż. - avoid_all_travel_to_whole_country_html: Il- FCO jirrakkomanda li ma jsiru l-ebda vjaġġi fil-pajjiż kollu. - context: Rakkomandazzjonijiet dwar ivvjaġġar barra mill-pajjiż - pages: - still_current_at: Għadu jeżisti fuq - summary: Sommarju - updated: Aġġornat working_group: contact_details: Dettalji tal-kuntatt policies: Politiki diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 7e1b83599..93e8493f4 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -529,17 +529,6 @@ ne: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: विदेश, राष्ट्रमंडल र विकास कार्यालय ले जरूरी यात्रा बाहेक देशको केहि भागमा सबै यात्रा बिरूद्ध सल्लाह दिएको छ। - avoid_all_but_essential_travel_to_whole_country_html: विदेश, राष्ट्रमंडल र विकास कार्यालय ले जरूरी यात्रा बाहेक पुरै देशमा सबै यात्रा बिरूद्ध सल्लाह दिएको छ। - avoid_all_travel_to_parts_html: विदेश, राष्ट्रमंडल र विकास कार्यालय ले देशको केहि भागमा सबै यात्रा बिरूद्ध सल्लाह दिएको छ। - avoid_all_travel_to_whole_country_html: विदेश, राष्ट्रमंडल र विकास कार्यालय ले पुरै देशमा सबै यात्रा बिरूद्ध सल्लाह दिएको छ। - context: विदेश यात्रा सल्लाह - pages: - still_current_at: अहिले सम्म वर्तमानमा - summary: सारांश - updated: अद्यावधिक गरियो working_group: contact_details: सम्पर्क विवरण policies: नीतिहरु diff --git a/config/locales/nl.yml b/config/locales/nl.yml index ab75cb07c..a1557abef 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -529,17 +529,6 @@ nl: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Het FCO raadt alle, behalve essentiële, reizen naar delen van het land af. - avoid_all_but_essential_travel_to_whole_country_html: Het FCO raadt alle, behalve essentiële, reizen naar het hele land af. - avoid_all_travel_to_parts_html: Het FCO raadt alle reizen naar delen van het land af. - avoid_all_travel_to_whole_country_html: Het FCO raadt alle reizen naar het hele land af. - context: Buitenlands reisadvies - pages: - still_current_at: Nog steeds actueel op - summary: Samenvatting - updated: Bijgewerkt op working_group: contact_details: Contact gegevens policies: Beleid diff --git a/config/locales/no.yml b/config/locales/no.yml index 512ced8ed..497cfd84d 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -529,17 +529,6 @@ time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO fraråder alle reiser, unntatt viktige reiser, til deler av landet. - avoid_all_but_essential_travel_to_whole_country_html: FCO fraråder alle reiser, unntatt viktige reiser, til deler av landet. - avoid_all_travel_to_parts_html: FCO fraråder alle reiser til deler av landet. - avoid_all_travel_to_whole_country_html: FCO fraråder alle reiser til hele landet. - context: Råd om utenlandsreiser - pages: - still_current_at: Fortsatt aktuell - summary: Sammendrag - updated: Oppdatert working_group: contact_details: Kontaktinformasjon policies: Retningslinjer diff --git a/config/locales/pa-pk.yml b/config/locales/pa-pk.yml index e24e5dd9b..736a3094e 100644 --- a/config/locales/pa-pk.yml +++ b/config/locales/pa-pk.yml @@ -529,17 +529,6 @@ pa-pk: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: ایہFCO مُلک دے سارے علاقیاں وچ ضروری سفر کرن لئی کیتی گئی نصحیت۔ - avoid_all_but_essential_travel_to_whole_country_html: ایہFCO سارے مُلک دے وچ ضروری سفر کرن لئی کیتی گئی نصحیت۔ - avoid_all_travel_to_parts_html: ایہFCO مُلک دے ساریاں علاقیاں وچ سفر کرن لئی نصحیت۔ - avoid_all_travel_to_whole_country_html: ایہFCO مُلک دےسارےعلاقے وچ ہر طراں دا سفر کرن لئی کیتی گئی نصحیت۔ - context: غیر مُلکی سفر لئی نصحیت - pages: - still_current_at: ہون ایس ویلے وی اوتھے ای اے - summary: خلاصہ - updated: تازہ ترین حال working_group: contact_details: رابطہ تی تفصیلات policies: حکمت عملی دا کاغذ diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 4fefbf91e..2c6c41cb3 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -529,17 +529,6 @@ pa: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO ਦੇਸ਼ ਦੇ ਕੁਝ ਹਿੱਸਿਆਂ ਦੀ ਜ਼ਰੂਰੀ ਯਾਤਰਾ ਨੂੰ ਛੱਡ ਕੇ ਬਾਕੀ ਦੇ ਵਿਰੁੱਧ ਸਲਾਹ ਦਿੰਦਾ ਹੈ। - avoid_all_but_essential_travel_to_whole_country_html: FCO ਸਾਰੇ ਦੇਸ਼ ਨੂੰ ਜ਼ਰੂਰੀ ਯਾਤਰਾ ਛੱਡ ਕੇ ਯਾਤਰਾ ਵਿਰੁੱਧ ਸਲਾਹ ਦਿੰਦਾ ਹੈ। - avoid_all_travel_to_parts_html: FCO ਦੇਸ਼ ਦੇ ਹਿੱਸਿਆਂ ਦੀ ਹਰ ਯਾਤਰਾ ਦੇ ਵਿਰੁੱਧ ਸਲਾਹ ਦਿੰਦਾ ਹੈ। - avoid_all_travel_to_whole_country_html: FCO ਸਾਰੇ ਦੇਸ਼ ਦੀ ਸਾਰੀ ਯਾਤਰਾ ਦੇ ਵਿਰੁੱਧ ਸਲਾਹ ਦਿੰਦਾ ਹੈ। - context: ਵਿਦੇਸ਼ੀ ਯਾਤਰਾ ਸਲਾਹ - pages: - still_current_at: "'ਤੇ ਅਜੇ ਵੀ ਮੌਜੂਦਾ" - summary: ਸੰਖੇਪ - updated: ਅੱਪਡੇਟ ਕੀਤਾ working_group: contact_details: ਸੰਪਰਕ ਵੇਰਵੇ policies: ਨੀਤੀਆਂ diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 7bb2da233..76e388cd1 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -685,17 +685,6 @@ pl: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO odradza wszelkie podróże do niektórych części kraju, z wyjątkiem tych niezbędnych. - avoid_all_but_essential_travel_to_whole_country_html: FCO odradza wszelkie podróże do kraju, z wyjątkiem tych niezbędnych. - avoid_all_travel_to_parts_html: FCO odradza wszelkie podróże do niektórych części kraju. - avoid_all_travel_to_whole_country_html: FCO odradza wszelkie podróże do kraju. - context: Porady dotyczące podróży zagranicznych - pages: - still_current_at: Aktualne na dzień - summary: Podsumowanie - updated: Zaktualizowano working_group: contact_details: Dane kontaktowe policies: Polityka diff --git a/config/locales/ps.yml b/config/locales/ps.yml index cce3f28e5..244d3c7dc 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -529,17 +529,6 @@ ps: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: The FCO د هیواد برخو ته د لازمي سفر پرته ټولو ته مشوره ورکوي. - avoid_all_but_essential_travel_to_whole_country_html: The FCO ټول هیواد ته د لازمي سفر پرته مشوره ورکوي. - avoid_all_travel_to_parts_html: The FCO د هیواد برخو ته د ټولو سفرونو پروړاندې مشوره ورکوي. - avoid_all_travel_to_whole_country_html: The FCO ټول هیواد ته د ټولو سفرونو پروړاندې مشوره ورکوي. - context: د بهرني سفر مشوره - pages: - still_current_at: په اوسني وخت کې - summary: لنډيز - updated: تازه شوی working_group: contact_details: د اړیکو نیولو معلومات policies: پالیسۍ diff --git a/config/locales/pt.yml b/config/locales/pt.yml index a7f02412b..88d167ece 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -529,17 +529,6 @@ pt: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: O FCO desaconselha todas as viagens, exceto as essenciais, a algumas zonas do país. - avoid_all_but_essential_travel_to_whole_country_html: O FCO desaconselha todas as viagens, exceto as essenciais, a todo o país. - avoid_all_travel_to_parts_html: O FCO desaconselha todas as viagens a algumas zonas do país. - avoid_all_travel_to_whole_country_html: O FCO desaconselha todas as viagens a todo o país. - context: Aconselhamento sobre viagens ao estrangeiro - pages: - still_current_at: Continua atual às - summary: Resumo - updated: Atualizado em working_group: contact_details: Informações de contacto policies: Políticas diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 1a544456e..35efc0325 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -607,17 +607,6 @@ ro: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO nu recomandă călătoriile neesențiale în anumite părți ale țării. - avoid_all_but_essential_travel_to_whole_country_html: FCO nu recomandă călătoriile neesențiale în întreaga țară. - avoid_all_travel_to_parts_html: FCO nu recomandă călătoriile în anumite părți ale țării. - avoid_all_travel_to_whole_country_html: FCO nu recomandă călătoriile în întreaga țară. - context: Sfaturi pentru călătoriile în străinătate - pages: - still_current_at: În acest moment la - summary: Rezumat - updated: Actualizat working_group: contact_details: Detalii de contact policies: Politici diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 03b5dd00d..c13f5e503 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -685,17 +685,6 @@ ru: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: The FCO Все поездки не реккомендуются, за исключением необходимых в части страны. - avoid_all_but_essential_travel_to_whole_country_html: The FCO Все поездки не реккомендуются, за исключением необходимых по всей стране. - avoid_all_travel_to_parts_html: The FCO Все поездки не реккомендуются, за исключением необходимых в части страны. - avoid_all_travel_to_whole_country_html: The FCO Все поездки не реккомендуются, за исключением необходимых по всей стране. - context: Консультации по зарубежным поездкам - pages: - still_current_at: Все еще на - summary: Резюме - updated: Обновлено working_group: contact_details: Контактная информация policies: Политика diff --git a/config/locales/si.yml b/config/locales/si.yml index 7c86b257e..6f896f0f5 100644 --- a/config/locales/si.yml +++ b/config/locales/si.yml @@ -529,17 +529,6 @@ si: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO රටේ කොටස් වලට සියලු සංචාරවලට එරෙහිව උපදෙස් ලබා දෙන නමුත් අත්‍යවශ්‍ය සංවාරයක යෙදිය හැකිය. - avoid_all_but_essential_travel_to_whole_country_html: FCO සමස්ථ රටටම සියලු සංචාරවලට එරෙහිව උපදෙස් ලබා දෙන නමුත් අත්‍යවශ්‍ය සංවාරයක යෙදිය හැකිය. - avoid_all_travel_to_parts_html: FCO රටේ කොටස් වලට සියලු සංචාරවලට එරෙහිව උපදෙස් ලබා දෙයි. - avoid_all_travel_to_whole_country_html: FCO සමස්ථ රටටම සියලු සංචාරවලට එරෙහිව උපදෙස් ලබා දෙයි. - context: විදේශ ගමන් උපදෙස් - pages: - still_current_at: තවමත් වත්මන් - summary: සාරාංශය - updated: යාවත්කාලීන කෙරිණි working_group: contact_details: විමසීම් විස්තර policies: ප්රතිපත්ති diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 3d0e9a645..4a86c644e 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -607,17 +607,6 @@ sk: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Ministerstvo zahraničných vecí a Commonwealthu FCO neodporúča cestovať do niektorých častí krajiny okrem nevyhnutných prípadov. - avoid_all_but_essential_travel_to_whole_country_html: Ministerstvo zahraničných vecí a Commonwealthu FCO neodporúča cestovať do všetkých častí krajiny okrem nevyhnutných prípadov. - avoid_all_travel_to_parts_html: Ministerstvo zahraničných vecí a Commonwealthu FCO neodporúča cestovať do niektorých častí krajiny. - avoid_all_travel_to_whole_country_html: Ministerstvo zahraničných vecí a Commonwealthu FCO neodporúča cestovať do všetkých častí krajiny. - context: Poradenstvo pri cestovaní do zahraničia - pages: - still_current_at: Stále aktuálne na - summary: Zhrnutie - updated: Aktualizované working_group: contact_details: Kontaktné údaje policies: Politiky diff --git a/config/locales/sl.yml b/config/locales/sl.yml index fcf8710f0..47aada8f8 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -685,17 +685,6 @@ sl: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO odsvetuje vsa nenujna potovanja v dele države. - avoid_all_but_essential_travel_to_whole_country_html: FCO odsvetuje vsa nenujna potovanja v državo. - avoid_all_travel_to_parts_html: FCO odsvetuje vsa potovanja v dele države. - avoid_all_travel_to_whole_country_html: FCO odsvetuje vsa potovanja v državo. - context: Nasveti za potovanja v tujino - pages: - still_current_at: Še vedno aktualno ob - summary: Povzetek - updated: Posodobljeno working_group: contact_details: Kontaktni podatki policies: Politike diff --git a/config/locales/so.yml b/config/locales/so.yml index 011bb022b..6271ef530 100644 --- a/config/locales/so.yml +++ b/config/locales/so.yml @@ -529,17 +529,6 @@ so: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: The FCO talo dhamaan kasoo wada horjeeda lakin socdaal muhiim ah oo qaybaha dalka oo dhan ah. - avoid_all_but_essential_travel_to_whole_country_html: The FCO talo dhamaan kasoo wada horjeeda lakin socdaal muhiim ah guud ahaan dalka. - avoid_all_travel_to_parts_html: The FCO talo dhamaan kasoo wada horjeeda socdaalka dhamaan qaybaha dalka. - avoid_all_travel_to_whole_country_html: The FCO talo dhamaan kasoo wada horjeeda socdaalka dalka oo dhan. - context: Talada socdaalka ajaanibka - pages: - still_current_at: Ilaa hadadan - summary: Soo koobitaanka - updated: La cusboonaysiiyay working_group: contact_details: Faahfaahinta xidhiidhka policies: Siyaasadaha diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 9bd982629..ca06a7313 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -529,17 +529,6 @@ sq: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: The FCO këshillon kundër të gjitha udhëtimeve përveçse thelbësore në pjesë të vendit. - avoid_all_but_essential_travel_to_whole_country_html: The FCO këshillon kundër të gjitha udhëtimeve përveçse thelbësore në të gjithë vendin. - avoid_all_travel_to_parts_html: The FCO këshilloni kundër të gjitha udhëtimeve në pjesë të vendit. - avoid_all_travel_to_whole_country_html: The FCO këshilloni kundër çdo udhëtimi në të gjithë vendin. - context: Këshilla për udhëtime të huaja - pages: - still_current_at: Ende aktuale në - summary: Përmbajtja - updated: Përditësuar working_group: contact_details: Detajet e kontaktit policies: Politikat diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 0faa76f4a..cb358c6df 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -607,17 +607,6 @@ sr: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO ne preporučuje putovanja koja nisu esencijalna za delove zemlje. - avoid_all_but_essential_travel_to_whole_country_html: FCO ne preporučuje putovanja koja nisu esencijalna za celu zemlju. - avoid_all_travel_to_parts_html: FCO ne preporučuje putovanja za delove zemlje. - avoid_all_travel_to_whole_country_html: FCO ne preporučuje putovanja za celu zemlju. - context: Preporuka o putovanjima van zemlje - pages: - still_current_at: Još važi za - summary: Rezime - updated: Ažurirano working_group: contact_details: Detalji za kontakt policies: Politike diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 75cc2cd08..32428e38d 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -529,17 +529,6 @@ sv: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO avråder från alla utom nödvändiga resor till delar av landet. - avoid_all_but_essential_travel_to_whole_country_html: FCO avråder från alla utom nödvändiga resor till hela landet. - avoid_all_travel_to_parts_html: FCO avråder från alla resor till delar av landet. - avoid_all_travel_to_whole_country_html: FCO avråder från alla resor till hela landet. - context: Råd för resor utomlands - pages: - still_current_at: Fortfarande aktuell på - summary: Sammanfattning - updated: Uppdaterad working_group: contact_details: Kontaktuppgifter policies: Policys diff --git a/config/locales/sw.yml b/config/locales/sw.yml index 6ba71447f..0e972db71 100644 --- a/config/locales/sw.yml +++ b/config/locales/sw.yml @@ -529,17 +529,6 @@ sw: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Ushauri wa FCO dhidi ya usafiri wote isipokuwa usafiri muhimu katika sehemu fulani za nchi. - avoid_all_but_essential_travel_to_whole_country_html: Ushauri wa FCO dhidi ya usafiri wote isipokuwa usafiri muhimu nchini kote. - avoid_all_travel_to_parts_html: Ushauri wa FCO dhidi ya usafiri wote katika sehemu fulani za nchi. - avoid_all_travel_to_whole_country_html: Ushauri wa FCO dhidi ya usafiri wote nchini kote. - context: Ushauri wa safari za nje ya nchi - pages: - still_current_at: Bado unapatikana katika - summary: Muhtasari - updated: Ulisasishwa working_group: contact_details: Anwani za mawasiliano policies: Sera diff --git a/config/locales/ta.yml b/config/locales/ta.yml index c74edc79c..2163b079e 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -529,17 +529,6 @@ ta: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: அயல்நாடு, காமன்வெல்த் அலுவலகம் நாட்டின் பகுதிகளுக்கு அத்தியாவசிய பயணம் செய்வது குறித்து அனைவருக்குமான ஆலோசனை தருகிறது. - avoid_all_but_essential_travel_to_whole_country_html: அயல்நாடு, காமன்வெல்த் அலுவலகம் மொத்த நாட்டுக்கும் அத்தியாவசிய பயணம் குறித்து அனைவருக்குமான ஆலோசனை தருகிறது. - avoid_all_travel_to_parts_html: அயல்நாடு, காமன்வெல்த் அலுவலகம் நாட்டின் பகுதிகளுக்கு பயணம் செய்வது குறித்து அனைவருக்குமான ஆலோசனை தருகிறது. - avoid_all_travel_to_whole_country_html: அயல்நாடு, காமன்வெல்த் அலுவலகம் மொத்த நாட்டுக்கும் பயணம் செய்வது குறித்து அனைவருக்குமான ஆலோசனை தருகிறது. - context: அயல்நாட்டுப் பயண அறிவுரை - pages: - still_current_at: தற்போதும் உள்ளது - summary: சுருக்கம் - updated: புதுப்பிக்கப்பட்டது working_group: contact_details: தொடர்பு விபரங்கள் policies: கொள்கைகள் diff --git a/config/locales/th.yml b/config/locales/th.yml index fae4adbb1..e47331f0c 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -451,17 +451,6 @@ th: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO ไม่แนะนำให้เดินทางไปยังบางส่วนของประเทศ นอกจากมีเหตุจำเป็น - avoid_all_but_essential_travel_to_whole_country_html: FCO ไม่แนะนำให้เดินทางไปยังทุกส่วนของประเทศ นอกจากมีเหตุจำเป็น - avoid_all_travel_to_parts_html: FCO ไม่แนะนำให้เดินทางไปยังบางส่วนของประเทศในทุกกรณี - avoid_all_travel_to_whole_country_html: FCO ไม่แนะนำให้เดินทางไปทุกส่วนของประเทศในทุกกรณี - context: คำแนะนำการเดินทางไปต่างประเทศ - pages: - still_current_at: ยังคงเป็นปัจจุบันเมื่อ - summary: สรุป - updated: ปรับปรุงแล้ว working_group: contact_details: รายละเอียดการติดต่อ policies: นโยบาย diff --git a/config/locales/tk.yml b/config/locales/tk.yml index af9cc3adb..304fcfed6 100644 --- a/config/locales/tk.yml +++ b/config/locales/tk.yml @@ -529,17 +529,6 @@ tk: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO ýurduň käbir ýerlerine zerur syýahatdan başga-da maslahat berýär. - avoid_all_but_essential_travel_to_whole_country_html: FCO ähli ýurda syýahat etmekden başga ähli zatlara garşy maslahat berýär. - avoid_all_travel_to_parts_html: The FCO ýurduň dürli künjeklerine syýahat etmegiň öňüni alýar. - avoid_all_travel_to_whole_country_html: The FCO tutuş ýurda syýahat etmegiň öňüni alýar. - context: Daşary ýurda syýahat maslahaty - pages: - still_current_at: Häzir hem bar - summary: Gysgaça - updated: Täzelenen working_group: contact_details: Habarlaşmak üçin maglumatlar policies: Syýasatlar diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 99a6eddad..c146de6d4 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -529,17 +529,6 @@ tr: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO ülkenin bazı bölgelerine zorunlu seyahatler haricinde seyahat edilmemesini tavsiye etmektedir. - avoid_all_but_essential_travel_to_whole_country_html: FCO zorunlu seyahatler haricinde ülke geneline seyahat edilmemesini tavsiye etmektedir. - avoid_all_travel_to_parts_html: FCO ülkeye bazı kısımlarına hiçbir seyahat yapılmamasını tavsiye etmektedir. - avoid_all_travel_to_whole_country_html: FCO ülke geneline hiçbir seyahat yapılmamasını tavsiye etmektedir. - context: Yurtdışı seyahat tavsiyesi - pages: - still_current_at: Halen şurada - summary: Özet - updated: Güncelleme working_group: contact_details: İrtibat ayrıntıları policies: Politikalar diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 2959eceda..9773484d8 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -685,17 +685,6 @@ uk: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: Міністерство закордонних справ(FCO) забороняє будь-які поїздки, крім необхідних, до певних областей країни. - avoid_all_but_essential_travel_to_whole_country_html: Міністерство закордонних справ(FCO) забороняє будь-які поїздки, крім необхідних, по країні. - avoid_all_travel_to_parts_html: Міністерство закордонних справ(FCO) забороняє будь-які поїздки до певних областей країни. - avoid_all_travel_to_whole_country_html: Міністерство закордонних справ(FCO) забороняє будь-які поїздки по країні. - context: Поради щодо подорожей за кордон - pages: - still_current_at: Досі актуально на - summary: Резюме - updated: Оновлено working_group: contact_details: Контактні дані policies: Політики diff --git a/config/locales/ur.yml b/config/locales/ur.yml index 441ae6966..7b18feeea 100644 --- a/config/locales/ur.yml +++ b/config/locales/ur.yml @@ -529,17 +529,6 @@ ur: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO سوائے ملک کے کچھ حصوں میں ضروری سفر کرنے کے ہر قسم کے سفر کے خلاف مشاورت فراہم کرتا ہے۔ - avoid_all_but_essential_travel_to_whole_country_html: FCO سوائے پورے ملک میں ضروری سفر کرنے کے ہر قسم کے سفر کے خلاف مشاورت فراہم کرتا ہے۔ - avoid_all_travel_to_parts_html: FCO ملک کے کچھ حصوں میں ہر قسم کے سفر کے خلاف مشاورت فراہم کرتا ہے۔ - avoid_all_travel_to_whole_country_html: FCO پورے ملک میں ہر قسم کے سفر کے خلاف مشاورت فراہم کرتا ہے۔ - context: غیر ملکی سفر کی مشاورت - pages: - still_current_at: ابھی تک حالیہ ہے از - summary: خلاصہ - updated: اپ ڈیٹ کردہ working_group: contact_details: رابطے کی تفصیلات policies: پالیسیاں diff --git a/config/locales/uz.yml b/config/locales/uz.yml index 5126dce5d..36097cb77 100644 --- a/config/locales/uz.yml +++ b/config/locales/uz.yml @@ -529,17 +529,6 @@ uz: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: The Ташқи ишлар ва Ҳамдўстлик ишлари бўйича вазирлиги ўта заруратсиз мамлакатнинг муайян минтақаларига сафарларни амалга оширишни тавсия этмайди. - avoid_all_but_essential_travel_to_whole_country_html: The Ташқи ишлар ва Ҳамдўстлик ишлари бўйича вазирлиги ўта заруратсиз бутун мамлакатнинг ҳудуди бўйлаб сақарларни амалга оширишни тавсия этмайди. - avoid_all_travel_to_parts_html: The Ташқи ишлар ва Ҳамдўстлик ишлари бўйича вазирлиги мамлакатнинг муайян минтақаларига сафарларни амалга оширишни тавсия этмайди. - avoid_all_travel_to_whole_country_html: The Ташқи ишлар ва Ҳамдўстлик ишлари бўйича вазирлиги бутун мамлакат ҳудуди бўйлаб сафарларни амалга оширишни тавсия этмайди. - context: Хорижга сафарларга нисбатан маслаҳат бериш - pages: - still_current_at: Ҳанузгача кучда - summary: Жамланма маълумот - updated: Янгиланган working_group: contact_details: Батафсил маълумотлар policies: Сиёсатлар diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 186bf33f7..18e223878 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -451,17 +451,6 @@ vi: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO khuyến cáo chỉ nên đi đến một số nơi ở quốc gia này khi thật cần thiết. - avoid_all_but_essential_travel_to_whole_country_html: FCO khuyến cáo chỉ nên đi đến quốc gia này khi thật cần thiết. - avoid_all_travel_to_parts_html: FCO khuyến cáo không nên đi đến một số nơi ở quốc gia này. - avoid_all_travel_to_whole_country_html: FCO khuyến cáo không nên đi đến quốc gia này. - context: Tư vấn đi nước ngoài - pages: - still_current_at: Vẫn đang ở - summary: Tóm tắt - updated: Đã cập nhật working_group: contact_details: Chi tiết liên hệ policies: Chính sách diff --git a/config/locales/yi.yml b/config/locales/yi.yml index 17c6da386..e7109197b 100644 --- a/config/locales/yi.yml +++ b/config/locales/yi.yml @@ -529,17 +529,6 @@ yi: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: - avoid_all_but_essential_travel_to_whole_country_html: - avoid_all_travel_to_parts_html: - avoid_all_travel_to_whole_country_html: - context: - pages: - still_current_at: - summary: - updated: working_group: contact_details: policies: diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml index 8959b2abb..9e8ccacf8 100644 --- a/config/locales/zh-hk.yml +++ b/config/locales/zh-hk.yml @@ -451,17 +451,6 @@ zh-hk: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: FCO 建議，如非必要，請勿前往該國部份地區。 - avoid_all_but_essential_travel_to_whole_country_html: FCO 建議，如非必要，請勿前往該國全部地區。 - avoid_all_travel_to_parts_html: FCO 建議，切勿前往該國部份地區。 - avoid_all_travel_to_whole_country_html: FCO 建議，切勿前往該國全部地區。 - context: 海外旅行建議 - pages: - still_current_at: 目前仍在 - summary: 摘要 - updated: 已更新 working_group: contact_details: 聯絡詳情 policies: 政策 diff --git a/config/locales/zh-tw.yml b/config/locales/zh-tw.yml index da08ce686..c3380c965 100644 --- a/config/locales/zh-tw.yml +++ b/config/locales/zh-tw.yml @@ -451,17 +451,6 @@ zh-tw: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: 外交和英聯邦事務部 建議非必要的旅行，不要前往該國部分地區。 - avoid_all_but_essential_travel_to_whole_country_html: 外交和英聯邦事務部 建議非必要的旅行，不要前往該國。 - avoid_all_travel_to_parts_html: 外交和英聯邦事務部 建議不要前往該國部分地區。 - avoid_all_travel_to_whole_country_html: 外交和英聯邦事務部 建議不要前往該國。 - context: 國外旅行建議 - pages: - still_current_at: 目前仍 - summary: 概括 - updated: 更新 working_group: contact_details: 聯繫細節 policies: 政策 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 72666c0e0..f0e5eb99b 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -451,17 +451,6 @@ zh: time: formats: short_ordinal: "%e %B %Y" - travel_advice: - alert_status: - avoid_all_but_essential_travel_to_parts_html: 'FCO 建议除非必要，否则不要前往该国部分地区。 ' - avoid_all_but_essential_travel_to_whole_country_html: 'FCO 建议除非必要，否则不要前往该国全部地区。 ' - avoid_all_travel_to_parts_html: 'FCO 建议除非必要，否则不要前往该国家的某些地区。 ' - avoid_all_travel_to_whole_country_html: FCO 建议除非必要，否则不要前往该国全部地区。 - context: 国外差旅建议 - pages: - still_current_at: 有效范围 - summary: 总结 - updated: 已更新 working_group: contact_details: 联系方式 policies: 策略 diff --git a/config/routes.rb b/config/routes.rb index 1f1721042..e876471f6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -28,9 +28,8 @@ variant: /print/, } - get "*path(.:locale)(.:format)" => "content_items#show", + get "*path(.:locale)" => "content_items#show", constraints: { - format: /atom/, locale: /\w{2}(-[\d\w]{2,3})?/, } diff --git a/test/components/download_link_test.rb b/test/components/download_link_test.rb deleted file mode 100644 index 19670fce5..000000000 --- a/test/components/download_link_test.rb +++ /dev/null @@ -1,23 +0,0 @@ -require "component_test_helper" - -class DownloadLinkTest < ComponentTestCase - def component_name - "download_link" - end - - test "fails to render a download link when no href is given" do - assert_raise do - render_component({}) - end - end - - test "renders a download link correctly" do - render_component(href: "/download-me") - assert_select ".app-c-download-link[href=\"/download-me\"]" - end - - test "renders a download link with custom link text correctly" do - render_component(href: "/download-map", link_text: "Download this file") - assert_select ".app-c-download-link[href=\"/download-map\"]", text: "Download this file" - end -end diff --git a/test/controllers/content_items_controller_test.rb b/test/controllers/content_items_controller_test.rb index 5ad576330..f0aa91dfa 100644 --- a/test/controllers/content_items_controller_test.rb +++ b/test/controllers/content_items_controller_test.rb @@ -25,27 +25,6 @@ class ContentItemsControllerTest < ActionController::TestCase end end - test "routing handles paths with just format" do - assert_routing( - "/government/news/statement-the-status-of-eu-nationals-in-the-uk.atom", - controller: "content_items", - action: "show", - path: "government/news/statement-the-status-of-eu-nationals-in-the-uk", - format: "atom", - ) - end - - test "routing handles paths with format and locale" do - assert_routing( - "/government/news/statement-the-status-of-eu-nationals-in-the-uk.es.atom", - controller: "content_items", - action: "show", - path: "government/news/statement-the-status-of-eu-nationals-in-the-uk", - format: "atom", - locale: "es", - ) - end - test "routing handles paths with print variant" do assert_routing( "/government/news/statement-the-status-of-eu-nationals-in-the-uk/print", @@ -57,7 +36,7 @@ class ContentItemsControllerTest < ActionController::TestCase end test "redirects route with invalid parts to base path" do - content_item = content_store_has_schema_example("travel_advice", "full-country") + content_item = content_store_has_schema_example("guide", "guide") invalid_part_path = "#{path_for(content_item)}/not-a-valid-part" # The content store performs a 301 to the base path when requesting a content item @@ -88,7 +67,7 @@ class ContentItemsControllerTest < ActionController::TestCase test "returns HTML when an unspecific accepts header is requested (eg by IE8 and below)" do request.headers["Accept"] = "*/*" - content_item = content_store_has_schema_example("travel_advice", "full-country") + content_item = content_store_has_schema_example("guide", "guide") get :show, params: { @@ -172,14 +151,6 @@ class ContentItemsControllerTest < ActionController::TestCase assert_equal "max-age=20, public", @response.headers["Cache-Control"] end - test "sets a longer cache-control header for travel advice atom feeds" do - content_item = content_store_has_schema_example("travel_advice", "full-country") - get :show, params: { path: path_for(content_item), format: "atom" } - - assert_response :success - assert_equal "max-age=300, public", @response.headers["Cache-Control"] - end - test "honours cache-control private items" do content_item = content_store_has_schema_example("case_study", "case_study") stub_content_store_has_item(content_item["base_path"], content_item, private: true) @@ -200,21 +171,13 @@ class ContentItemsControllerTest < ActionController::TestCase assert_select "title", %r{#{translated_schema_name}} end - test "renders atom feeds" do - content_item = content_store_has_schema_example("travel_advice", "full-country") - get :show, params: { path: path_for(content_item), format: "atom" } - - assert_response :success - assert_select "feed title", "Travel Advice Summary" - end - test "renders print variants" do - content_item = content_store_has_schema_example("travel_advice", "full-country") + content_item = content_store_has_schema_example("guide", "guide") get :show, params: { path: path_for(content_item), variant: "print" } assert_response :success assert_equal request.variant, [:print] - assert_select "#travel-advice-print" + assert_select "#guide-print" end test "gets item from content store even when url contains multi-byte UTF8 character" do @@ -229,7 +192,7 @@ class ContentItemsControllerTest < ActionController::TestCase end test "returns 404 for invalid url" do - path = "foreign-travel-advice/egypt]" + path = "government/case-studies/electric-cars]" stub_content_store_does_not_have_item("/#{path}") @@ -267,13 +230,6 @@ class ContentItemsControllerTest < ActionController::TestCase assert_response :forbidden end - test "returns 406 for schema types which don't support provided format" do - content_item_without_atom = content_store_has_schema_example("case_study", "case_study") - get :show, params: { path: path_for(content_item_without_atom), format: "atom" } - - assert_response :not_acceptable - end - test "returns 410 for content items that are gone" do stub_content_store_has_gone_item("/gone-item") get :show, params: { path: "gone-item" } @@ -296,13 +252,6 @@ class ContentItemsControllerTest < ActionController::TestCase assert_redirected_to "https://www.test.gov.uk/new-406-beacons-destination/to-preserve" end - test "sets the Access-Control-Allow-Origin header for atom pages" do - content_store_has_schema_example("travel_advice", "full-country") - get :show, params: { path: "foreign-travel-advice/albania", format: "atom" } - - assert_equal response.headers["Access-Control-Allow-Origin"], "*" - end - test "sets GOVUK-Account-Session-Flash in the Vary header" do content_item = content_store_has_schema_example("case_study", "case_study") get :show, params: { path: path_for(content_item) } diff --git a/test/integration/travel_advice_atom_feed_test.rb b/test/integration/travel_advice_atom_feed_test.rb deleted file mode 100644 index 2b40a3212..000000000 --- a/test/integration/travel_advice_atom_feed_test.rb +++ /dev/null @@ -1,52 +0,0 @@ -require "test_helper" - -require "nokogiri/html" -require "open-uri" -require "rss" - -class TravelAdviceAtomFeed < ActionDispatch::IntegrationTest - setup do - setup_and_parse_travel_advice_atom_feed("full-country") - @base_path = @content_item["base_path"] - @updated_at = Time.zone.parse(@content_item["public_updated_at"]) - end - - test "it sets the alternative link correctly" do - alternate_link = @feed.links.find { |link| link.rel == "alternate" } - assert alternate_link.href.ends_with?(@base_path) - end - - test "it sets the entry's id to the url concatenated with updated_at" do - id = @feed.items.first.id.content - assert id.end_with?("#{@base_path}##{@updated_at}") - end - - test "it sets the entry's title correctly" do - title = @feed.items.first.title.content - assert_equal title, @content_item["title"] - end - - test "it sets the entry's summary correctly" do - summary = Nokogiri::HTML.fragment(@feed.items.first.summary.content) - assert_equal summary.text.strip, @content_item["details"]["change_description"].strip - end - - test "it sets the entry's updated correctly" do - updated = @feed.items.first.updated.content - assert_equal updated, @updated_at - end - - def setup_and_parse_travel_advice_atom_feed(name) - @content_item = get_content_example_by_schema_and_name("travel_advice", name) - - uri = URI::HTTP.build( - host: Capybara.current_session.server.host, - port: Capybara.current_session.server.port, - path: "#{@content_item['base_path']}.atom", - ) - - stub_content_store_has_item(@content_item["base_path"], @content_item.to_json) - - @feed = RSS::Parser.parse(uri.read) - end -end diff --git a/test/integration/travel_advice_print_test.rb b/test/integration/travel_advice_print_test.rb deleted file mode 100644 index d9a8c4713..000000000 --- a/test/integration/travel_advice_print_test.rb +++ /dev/null @@ -1,40 +0,0 @@ -require "test_helper" - -class TravelAdvicePrint < ActionDispatch::IntegrationTest - test "it renders the print view" do - setup_and_visit_travel_advice_print("full-country") - assert page.has_css?("#travel-advice-print") - end - - test "it is not indexable by search engines" do - setup_and_visit_travel_advice_print("full-country") - assert page.has_css?("meta[name='robots'][content='noindex, nofollow']", visible: false) - end - - test "it renders all other parts in the print view" do - setup_and_visit_travel_advice_print("full-country") - parts = @content_item["details"]["parts"] - - assert_has_component_metadata_pair("Still current at", Time.zone.today.strftime("%-d %B %Y")) - assert_has_component_metadata_pair("Updated", Date.parse(@content_item["details"]["reviewed_at"]).strftime("%-d %B %Y")) - - within ".gem-c-metadata" do - assert page.has_content?(@content_item["details"]["change_description"].gsub("Latest update: ", "").strip) - end - - assert page.has_css?("h1", text: "Summary") - parts.each do |part| - assert page.has_css?("h1", text: part["title"]) - end - - assert page.has_content?("Public security is generally good, particularly in Tirana, and Albanians are very hospitable to visitors.") - end - - def setup_and_visit_travel_advice_print(name) - example = get_content_example_by_schema_and_name("travel_advice", name) - @content_item = example.tap do |item| - stub_content_store_has_item(item["base_path"], item.to_json) - visit "#{item['base_path']}/print" - end - end -end diff --git a/test/integration/travel_advice_test.rb b/test/integration/travel_advice_test.rb deleted file mode 100644 index 34fe84be1..000000000 --- a/test/integration/travel_advice_test.rb +++ /dev/null @@ -1,92 +0,0 @@ -require "test_helper" - -class TravelAdviceTest < ActionDispatch::IntegrationTest - test "can render all valid examples" do - GovukSchemas::Example.find_all("travel_advice").each do |content_item| - setup_and_visit_content_item_by_example(content_item) - - assert page.has_css?("title", visible: false, text: content_item["title"]) - end - end - - test "travel advice header and navigation" do - setup_and_visit_content_item("full-country") - - assert_has_component_title(@content_item["details"]["country"]["name"]) - - assert page.has_css?("a[href=\"#{@content_item['details']['email_signup_link']}\"]", text: "Get email alerts") - - assert page.has_css?(".part-navigation-container nav li", count: @content_item["details"]["parts"].size) - assert page.has_css?(".part-navigation-container nav li", text: "Summary") - assert_not page.has_css?(".part-navigation li a", text: "Summary") - - parts_size = @content_item["details"]["parts"].size - (@content_item["details"]["parts"][1..parts_size]).each do |part| - assert page.has_css?(".part-navigation-container nav li a[href*=\"#{part['slug']}\"]", text: part["title"]) - end - - assert page.has_css?(".govuk-pagination") - assert page.has_css?('.govuk-link.govuk-link--no-visited-state[href$="/print"]', text: "View a printable version of the whole guide") - end - - test "travel advice first part has latest updates and map" do - setup_and_visit_content_item("full-country") - assert page.has_css?("h1", text: "Summary") - assert page.has_text?("The main opposition party has called for mass protests against the government in Tirana on 18 February 2017.") - assert_has_component_metadata_pair("Still current at", Time.zone.today.strftime("%-d %B %Y")) - assert_has_component_metadata_pair("Updated", Date.parse(@content_item["details"]["reviewed_at"]).strftime("%-d %B %Y")) - - within ".gem-c-metadata" do - assert page.has_content?(@content_item["details"]["change_description"].gsub("Latest update: ", "").strip) - end - - assert page.has_css?(".map img[src=\"#{@content_item['details']['image']['url']}\"]") - assert page.has_css?(".map figcaption a[href=\"#{@content_item['details']['document']['url']}\"]", text: "Download a more detailed map (PDF)") - end - - test "travel advice part renders just that part" do - example = get_content_example("full-country") - first_part = example["details"]["parts"][1] - setup_and_visit_travel_advice_part("full-country", first_part["slug"]) - - assert page.has_css?("title", visible: false, text: "#{first_part['title']} - #{@content_item['title']}") - assert page.has_css?("h1", text: first_part["title"]) - assert page.has_text?("Public security is generally good, particularly in Tirana, and Albanians are very hospitable to visitors.") - - assert_not page.has_css?(".map") - assert_not page.has_css?(".gem-c-metadata") - - assert page.has_css?(".part-navigation-container nav li", text: first_part["title"]) - assert_not page.has_css?(".part-navigation-container nav li a", text: first_part["title"]) - end - - test "travel advice includes a discoverable atom feed link" do - setup_and_visit_content_item("full-country") - assert page.has_css?("link[type*='atom'][href='#{@content_item['base_path']}.atom']", visible: false) - end - - test "travel advice does not render with the single page notification button" do - setup_and_visit_content_item("full-country") - assert_not page.has_css?(".gem-c-single-page-notification-button") - end - - test "print link has GA4 tracking" do - setup_and_visit_content_item("full-country-without-summary") - - expected_ga4_json = { - event_name: "navigation", - type: "print page", - section: "Footer", - text: "View a printable version of the whole guide", - }.to_json - - assert page.has_css?("a[data-ga4-link='#{expected_ga4_json}']") - end - - def setup_and_visit_travel_advice_part(name, part) - @content_item = get_content_example(name).tap do |item| - stub_content_store_has_item("#{item['base_path']}/#{part}", item.to_json) - visit "#{item['base_path']}/#{part}" - end - end -end diff --git a/test/presenters/content_item_presenter_test.rb b/test/presenters/content_item_presenter_test.rb index 0cef76fde..c14925d21 100644 --- a/test/presenters/content_item_presenter_test.rb +++ b/test/presenters/content_item_presenter_test.rb @@ -32,15 +32,15 @@ class ContentItemPresenterTest < PresenterTestCase end test "#canonical_url with a part" do - example_with_parts = govuk_content_schema_example("travel_advice", "full-country") - request_path = "#{example_with_parts['base_path']}/safety-and-security" + example_with_parts = govuk_content_schema_example("guide", "guide") + request_path = "#{example_with_parts['base_path']}/other-compulsory-subjects" presenter = create_presenter( - TravelAdvicePresenter, + GuidePresenter, content_item: example_with_parts, requested_path: request_path, ) - assert_equal "https://www.test.gov.uk/foreign-travel-advice/albania/safety-and-security", presenter.canonical_url + assert_equal "https://www.test.gov.uk/national-curriculum/other-compulsory-subjects", presenter.canonical_url end test "available_translations sorts languages by locale with English first" do @@ -58,7 +58,7 @@ class ContentItemPresenterTest < PresenterTestCase test "part slug is nil when requesting a content item without parts" do example_without_parts = govuk_content_schema_example("case_study", "translated") presenter = create_presenter( - TravelAdvicePresenter, + GuidePresenter, content_item: example_without_parts, requested_path: example_without_parts["base_path"], ) diff --git a/test/presenters/travel_advice_presenter_test.rb b/test/presenters/travel_advice_presenter_test.rb deleted file mode 100644 index c694e1543..000000000 --- a/test/presenters/travel_advice_presenter_test.rb +++ /dev/null @@ -1,301 +0,0 @@ -require "presenter_test_helper" - -class TravelAdvicePresenterTest - class PresentedTravelAdvice < PresenterTestCase - def schema_name - "travel_advice" - end - - test "has parts" do - assert presented_item("full-country").is_a?(ContentItem::Parts) - end - - test "part slug set to nil when content item has parts but base path requested" do - assert_not presented_item("full-country").requesting_a_part? - assert presented_item("full-country").part_slug.nil? - end - - test "part slug set to last segment of requested content item path when content item has parts" do - example = schema_item("full-country") - second_part = example["details"]["parts"][1] - presented = presented_item("full-country", second_part["slug"]) - - assert presented.requesting_a_part? - assert_equal presented.part_slug, second_part["slug"] - assert presented.has_valid_part? - end - - test "knows when an invalid part has been requested" do - presented = presented_item("full-country", "not-a-valid-part") - - assert presented.requesting_a_part? - assert_equal presented.part_slug, "not-a-valid-part" - assert_not presented.has_valid_part? - end - - test "presents unique titles for each part" do - example = schema_item("full-country") - presented = presented_item("full-country") - assert_equal example["title"], presented.page_title - - first_part = example["details"]["parts"].first - presented_part = presented_item("full-country", first_part["slug"]) - assert_equal "#{first_part['title']} - #{example['title']}", presented_part.page_title - end - - test "presents withdrawn in the title for withdrawn content" do - presented_item = presented_item("full-country", nil, "withdrawn_notice" => { "explanation": "Withdrawn", "withdrawn_at": "2014-08-22T10:29:02+01:00" }) - assert_equal "[Withdrawn] Albania travel advice", presented_item.page_title - end - - test "presents the current part when a part slug is provided for country" do - example_parts = schema_item("full-country")["details"]["parts"] - second_part = example_parts[1] - presented = presented_item("full-country", second_part["slug"]) - - assert_not presented.no_part_slug_provided? - assert presented.has_valid_part? - assert_equal second_part["title"], presented.current_part_title - assert_equal second_part["body"], presented.current_part_body - end - - test "presents first part when part slug is provided for country" do - example_parts = schema_item("full-country")["details"]["parts"] - first_part = example_parts.first - presented = presented_item("full-country", first_part["slug"]) - - assert_not presented.no_part_slug_provided? - assert_equal first_part["title"], presented.current_part_title - assert_equal first_part["body"], presented.current_part_body - end - - test "marks parts not in the content item as invalid" do - example_part_slugs = schema_item("full-country")["details"]["parts"].map { |part| part["slug"] } - presented = presented_item("full-country", "not-a-valid-part") - - assert_not example_part_slugs.include?("not-a-valid-part") - assert_not presented.has_valid_part? - end - - test "the first part is included as the first navigation item" do - first_nav_item = presented_item("full-country").parts_navigation.first.first - assert_equal "Summary", first_nav_item - end - - test "navigation items link to all parts" do - parts = schema_item("full-country")["details"]["parts"] - part_links = presented_item("full-country").parts_navigation.flatten - - assert_equal parts.size, part_links.size - assert part_links[1].include?(parts[1]["title"]) - assert part_links[1].include?(parts[1]["slug"]) - end - - test "part navigation is in one group when 3 or fewer navigation items" do - example = schema_item("full-country") - - example["details"]["parts"] = example["details"]["parts"].first(4) - assert_equal 2, presented_item("full-country", nil, example).parts_navigation.size - - example["details"]["parts"] = example["details"]["parts"].first(3) - assert_equal 1, presented_item("full-country", nil, example).parts_navigation.size - - example["details"]["parts"] = [] - assert_equal 0, presented_item("full-country", nil, example).parts_navigation.size - end - - test "part navigation is split into two groups" do - assert_equal 2, presented_item("full-country").parts_navigation.size - end - - test "the second list of parts starting index continues on from the first list" do - presented = presented_item("full-country") - assert_equal presented.parts_navigation.first.size + 1, presented.parts_navigation_second_list_start - end - - test "presents an email signup link" do - assert_equal schema_item("full-country")["details"]["email_signup_link"], presented_item("full-country").email_signup_link - end - - test "presents a feed link" do - assert_equal "#{schema_item('full-country')['base_path']}.atom", presented_item("full-country").feed_link - end - - test "presents a print link" do - assert_equal "#{schema_item('full-country')['base_path']}/print", presented_item("full-country").print_link - end - - test "presents country name" do - assert_equal schema_item("full-country")["details"]["country"]["name"], presented_item("full-country").country_name - end - - test "#ireland?" do - example = schema_item("full-country") - example["details"]["country"]["name"] = "Ireland" - - assert_equal true, presented_item("full-country", nil, example).ireland? - end - - test "presents only next navigation when on the summary" do - example = schema_item("full-country") - parts = example["details"]["parts"] - nav = presented_item("full-country").previous_and_next_navigation - expected_nav = { - next_page: { - url: "#{example['base_path']}/#{parts[1]['slug']}", - title: "Next", - label: parts[1]["title"], - }, - } - - assert_equal nav, expected_nav - end - - test "presents previous and next navigation" do - example = schema_item("full-country") - parts = example["details"]["parts"] - nav = presented_item("full-country", parts[1]["slug"]).previous_and_next_navigation - expected_nav = { - next_page: { - url: "#{example['base_path']}/#{parts[2]['slug']}", - title: "Next", - label: parts[2]["title"], - }, - previous_page: { - url: example["base_path"], - title: "Previous", - label: "Summary", - }, - } - - assert_equal nav, expected_nav - end - - test "presents only previous navigation when last part" do - example = schema_item("full-country") - parts = example["details"]["parts"] - nav = presented_item("full-country", parts.last["slug"]).previous_and_next_navigation - expected_nav = { - previous_page: { - url: "#{example['base_path']}/#{parts[-2]['slug']}", - title: "Previous", - label: parts[-2]["title"], - }, - } - - assert_equal nav, expected_nav - end - - test "presents alert statuses" do - example = schema_item("full-country") - example["details"]["alert_status"] = %w[avoid_all_but_essential_travel_to_parts avoid_all_travel_to_parts] - - presented = present_example(example) - - assert presented.alert_status.first.include?("advises against all but essential travel to parts of #{presented.country_name}") - assert presented.alert_status.last.include?("advises against all travel to parts of #{presented.country_name}") - end - - test "metadata uses today for 'Still current at'" do - presented = presented_item("full-country").metadata[:other]["Still current at"] - - assert Date.parse(presented).today? - end - - test "metadata uses review date for 'Updated'" do - schema_updated = schema_item("full-country")["details"]["reviewed_at"] - presented_updated = presented_item("full-country").metadata[:other]["Updated"] - - assert Date.parse(schema_updated) == Date.parse(presented_updated) - end - - test "metadata uses updated date when no review date" do - example = schema_item("full-country") - schema_updated = example["details"]["updated_at"] - example["details"].delete("reviewed_at") - presented_updated = presented_item("full-country", nil, example).metadata[:other]["Updated"] - - assert Date.parse(schema_updated) == Date.parse(presented_updated) - end - - test "metadata avoids duplication of 'Latest update' from change description" do - [ - { original: "Latest update: Changes", presented: "Changes" }, - { original: "Latest update - changes", presented: "Changes" }, - { original: "Latest update changes", presented: "Changes" }, - { original: "Latest Update: Summary of changes. Next sentence", presented: "Summary of changes. Next sentence" }, - { original: "Latest update: Changes\n\nMore changes", presented: "Changes\n\nMore changes" }, - ].each do |i| - assert_equal i[:presented], present_latest(i[:original]) - end - - assert_nil present_latest("") - end - - test "presents a map image and download link" do - presented = presented_item("full-country") - example = schema_item("full-country") - - example_map_url = example["details"]["image"]["url"] - presented_map_url = presented.map["url"] - - example_map_download_url = example["details"]["document"]["url"] - presented_map_download_url = presented.map_download_url - - assert_equal example_map_url, presented_map_url - assert_equal example_map_download_url, presented_map_download_url - end - - test "handles travel advice without maps" do - example = schema_item("full-country") - example["details"].delete("image") - example["details"].delete("document") - presented = presented_item("full-country", nil, example) - - assert_nil presented.map - assert_nil presented.map_download_url - end - - test "formats change description for an atom feed" do - example = schema_item("full-country") - example["details"]["change_description"] = "Test
XML" - assert_equal "

Test<br>XML

", present_example(example).atom_change_description - end - - test "presents all parts including summary for the print view" do - example_parts = schema_item("full-country")["details"]["parts"] - parts = presented_item("full-country").parts.clone - first_part = parts.first - - parts.each_with_index do |part, i| - assert_equal example_parts[i]["body"], part["body"] - assert_equal example_parts[i]["slug"], part["slug"] - end - assert_equal "Summary", first_part["title"] - assert_equal schema_item("full-country")["details"]["parts"].first["body"], first_part["body"] - end - - private - - def present_latest(latest) - with_custom_change_description = { - "details" => { - "change_description" => latest, - }, - } - presented = presented_item("full-country", nil, with_custom_change_description) - presented.metadata[:other]["Latest update"] - end - - def presented_item(type = schema_name, part_slug = nil, overrides = {}) - schema_example_content_item = schema_item(type) - part_slug = "/#{part_slug}" if part_slug - - create_presenter( - TravelAdvicePresenter, - content_item: schema_example_content_item.merge(overrides), - requested_path: "#{schema_example_content_item['base_path']}#{part_slug}", - ) - end - end -end