diff --git a/app/controllers/development_controller.rb b/app/controllers/development_controller.rb index 78c689ec5..bc7c8ecaa 100644 --- a/app/controllers/development_controller.rb +++ b/app/controllers/development_controller.rb @@ -4,7 +4,6 @@ class DevelopmentController < ApplicationController def index @schema_names = %w[answer call_for_evidence - case_study consultation contact corporate_information_page diff --git a/app/presenters/case_study_presenter.rb b/app/presenters/case_study_presenter.rb deleted file mode 100644 index 4a13af58e..000000000 --- a/app/presenters/case_study_presenter.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CaseStudyPresenter < ContentItemPresenter - include ContentItem::Body - include ContentItem::Metadata - include ContentItem::TitleAndContext - - def image - content_item["details"]["image"] - end - - def page_title - "#{super} - #{I18n.t("content_item.schema_name.#{document_type}", count: 1)}" - end -end diff --git a/app/views/content_items/case_study.html.erb b/app/views/content_items/case_study.html.erb deleted file mode 100644 index 25df21333..000000000 --- a/app/views/content_items/case_study.html.erb +++ /dev/null @@ -1,50 +0,0 @@ -<% content_for :extra_head_content do %> - <%= machine_readable_metadata( - schema: :article - ) %> -<% end %> - -
-
- <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %> -
- <%= render 'shared/translations' %> -
- <%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %> -
-
- -<%= render 'shared/publisher_metadata_with_logo' %> -<% if @content_item.withdrawn? %> - <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> -<% end %> - -
-
-
-
- <%= render 'components/figure', - src: @content_item.image["url"], - alt: @content_item.image["alt_text"], - credit: @content_item.image["credit"], - caption: @content_item.image["caption"] if @content_item.image %> - - <%= render 'govuk_publishing_components/components/govspeak', { - direction: page_text_direction, - } do %> - <%= raw(@content_item.body) %> - <% end %> -
- - <%= render 'components/published_dates', { - published: @content_item.published, - last_updated: @content_item.updated, - history: @content_item.history - } %> -
-
- - <%= render 'shared/sidebar_navigation' %> -
- -<%= render 'shared/footer_navigation' %> diff --git a/config/govuk_examples.yml b/config/govuk_examples.yml index 166c613b8..d50dd9e4c 100644 --- a/config/govuk_examples.yml +++ b/config/govuk_examples.yml @@ -10,22 +10,6 @@ answers_7: '/passport-fees' answers_8: '/vehicle-tax-refund' answers_9: '/car-tax-disc-without-v11-reminder' -case_study: '/government/case-studies/get-britain-building-carlisle-park' -case_study_translated: '/government/case-studies/doing-business-in-spain.es' -case_study_withdrawn: '/government/case-studies/terence-age-33-stoke-on-trent' - -# Most visited case_study pages (2 September 2016) -case_study_1: '/government/case-studies/ww1-canadian-vc-recipient-charles-smith-rutherford' -case_study_2: '/government/case-studies/the-expert-patients-programme' -case_study_3: '/government/case-studies/case-study-darwin-initiative-main-round-project' -case_study_4: '/government/case-studies/the-role-of-women-in-afghanistan' -case_study_5: '/government/case-studies/jaguar-land-rover-manufacturing-more-resource-efficient-cars' -case_study_6: '/government/case-studies/dojima-to-open-first-sake-brewery-in-the-uk' -case_study_7: '/government/case-studies/competition-law-case-studies' -case_study_8: '/government/case-studies/gls-lawyers-discuss-their-experiences-as-legal-trainees' -case_study_9: '/government/case-studies/ktp-programme-helps-northern-ireland-generate-business-growth' -case_study_10: '/government/case-studies/uk-china-cooperation-on-intellectual-property' - # Most popular from https://docs.publishing.service.gov.uk/document-types/contact.html (20 February 2017) contact_1: /government/organisations/hm-revenue-customs/contact/income-tax-enquiries-for-individuals-pensioners-and-employees contact_2: /government/organisations/hm-revenue-customs/contact/self-assessment diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 0cdc37f71..d8f23c88c 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -138,13 +138,6 @@ ar: other: two: zero: - case_study: - few: - many: - one: دراسة الحالة - other: دراسات الحالة - two: - zero: closed_call_for_evidence: few: many: diff --git a/config/locales/az.yml b/config/locales/az.yml index b4a80c958..8d4154695 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -110,9 +110,6 @@ az: call_for_evidence_outcome: one: other: - case_study: - one: Nümunə üzrə araşdırma - other: Nümunə üzrə araşdırmalar closed_call_for_evidence: one: other: diff --git a/config/locales/be.yml b/config/locales/be.yml index e59154d84..1b4ae0127 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -124,11 +124,6 @@ be: many: one: other: - case_study: - few: - many: - one: Тэматычнае даследаванне - other: Тэматычныя даследаванні closed_call_for_evidence: few: many: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 8bbe884b4..959cc4946 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -110,9 +110,6 @@ bg: call_for_evidence_outcome: one: other: - case_study: - one: Казус - other: Казуси closed_call_for_evidence: one: other: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index e7904523f..b116e78f7 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -110,9 +110,6 @@ bn: call_for_evidence_outcome: one: other: - case_study: - one: কেস স্টাডি - other: কেস স্টাডিসমূহ closed_call_for_evidence: one: other: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 0b2c0ac62..656c2d762 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -117,10 +117,6 @@ cs: few: one: other: - case_study: - few: - one: Případová studie - other: Případové studie closed_call_for_evidence: few: one: diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 48e39d2ea..df2e82ba6 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -138,13 +138,6 @@ cy: other: two: zero: - case_study: - few: - many: - one: Astudiaeth achos - other: Astudiaethau achos - two: - zero: closed_call_for_evidence: few: many: diff --git a/config/locales/da.yml b/config/locales/da.yml index f50af379d..95595e949 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -110,9 +110,6 @@ da: call_for_evidence_outcome: one: other: - case_study: - one: Casestudie - other: Casestudie closed_call_for_evidence: one: other: diff --git a/config/locales/de.yml b/config/locales/de.yml index 5232ac74b..d528f71a6 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -110,9 +110,6 @@ de: call_for_evidence_outcome: one: other: - case_study: - one: Fallstudie - other: Fallstudien closed_call_for_evidence: one: other: diff --git a/config/locales/dr.yml b/config/locales/dr.yml index c395e0a55..f57a38f5e 100644 --- a/config/locales/dr.yml +++ b/config/locales/dr.yml @@ -110,9 +110,6 @@ dr: call_for_evidence_outcome: one: other: - case_study: - one: مطالعه موردی - other: مطالعات موردی closed_call_for_evidence: one: other: diff --git a/config/locales/el.yml b/config/locales/el.yml index 41f00f6d7..7c28ffbf5 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -110,9 +110,6 @@ el: call_for_evidence_outcome: one: other: - case_study: - one: Μελέτη περίπτωσης - other: Μελέτες περιπτώσεων closed_call_for_evidence: one: other: diff --git a/config/locales/en.yml b/config/locales/en.yml index 143a8e87e..c97dcfdca 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -17,20 +17,20 @@ en: is_being: is being not_open_yet: This call for evidence isn't open yet 'on': 'on' - 'or': 'or' opens: This call for evidence opens + or: or original_call_for_evidence: Original call for evidence ran_from: This call for evidence ran from - response_form: response form respond_online: Respond online + response_form: response form summary: Summary was: was ways_to_respond: Ways to respond write_to: 'Write to:' common: - visit: 'Visit:' email_and_print_link: Sign up for emails or print this page print_link: Print this page + visit: 'Visit:' components: figure: image_credit: 'Image credit: %{credit}' @@ -65,8 +65,8 @@ en: is_being: is being not_open_yet: This consultation isn't open yet 'on': 'on' - 'or': 'or' opens: This consultation opens + or: or original_consultation: Original consultation ran_from: This consultation ran from respond_online: Respond online @@ -110,9 +110,6 @@ en: call_for_evidence_outcome: one: Call for evidence outcome other: Call for evidence outcomes - case_study: - one: Case study - other: Case studies closed_call_for_evidence: one: Closed call for evidence other: Closed calls for evidence @@ -467,7 +464,6 @@ en: zh-hk: Cantonese zh-tw: Traditional Chinese manuals: - summary_title: Summary breadcrumb_contents: Back to contents contents_list_breadcrumb_contents: Manual homepage contents_title: Contents @@ -478,6 +474,7 @@ en: previous_page: Previous page search_this_manual: Search this manual see_all_updates: See all updates + summary_title: Summary title: "%{title}Guidance" updated: Updated updates_amendments: published amendments @@ -489,8 +486,6 @@ en: previous_page: Previous print_entire_guide: View a printable version of the whole guide printable_version: Printable version - national_statistics: - logo_alt_text: national_statistics: logo_alt_text: Accredited official statistics publication: diff --git a/config/locales/es-419.yml b/config/locales/es-419.yml index db460ae65..4a8f98f54 100644 --- a/config/locales/es-419.yml +++ b/config/locales/es-419.yml @@ -110,9 +110,6 @@ es-419: call_for_evidence_outcome: one: other: - case_study: - one: Estudio de caso - other: Estudios de caso closed_call_for_evidence: one: other: diff --git a/config/locales/es.yml b/config/locales/es.yml index 2e8683753..572866f0d 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -110,9 +110,6 @@ es: call_for_evidence_outcome: one: other: - case_study: - one: Caso de estudio práctico - other: Casos de estudio práctico closed_call_for_evidence: one: other: diff --git a/config/locales/et.yml b/config/locales/et.yml index d4da72072..21fd2990c 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -110,9 +110,6 @@ et: call_for_evidence_outcome: one: other: - case_study: - one: Juhtumiuuring - other: Juhtumiuuringud closed_call_for_evidence: one: other: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 8654060b0..3df8e77d1 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -110,9 +110,6 @@ fa: call_for_evidence_outcome: one: other: - case_study: - one: مطالعه موردی - other: مطالعات موردی closed_call_for_evidence: one: other: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index e2580ac0a..221096690 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -110,9 +110,6 @@ fi: call_for_evidence_outcome: one: other: - case_study: - one: Tapaustutkimus - other: Tapaustutkimuksia closed_call_for_evidence: one: other: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 277be3c73..e91341642 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -110,9 +110,6 @@ fr: call_for_evidence_outcome: one: other: - case_study: - one: Etude de cas - other: Etudes de cas closed_call_for_evidence: one: other: diff --git a/config/locales/gd.yml b/config/locales/gd.yml index f8069be4f..395ae43b8 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -124,11 +124,6 @@ gd: one: other: two: - case_study: - few: - one: Cás-staidéir - other: Tuarascálacha staidéir - two: closed_call_for_evidence: few: one: diff --git a/config/locales/gu.yml b/config/locales/gu.yml index 61374b9dc..19f352471 100644 --- a/config/locales/gu.yml +++ b/config/locales/gu.yml @@ -110,9 +110,6 @@ gu: call_for_evidence_outcome: one: other: - case_study: - one: કેસ સ્ટડી - other: કેસ સ્ટડીઝ closed_call_for_evidence: one: other: diff --git a/config/locales/he.yml b/config/locales/he.yml index 0e1cd2696..351f9c544 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -110,9 +110,6 @@ he: call_for_evidence_outcome: one: other: - case_study: - one: מקרה בוחן - other: מקרי בוחן closed_call_for_evidence: one: other: diff --git a/config/locales/hi.yml b/config/locales/hi.yml index ff9d2c6de..6ba6e22a0 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -110,9 +110,6 @@ hi: call_for_evidence_outcome: one: other: - case_study: - one: विषय अध्ययन - other: विषय अध्ययन closed_call_for_evidence: one: other: diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 0d48e0009..468a3eb45 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -117,10 +117,6 @@ hr: few: one: other: - case_study: - few: - one: Studija slučaja - other: Studije slučaja closed_call_for_evidence: few: one: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 57fbcebf1..6f564e79c 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -110,9 +110,6 @@ hu: call_for_evidence_outcome: one: other: - case_study: - one: Esettanulmány - other: Esettanulmányok closed_call_for_evidence: one: other: diff --git a/config/locales/hy.yml b/config/locales/hy.yml index 183793791..f90a8e4e4 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -110,9 +110,6 @@ hy: call_for_evidence_outcome: one: other: - case_study: - one: Մասնավոր դեպքի ուսումնասիրություն - other: Մասնավոր դեպքի ուսումնասիրություններ closed_call_for_evidence: one: other: diff --git a/config/locales/id.yml b/config/locales/id.yml index 762c35aee..fc3351f1d 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -103,8 +103,6 @@ id: other: call_for_evidence_outcome: other: - case_study: - other: Studi kasus closed_call_for_evidence: other: closed_consultation: diff --git a/config/locales/is.yml b/config/locales/is.yml index 97b2183ef..cc39938e1 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -110,9 +110,6 @@ is: call_for_evidence_outcome: one: other: - case_study: - one: Ferilsathugun - other: Ferilsathuganir closed_call_for_evidence: one: other: diff --git a/config/locales/it.yml b/config/locales/it.yml index 33535722e..b14766d7b 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -110,9 +110,6 @@ it: call_for_evidence_outcome: one: other: - case_study: - one: Caso di studio - other: Casi di studio closed_call_for_evidence: one: other: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 571547eca..59da0a706 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -103,8 +103,6 @@ ja: other: call_for_evidence_outcome: other: - case_study: - other: ケーススタディ closed_call_for_evidence: other: closed_consultation: diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 3ceeba512..de0aaa90d 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -110,9 +110,6 @@ ka: call_for_evidence_outcome: one: other: - case_study: - one: შემთხვევის კვლევა - other: შემთხვევის კვლევები closed_call_for_evidence: one: other: diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 0e4e94809..4f689eabe 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -110,9 +110,6 @@ kk: call_for_evidence_outcome: one: other: - case_study: - one: Тақырыптық зерттеу - other: Тақырыптық зерттеулер closed_call_for_evidence: one: other: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 39672df1d..a86885bc5 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -103,8 +103,6 @@ ko: other: call_for_evidence_outcome: other: - case_study: - other: 사례 연구 closed_call_for_evidence: other: closed_consultation: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index f27fc1bfc..209c28b28 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -117,10 +117,6 @@ lt: few: one: other: - case_study: - few: - one: Atvejo analizė - other: Atvejų analizės closed_call_for_evidence: few: one: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index aa89efdb4..473742e24 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -110,9 +110,6 @@ lv: call_for_evidence_outcome: one: other: - case_study: - one: Piemērs - other: Piemēri closed_call_for_evidence: one: other: diff --git a/config/locales/ms.yml b/config/locales/ms.yml index fd20da470..0c709060f 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -103,8 +103,6 @@ ms: other: call_for_evidence_outcome: other: - case_study: - other: Kajian kes closed_call_for_evidence: other: closed_consultation: diff --git a/config/locales/mt.yml b/config/locales/mt.yml index ac764cb08..11dd490da 100644 --- a/config/locales/mt.yml +++ b/config/locales/mt.yml @@ -124,11 +124,6 @@ mt: many: one: other: - case_study: - few: - many: - one: Studju ta' Każ - other: Studju ta' Każijiet closed_call_for_evidence: few: many: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 93e8493f4..13595605b 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -110,9 +110,6 @@ ne: call_for_evidence_outcome: one: other: - case_study: - one: मामिला अध्ययन - other: मामिला अध्ययनहरू closed_call_for_evidence: one: other: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index a1557abef..dada5f23f 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -110,9 +110,6 @@ nl: call_for_evidence_outcome: one: other: - case_study: - one: Casestudy - other: Casestudies closed_call_for_evidence: one: other: diff --git a/config/locales/no.yml b/config/locales/no.yml index 497cfd84d..2b3c5524b 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -110,9 +110,6 @@ call_for_evidence_outcome: one: other: - case_study: - one: Casestudie - other: Casestudier closed_call_for_evidence: one: other: diff --git a/config/locales/pa-pk.yml b/config/locales/pa-pk.yml index 736a3094e..1323cf70f 100644 --- a/config/locales/pa-pk.yml +++ b/config/locales/pa-pk.yml @@ -110,9 +110,6 @@ pa-pk: call_for_evidence_outcome: one: other: - case_study: - one: کیس دی پڑھائی - other: کیس دی پڑھائی closed_call_for_evidence: one: other: diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 2c6c41cb3..fb0e1b80b 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -110,9 +110,6 @@ pa: call_for_evidence_outcome: one: other: - case_study: - one: ਕੇਸ ਅਧਿਐਨ - other: ਕੇਸ ਅਧਿਐਨ closed_call_for_evidence: one: other: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 76e388cd1..b4be7c24b 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -124,11 +124,6 @@ pl: many: one: other: - case_study: - few: - many: - one: Studium przypadku - other: Studia przypadku closed_call_for_evidence: few: many: diff --git a/config/locales/ps.yml b/config/locales/ps.yml index 244d3c7dc..b66126da0 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -110,9 +110,6 @@ ps: call_for_evidence_outcome: one: other: - case_study: - one: موردي مطالعه - other: موردي مطالعات closed_call_for_evidence: one: other: diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 88d167ece..c2177108b 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -110,9 +110,6 @@ pt: call_for_evidence_outcome: one: other: - case_study: - one: Estudo de caso - other: Estudos de caso closed_call_for_evidence: one: other: diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 35efc0325..5a05ea3a4 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -117,10 +117,6 @@ ro: few: one: other: - case_study: - few: - one: Studiu de caz - other: Studii de caz closed_call_for_evidence: few: one: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index c13f5e503..6b667765d 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -124,11 +124,6 @@ ru: many: one: other: - case_study: - few: - many: - one: Причинный анализ - other: Причинные анализы closed_call_for_evidence: few: many: diff --git a/config/locales/si.yml b/config/locales/si.yml index 6f896f0f5..417b2ee9d 100644 --- a/config/locales/si.yml +++ b/config/locales/si.yml @@ -110,9 +110,6 @@ si: call_for_evidence_outcome: one: other: - case_study: - one: සිද්ධි අධ්යයනය - other: සිද්ධි අධ්යයන closed_call_for_evidence: one: other: diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 4a86c644e..ffc70a7df 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -117,10 +117,6 @@ sk: few: one: other: - case_study: - few: - one: Prípadová štúdia - other: Prípadové štúdie closed_call_for_evidence: few: one: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 47aada8f8..735b733d0 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -124,11 +124,6 @@ sl: one: other: two: - case_study: - few: - one: Študija primera - other: Študije primera - two: closed_call_for_evidence: few: one: diff --git a/config/locales/so.yml b/config/locales/so.yml index 6271ef530..ecc0808a3 100644 --- a/config/locales/so.yml +++ b/config/locales/so.yml @@ -110,9 +110,6 @@ so: call_for_evidence_outcome: one: other: - case_study: - one: Daraasad - other: Daraasado closed_call_for_evidence: one: other: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index ca06a7313..baaf24e25 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -110,9 +110,6 @@ sq: call_for_evidence_outcome: one: other: - case_study: - one: Rast studimi - other: Raste studimi closed_call_for_evidence: one: other: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index cb358c6df..e0e68b3d7 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -117,10 +117,6 @@ sr: few: one: other: - case_study: - few: - one: Studija slučaja - other: Studije slučaja closed_call_for_evidence: few: one: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 32428e38d..5e1092afe 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -110,9 +110,6 @@ sv: call_for_evidence_outcome: one: other: - case_study: - one: Fallstudie - other: Fallstudier closed_call_for_evidence: one: other: diff --git a/config/locales/sw.yml b/config/locales/sw.yml index 0e972db71..25d6a9839 100644 --- a/config/locales/sw.yml +++ b/config/locales/sw.yml @@ -110,9 +110,6 @@ sw: call_for_evidence_outcome: one: other: - case_study: - one: Uchunguzi kifani - other: Uchunguzi kifani closed_call_for_evidence: one: other: diff --git a/config/locales/ta.yml b/config/locales/ta.yml index 2163b079e..dab00db29 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -110,9 +110,6 @@ ta: call_for_evidence_outcome: one: other: - case_study: - one: நிகழ்வு ஆய்வு - other: நிகழ்வு ஆய்வுகள் closed_call_for_evidence: one: other: diff --git a/config/locales/th.yml b/config/locales/th.yml index e47331f0c..4d7ed92c9 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -103,8 +103,6 @@ th: other: call_for_evidence_outcome: other: - case_study: - other: กรณีศึกษา closed_call_for_evidence: other: closed_consultation: diff --git a/config/locales/tk.yml b/config/locales/tk.yml index 304fcfed6..f93f684cd 100644 --- a/config/locales/tk.yml +++ b/config/locales/tk.yml @@ -110,9 +110,6 @@ tk: call_for_evidence_outcome: one: other: - case_study: - one: Ýagdaý seljermesi - other: Ýagdaý seljermeleri closed_call_for_evidence: one: other: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index c146de6d4..23361da71 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -110,9 +110,6 @@ tr: call_for_evidence_outcome: one: other: - case_study: - one: Vaka incelemesi - other: Vaka incelemeleri closed_call_for_evidence: one: other: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 9773484d8..ccb6473d5 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -124,11 +124,6 @@ uk: many: one: other: - case_study: - few: - many: - one: Аналіз ситуації - other: Аналізи ситуації closed_call_for_evidence: few: many: diff --git a/config/locales/ur.yml b/config/locales/ur.yml index 7b18feeea..f0771847e 100644 --- a/config/locales/ur.yml +++ b/config/locales/ur.yml @@ -110,9 +110,6 @@ ur: call_for_evidence_outcome: one: other: - case_study: - one: کیس اسٹڈی - other: کیس اسٹڈیز closed_call_for_evidence: one: other: diff --git a/config/locales/uz.yml b/config/locales/uz.yml index 36097cb77..8a497f51d 100644 --- a/config/locales/uz.yml +++ b/config/locales/uz.yml @@ -110,9 +110,6 @@ uz: call_for_evidence_outcome: one: other: - case_study: - one: Ҳолатларнинг таҳлили - other: Ҳолатларнинг таҳлиллари closed_call_for_evidence: one: other: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 18e223878..819521078 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -103,8 +103,6 @@ vi: other: call_for_evidence_outcome: other: - case_study: - other: Nghiên cứu điển hình closed_call_for_evidence: other: closed_consultation: diff --git a/config/locales/yi.yml b/config/locales/yi.yml index e7109197b..0adb97327 100644 --- a/config/locales/yi.yml +++ b/config/locales/yi.yml @@ -110,9 +110,6 @@ yi: call_for_evidence_outcome: one: other: - case_study: - one: - other: closed_call_for_evidence: one: other: diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml index 9e8ccacf8..915c2aaaf 100644 --- a/config/locales/zh-hk.yml +++ b/config/locales/zh-hk.yml @@ -103,8 +103,6 @@ zh-hk: other: call_for_evidence_outcome: other: - case_study: - other: 案例研究 closed_call_for_evidence: other: closed_consultation: diff --git a/config/locales/zh-tw.yml b/config/locales/zh-tw.yml index c3380c965..64664622d 100644 --- a/config/locales/zh-tw.yml +++ b/config/locales/zh-tw.yml @@ -103,8 +103,6 @@ zh-tw: other: call_for_evidence_outcome: other: - case_study: - other: 案例分析 closed_call_for_evidence: other: closed_consultation: diff --git a/config/locales/zh.yml b/config/locales/zh.yml index f0e5eb99b..eb5721c3d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -103,8 +103,6 @@ zh: other: call_for_evidence_outcome: other: - case_study: - other: 案例研究 closed_call_for_evidence: other: closed_consultation: diff --git a/test/controllers/content_items_controller_test.rb b/test/controllers/content_items_controller_test.rb index d7be54947..9f81eb3fb 100644 --- a/test/controllers/content_items_controller_test.rb +++ b/test/controllers/content_items_controller_test.rb @@ -83,7 +83,7 @@ class ContentItemsControllerTest < ActionController::TestCase test "returns a 406 for XMLHttpRequests without an Accept header set to a supported format" do request.headers["X-Requested-With"] = "XMLHttpRequest" - content_item = content_store_has_schema_example("case_study", "case_study") + content_item = content_store_has_schema_example("guide", "guide") get :show, params: { @@ -95,7 +95,7 @@ class ContentItemsControllerTest < ActionController::TestCase test "returns a 406 for unsupported format requests, eg text/javascript" do request.headers["Accept"] = "text/javascript" - content_item = content_store_has_schema_example("case_study", "case_study") + content_item = content_store_has_schema_example("guide", "guide") get :show, params: { @@ -129,11 +129,11 @@ class ContentItemsControllerTest < ActionController::TestCase test "with the GraphQL feature flag enabled does not get item from GraphQL if it is not a news article" do Features.stubs(:graphql_feature_enabled?).returns(true) - content_item = content_store_has_schema_example("case_study", "case_study") + content_item = content_store_has_schema_example("guide", "guide") base_path = path_for(content_item) graphql_fixture = fetch_graphql_fixture("news_article") - graphql_fixture["data"]["edition"]["schema_name"] = "case_study" + graphql_fixture["data"]["edition"]["schema_name"] = "guide" stub_publishing_api_graphql_content_item(Graphql::EditionQuery.new("/#{base_path}").query, graphql_fixture) get :show, @@ -151,7 +151,7 @@ class ContentItemsControllerTest < ActionController::TestCase end test "gets item from content store" do - content_item = content_store_has_schema_example("case_study", "case_study") + content_item = content_store_has_schema_example("guide", "guide") get :show, params: { path: path_for(content_item) } assert_response :success @@ -159,11 +159,11 @@ class ContentItemsControllerTest < ActionController::TestCase end test "sets prometheus labels on the rack env" do - content_item = content_store_has_schema_example("case_study", "case_study") + content_item = content_store_has_schema_example("guide", "guide") get :show, params: { path: path_for(content_item) } assert_response :success - assert_equal @request.env["govuk.prometheus_labels"], { document_type: "case_study", schema_name: "case_study" } + assert_equal @request.env["govuk.prometheus_labels"], { document_type: "guide", schema_name: "guide" } end test "gets item from content store and keeps existing ordered_related_items when links already exist" do @@ -188,7 +188,7 @@ class ContentItemsControllerTest < ActionController::TestCase end test "gets item from content store and replaces ordered_related_items there are no existing links or overrides" do - content_item = content_store_has_schema_example("case_study", "case_study") + content_item = content_store_has_schema_example("guide", "guide") get :show, params: { path: path_for(content_item) } assert_response :success @@ -198,7 +198,7 @@ class ContentItemsControllerTest < ActionController::TestCase end test "sets the expiry as sent by content-store" do - content_item = content_store_has_schema_example("case_study", "case_study") + content_item = content_store_has_schema_example("guide", "guide") stub_content_store_has_item(content_item["base_path"], content_item, max_age: 20) get :show, params: { path: path_for(content_item) } @@ -207,7 +207,7 @@ class ContentItemsControllerTest < ActionController::TestCase end test "honours cache-control private items" do - content_item = content_store_has_schema_example("case_study", "case_study") + content_item = content_store_has_schema_example("guide", "guide") stub_content_store_has_item(content_item["base_path"], content_item, private: true) get :show, params: { path: path_for(content_item) } @@ -216,9 +216,9 @@ class ContentItemsControllerTest < ActionController::TestCase end test "renders translated content items in their locale" do - content_item = content_store_has_schema_example("case_study", "translated") + content_item = content_store_has_schema_example("guide", "translated") locale = content_item["locale"] - translated_schema_name = I18n.t("content_item.schema_name.case_study", count: 1, locale:) + translated_schema_name = I18n.t("content_item.schema_name.guide", count: 1, locale:) get :show, params: { path: path_for(content_item, locale), locale: } @@ -236,7 +236,7 @@ class ContentItemsControllerTest < ActionController::TestCase end test "gets item from content store even when url contains multi-byte UTF8 character" do - content_item = content_store_has_schema_example("case_study", "case_study") + content_item = content_store_has_schema_example("guide", "guide") utf8_path = "government/case-studies/caf\u00e9-culture" content_item["base_path"] = "/#{utf8_path}" @@ -308,7 +308,7 @@ class ContentItemsControllerTest < ActionController::TestCase end test "sets GOVUK-Account-Session-Flash in the Vary header" do - content_item = content_store_has_schema_example("case_study", "case_study") + content_item = content_store_has_schema_example("guide", "guide") get :show, params: { path: path_for(content_item) } assert response.headers["Vary"].include?("GOVUK-Account-Session-Flash") diff --git a/test/integration/case_study_test.rb b/test/integration/case_study_test.rb deleted file mode 100644 index 721b26c7c..000000000 --- a/test/integration/case_study_test.rb +++ /dev/null @@ -1,34 +0,0 @@ -require "test_helper" - -class CaseStudyTest < ActionDispatch::IntegrationTest - test "random but valid items do not error" do - setup_and_visit_random_content_item - end - - test "translated case study" do - setup_and_visit_content_item("translated") - - assert_has_component_title(@content_item["title"]) - assert page.has_text?(@content_item["description"]) - - assert page.has_css?(".gem-c-translation-nav") - end - - test "withdrawn case study" do - setup_and_visit_content_item("archived") - - assert_has_component_title(@content_item["title"]) - assert page.has_text?(@content_item["description"]) - - within ".gem-c-notice" do - assert page.has_text?("This case study was withdrawn"), "is withdrawn" - assert page.has_text?("We’ve withdrawn this case study and published newer") - assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") - end - end - - test "does not render with the single page notification button" do - setup_and_visit_content_item("translated") - assert_not page.has_css?(".gem-c-single-page-notification-button") - end -end diff --git a/test/presenters/case_study_presenter_test.rb b/test/presenters/case_study_presenter_test.rb deleted file mode 100644 index fe5cb2224..000000000 --- a/test/presenters/case_study_presenter_test.rb +++ /dev/null @@ -1,107 +0,0 @@ -require "presenter_test_helper" - -class CaseStudyPresenterTest < PresenterTestCase - include ActionView::Helpers::UrlHelper - - def schema_name - "case_study" - end - - test "presents the basic details of a content item" do - assert_equal schema_item["description"], presented_item.description - assert_equal schema_item["schema_name"], presented_item.schema_name - assert_equal schema_item["locale"], presented_item.locale - assert_equal schema_item["title"], presented_item.title - assert_equal schema_item["details"]["body"], presented_item.body - end - - test "#published returns a formatted date of the day the content item became public" do - assert_equal "17 December 2012", presented_item.published - end - - test "#updated returns nil if the content item has no updates" do - assert_nil presented_item.updated - end - - test "#updated returns a formatted date of the last day the content item was updated" do - assert_equal "21 March 2013", presented_case_study_with_updates.updated - end - - test "#from returns links to lead organisations, supporting organisations and worldwide organisations" do - with_organisations = { - "details" => { - "emphasised_organisations" => %w[b56753d2-ae3f-480e-88b0-35b1934dfc5a], - }, - "links" => { - "worldwide_organisations" => [{ "title" => "DFID Pakistan", "base_path" => "/government/world/organisations/dfid-pakistan" }], - "organisations" => [ - { "title" => "Supporting org", "base_path" => "/orgs/supporting", "content_id" => "dc2beab0-4ee9-41e0-9a6f-9c586d50fa7e" }, - { "title" => "Lead org", "base_path" => "/orgs/lead", "content_id" => "b56753d2-ae3f-480e-88b0-35b1934dfc5a" }, - ], - }, - } - - expected_from_links = [ - link_to("Lead org", "/orgs/lead", class: "govuk-link"), - link_to("Supporting org", "/orgs/supporting", class: "govuk-link"), - link_to("DFID Pakistan", "/government/world/organisations/dfid-pakistan", class: "govuk-link"), - ] - - assert_equal expected_from_links, presented_item(schema_name, with_organisations).from - end - - test "#part_of returns an array of document_collections, related policies and world locations" do - with_extras = schema_item - with_extras["links"]["document_collections"] = [ - { "title" => "Work Programme real life stories", "base_path" => "/government/collections/work-programme-real-life-stories" }, - ] - with_extras["links"]["related_policies"] = [ - { "title" => "Cheese", "base_path" => "/policy/cheese" }, - ] - - expected_part_of_links = [ - link_to("Work Programme real life stories", "/government/collections/work-programme-real-life-stories", class: "govuk-link"), - link_to("Cheese", "/policy/cheese", class: "govuk-link"), - link_to("Pakistan", "/world/pakistan/news", class: "govuk-link"), - ] - assert_equal expected_part_of_links, presented_item(schema_name, with_extras).part_of - end - - test "#history returns an empty array if the content item has no updates" do - assert_equal [], presented_item.history - end - - test "#history returns a formatted history if the content item has updates" do - expected_history = [ - { display_time: "21 March 2013", note: "Something changed", timestamp: "2013-03-21 00:00:00 +0000" }, - ] - - assert_equal expected_history, presented_case_study_with_updates.history - end - - test "#history returns an empty array if the content item is not published" do - never_published = schema_item - never_published["details"].delete("first_public_at") - presented = create_presenter(CaseStudyPresenter, content_item: never_published) - assert_equal [], presented.history - end - - test "presents withdrawn notices" do - example = schema_item("archived") - presented = presented_item("archived") - - assert example.include?("withdrawn_notice") - assert presented.withdrawn? - assert_equal example["withdrawn_notice"]["explanation"], presented.withdrawal_notice_component[:description_govspeak] - assert_equal '', presented.withdrawal_notice_component[:time] - end - - def presented_case_study_with_updates - updated_date = Time.zone.local(2013, 3, 21).to_s - with_history = schema_item - with_history["details"]["change_history"] = [{ "note" => "Something changed", "public_timestamp" => updated_date }] - with_history["public_updated_at"] = updated_date - - presented_item(schema_name, with_history) - end -end diff --git a/test/support/govuk_content_schema_examples.rb b/test/support/govuk_content_schema_examples.rb index d143b76a4..1bb77e421 100644 --- a/test/support/govuk_content_schema_examples.rb +++ b/test/support/govuk_content_schema_examples.rb @@ -43,7 +43,6 @@ def all_examples_for_supported_schemas def supported_schemas %w[ - case_study html_publication service_manual_guide service_manual_homepage