diff --git a/README.md b/README.md index 18ea6d53f..2bb48afeb 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,6 @@ Not all schemas that this app can handle are rendered by it in production. | Topical event about page | [View on GOV.UK](https://www.gov.uk/government/topical-events/2014-overseas-territories-joint-ministerial-council/about) | Migrated | | Travel advice | [View on GOV.UK](https://www.gov.uk/foreign-travel-advice/nepal) | Migrated | | Unpublishing | | Rendered by Whitehall, might not be migrated | -| World Location News Article | [View on GOV.UK](https://www.gov.uk/government/world-location-news/changes-to-secure-english-language-test-providers-for-uk-visas) | Migrated | | Working group | [View on GOV.UK](https://www.gov.uk/government/groups/abstraction-reform) | Migrated | ## Technical documentation diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index fb9fe8789..c8387a519 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -82,7 +82,6 @@ $govuk-include-default-font-face: false; @import "views/statistical-data-set"; @import "views/consultation"; @import "views/speech"; -@import "views/world-location-news-article"; @import "views/news-article"; @import "views/corporate-information-page"; @import "views/travel-advice"; diff --git a/app/assets/stylesheets/views/_world-location-news-article.scss b/app/assets/stylesheets/views/_world-location-news-article.scss deleted file mode 100644 index 50573d257..000000000 --- a/app/assets/stylesheets/views/_world-location-news-article.scss +++ /dev/null @@ -1,8 +0,0 @@ -.world-location-news-article { - @include sidebar-with-body; - - .direction-rtl & { - direction: rtl; - text-align: start; - } -} diff --git a/app/controllers/development_controller.rb b/app/controllers/development_controller.rb index 0ccaa76ed..e7668ca67 100644 --- a/app/controllers/development_controller.rb +++ b/app/controllers/development_controller.rb @@ -25,8 +25,7 @@ def index take_part topical_event_about_page travel_advice - working_group - world_location_news_article] + working_group] @paths = YAML.load_file(Rails.root.join("config/govuk_examples.yml")) end diff --git a/app/presenters/world_location_news_article_presenter.rb b/app/presenters/world_location_news_article_presenter.rb deleted file mode 100644 index ebff2faed..000000000 --- a/app/presenters/world_location_news_article_presenter.rb +++ /dev/null @@ -1,10 +0,0 @@ -class WorldLocationNewsArticlePresenter < ContentItemPresenter - include ContentItem::Body - include ContentItem::Political - include ContentItem::Linkable - include ContentItem::Updatable - include ContentItem::Shareable - include ContentItem::TitleAndContext - include ContentItem::Metadata - include ContentItem::NewsImage -end diff --git a/app/views/content_items/world_location_news_article.html.erb b/app/views/content_items/world_location_news_article.html.erb deleted file mode 100644 index d097cbcfc..000000000 --- a/app/views/content_items/world_location_news_article.html.erb +++ /dev/null @@ -1,57 +0,0 @@ -<% content_for :extra_head_content do %> - <%= machine_readable_metadata( - schema: :news_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' %> -<%= render 'shared/history_notice', content_item: @content_item %> -<%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> - -
-
-
-
- <%= 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 'govuk_publishing_components/components/share_links', - links: @content_item.share_links, - track_as_sharing: true, - title: t('components.share_links.share_this_page') - %> -
- - <%= 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 d0766050c..b23b245db 100644 --- a/config/govuk_examples.yml +++ b/config/govuk_examples.yml @@ -195,14 +195,3 @@ working_group_7: '/government/groups/veterans-welfare-service' working_group_8: '/government/groups/uk-national-screening-committee-uk-nsc' working_group_9: '/government/groups/uk-council-for-child-internet-safety-ukccis' -# Most visited WLNA (2 March 2017) -world_location_news_article_1: /government/world-location-news/youth-mobility-scheme-2017-for-japanese-nationals.ja -world_location_news_article_2: /government/world-location-news/youth-mobility-scheme-2017-for-taiwanese-youth--2.zh-tw -world_location_news_article_3: /government/world-location-news/rear-admiral-simon-ancona-uk-acdsde-visit-to-thailand-13-14-october -world_location_news_article_4: /government/world-location-news/changes-for-settlement-visa-applications-submitted-in-pakistan -world_location_news_article_5: /government/world-location-news/264303.es -world_location_news_article_6: /government/world-location-news/applications-for-chevening-scholarships-open-3-august-in-thailand.th -world_location_news_article_7: /government/world-location-news/new-round-for-uk-bilateral-projects-programme-2017-2018-to-accept-bids-in-russia.ru -world_location_news_article_8: /government/world-location-news/youth-mobility-scheme-2017-for-taiwanese-youth--2 -world_location_news_article_9: /government/world-location-news/changes-to-the-visa-service-in-russia--2 -world_location_news_article_10: /government/world-location-news/changes-to-uk-visa-requirements-for-venezuelan-nationals.es-419 diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 8f102b21d..c32165fc0 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -569,13 +569,6 @@ ar: other: قرارات محكمة الاستئناف الإدارية two: zero: - world_location_news_article: - few: - many: - one: مقال إخباري - other: مقالات إخبارية - two: - zero: world_news_story: few: many: diff --git a/config/locales/az.yml b/config/locales/az.yml index 509f15950..fffac1556 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -281,9 +281,6 @@ az: utaac_decision: one: İnzibati şikayətlər üzrə məhkəmə kollegiyası qərarı other: İnzibati şikayətlər üzrə məhkəmə kollegiyası qərarları - world_location_news_article: - one: Xəbərləri əks etdirən məqalə - other: Xəbərləri əks etdirən məqalələr world_news_story: one: Dünya üzrə xəbərləri əks etdirən material other: Dünya üzrə xəbərləri əks etdirən materiallar diff --git a/config/locales/be.yml b/config/locales/be.yml index d55826934..ab2ded3ff 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -425,11 +425,6 @@ be: many: one: Пастанова адміністрацыйнага апеляцыйнага трыбунала other: Пастановы адміністрацыйнага апеляцыйнага трыбунала - world_location_news_article: - few: - many: - one: Артыкул - other: Артыкулы world_news_story: few: many: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 63e8fb83f..2453b8213 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -281,9 +281,6 @@ bg: utaac_decision: one: Решение на административния апелативен съд other: Решения на апелативния съд по трудови спорове - world_location_news_article: - one: Информационна статия - other: Информационни статии world_news_story: one: Световна новина other: Световни новини diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 9a0448682..9737c990c 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -281,9 +281,6 @@ bn: utaac_decision: one: প্রশাসনিক আপীল ট্রাইব্যুনালের সিদ্ধান্ত other: প্রশাসনিক আপীল ট্রাইব্যুনালের সিদ্ধান্তসমূহ - world_location_news_article: - one: সংবাদের নিবন্ধ - other: সংবাদের নিবন্ধসমূহ world_news_story: one: বিশ্ব সংবাদের বিষয়বস্তু other: বিশ্ব সংবাদের বিষয়বস্তুসমূহ diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 06dfc6212..841bab67e 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -353,10 +353,6 @@ cs: few: one: Rozhodnutí odvolacího správního soudu other: Rozhodnutí odvolacího správního soudu - world_location_news_article: - few: - one: Zpravodajský článek - other: Zpravodajské články world_news_story: few: one: Zprávy ze světa diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 2d45298c2..7d6758cb4 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -569,13 +569,6 @@ cy: other: Penderfyniadau'r tribiwnlys apeliadau gweinyddol two: zero: - world_location_news_article: - few: - many: - one: Erthygl newyddion - other: Erthyglau newyddion - two: - zero: world_news_story: few: many: diff --git a/config/locales/da.yml b/config/locales/da.yml index 4c1440fd4..3ba7234b3 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -293,9 +293,6 @@ da: other: |- Afgørelser om forvaltningsappelsager Nyhedsartikel - world_location_news_article: - one: Nyhedsartikel - other: Nyhedsartikler world_news_story: one: Verdensomspændende nyhedshistorie other: Verdensomspændende nyhedshistorier diff --git a/config/locales/de.yml b/config/locales/de.yml index 8b7d0cf43..b9a8ee209 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -281,9 +281,6 @@ de: utaac_decision: one: Entscheidung des Verwaltungsberufungsgerichts other: Entscheidungen des Verwaltungsberufungsgerichts - world_location_news_article: - one: Nachrichtenartikel - other: Nachrichtenartikel world_news_story: one: Weltnachrichten Geschichte other: Weltnachrichten Geschichten diff --git a/config/locales/dr.yml b/config/locales/dr.yml index e091fcb74..81a82eaac 100644 --- a/config/locales/dr.yml +++ b/config/locales/dr.yml @@ -281,9 +281,6 @@ dr: utaac_decision: one: تصمیم دادگاه استیناف اداری other: تصامیم دادگاه استیناف اداری - world_location_news_article: - one: مقاله خبری - other: مقالات خبری world_news_story: one: گزارش خبری جهان other: گزارشات خبری جهان diff --git a/config/locales/el.yml b/config/locales/el.yml index 1a54cd15d..8ac2d4ec6 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -281,9 +281,6 @@ el: utaac_decision: one: Απόφαση του δικαστηρίου διοικητικών προσφυγών other: Αποφάσεις του δικαστηρίου διοικητικών προσφυγών - world_location_news_article: - one: Άρθρο ειδήσεων - other: Άρθρα ειδήσεων world_news_story: one: Ιστορία παγκόσμιων ειδήσεων other: Ιστορίες παγκόσμιων ειδήσεων diff --git a/config/locales/en.yml b/config/locales/en.yml index 2c20b1a31..4cdc7afa6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -281,9 +281,6 @@ en: utaac_decision: one: Administrative appeals tribunal decision other: Administrative appeals tribunal decisions - world_location_news_article: - one: News article - other: News articles world_news_story: one: World news story other: World news stories diff --git a/config/locales/es-419.yml b/config/locales/es-419.yml index fcc8c5941..dd6eccc7b 100644 --- a/config/locales/es-419.yml +++ b/config/locales/es-419.yml @@ -281,9 +281,6 @@ es-419: utaac_decision: one: Decisión del tribunal de apelación administrativa other: Decisión del tribunal de apelación administrativa - world_location_news_article: - one: Artículo de prensa - other: Artículos de prensa world_news_story: one: Noticia del mundo other: Noticias mundiales diff --git a/config/locales/es.yml b/config/locales/es.yml index b1703136a..e18c2ff25 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -281,9 +281,6 @@ es: utaac_decision: one: Decisión del tribunal de apelación administrativa other: Decisiones del tribunal de apelación administrativa - world_location_news_article: - one: Artículo - other: Artículos world_news_story: one: Noticia internacional other: Noticias internacionales diff --git a/config/locales/et.yml b/config/locales/et.yml index ff41237f2..4b91a142c 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -281,9 +281,6 @@ et: utaac_decision: one: Halduskaebuste kohtuotsus other: Halduskaebuste kohtuotsus - world_location_news_article: - one: Uudiste artikkel - other: Uudiste artiklid world_news_story: one: Maailma uudislugu other: Maailma uudislood diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 3faee9be7..d875cefe0 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -281,9 +281,6 @@ fa: utaac_decision: one: حکم دادگاه تجدید نظر اداری other: احکام دادگاه تجدید نظر اداری - world_location_news_article: - one: مقاله خبری - other: مقالات خبری world_news_story: one: گزارش خبری جهانی other: گزارشات خبری جهانی diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 33538315c..e3ef7ee72 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -281,9 +281,6 @@ fi: utaac_decision: one: Hallinnollisen muutoksenhakutuomioistuimen päätös other: Hallinnollisen muutoksenhakutuomioistuimen päätökset - world_location_news_article: - one: Uutisartikkeli - other: Uutisartikkelit world_news_story: one: Maailman uutinen other: Maailman uutisia diff --git a/config/locales/fr.yml b/config/locales/fr.yml index d08da08df..5bc08e639 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -281,9 +281,6 @@ fr: utaac_decision: one: Décision du tribunal administratif d'appel other: Décisions du tribunal administratif d'appel - world_location_news_article: - one: Article d'actualité - other: Articles d'actualité world_news_story: one: Actualité du monde other: Actualités du monde diff --git a/config/locales/gd.yml b/config/locales/gd.yml index b45a5ad05..cc1924350 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -425,11 +425,6 @@ gd: one: Cinneadh an Bhinse Achomhairc Riaracháin other: Cinntí na cúirte achomhairc riaracháin two: - world_location_news_article: - few: - one: Airteagal Nuachta - other: Airteagal Nuachta - two: world_news_story: few: one: Alt nuachta domhanda diff --git a/config/locales/gu.yml b/config/locales/gu.yml index def94b029..cfd60a0b0 100644 --- a/config/locales/gu.yml +++ b/config/locales/gu.yml @@ -281,9 +281,6 @@ gu: utaac_decision: one: વહીવટી અપીલ્સ ટ્રિબ્યુનલનો નિર્ણય other: વહીવટી અપીલ્સ ટ્રિબ્યુનલના નિર્ણયો - world_location_news_article: - one: ન્યૂઝ આર્ટિકલ - other: ન્યૂઝ આર્ટિકલ્સ world_news_story: one: વૈશ્વિક ન્યૂઝ સ્ટોરી other: વૈશ્વિક ન્યૂઝ સ્ટોરીઝ diff --git a/config/locales/he.yml b/config/locales/he.yml index b130e1305..664f3c9e0 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -281,9 +281,6 @@ he: utaac_decision: one: החלטת בית הדין לעררים מנהלית other: החלטות בית הדין לעררים מנהלית - world_location_news_article: - one: מאמר חדשות - other: מאמרי חדשות world_news_story: one: חדשות עולמי other: 'חדשות עולמיים ' diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 5baedc5d9..e65edd502 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -281,9 +281,6 @@ hi: utaac_decision: one: प्रशासनिक निवेदन न्यायाधिकरण का फैसला other: प्रशासनिक निवेदन न्यायाधिकरण के फैसले - world_location_news_article: - one: समाचार लेख - other: समाचार लेख world_news_story: one: विश्व की समाचार कथा other: विश्व की समाचार कथाएं diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 0aec67d24..6a11aa578 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -353,10 +353,6 @@ hr: few: one: Odluka upravnog žalbenog suda other: Odluke upravnog žalbenog suda - world_location_news_article: - few: - one: Novinski članak - other: Novinski članci world_news_story: few: one: Vijest iz svijeta diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 0c83b1b70..a7c51c111 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -281,9 +281,6 @@ hu: utaac_decision: one: Adminisztratív fellebbezéssel kapcsolatos bírósági ítélet other: Adminisztratív fellebbezéssel kapcsolatos bírósági ítéletek - world_location_news_article: - one: Cikk - other: Cikkek world_news_story: one: Nemzetközi hír other: Nemzetközi hírek diff --git a/config/locales/hy.yml b/config/locales/hy.yml index 12f0b2985..fb9892576 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -281,9 +281,6 @@ hy: utaac_decision: one: Վարչական բողոքների համար տրիբունալի որոշում other: Վարչական բողոքների համար տրիբունալի որոշումներ - world_location_news_article: - one: Տեղեկատվական հոդված - other: Տեղեկատվական հոդվածներ world_news_story: one: Համաշխարհային տեղեկատվական նյութ other: Համաշխարհային տեղեկատվական նյութեր diff --git a/config/locales/id.yml b/config/locales/id.yml index f98a8beae..c0536359d 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -209,8 +209,6 @@ id: other: Data transparansi utaac_decision: other: Keputusan persidangan banding administratif - world_location_news_article: - other: Artikel berita world_news_story: other: Cerita berita dunia written_statement: diff --git a/config/locales/is.yml b/config/locales/is.yml index dca5bacbb..ff788d01f 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -281,9 +281,6 @@ is: utaac_decision: one: Úrskurður stjórnsýslulegs áfrýjunardómstóls other: Úrskurðir stjórnsýslulegs áfrýjunardómstóls - world_location_news_article: - one: Fréttagrein - other: Fréttagreinar world_news_story: one: Heimsfrétt other: Heimsfréttir diff --git a/config/locales/it.yml b/config/locales/it.yml index e58d8151d..94778986c 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -281,9 +281,6 @@ it: utaac_decision: one: Decisione del tribunale di appello amministrativo other: Decisioni del tribunale di appello amministrativo - world_location_news_article: - one: Articolo di notizie - other: Articoli di notizie world_news_story: one: Storia di notizie dal mondo other: Storie di notizie dal mondo diff --git a/config/locales/ja.yml b/config/locales/ja.yml index b0b5fba7b..d8821968f 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -209,8 +209,6 @@ ja: other: 透明性データ utaac_decision: other: 行政控訴審判所（Administrative appeals tribunal decision）の決定 - world_location_news_article: - other: ニュース記事 world_news_story: other: 世界のニュース記事 written_statement: diff --git a/config/locales/ka.yml b/config/locales/ka.yml index efee18299..4496933ad 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -281,9 +281,6 @@ ka: utaac_decision: one: ადმინისტრაციული სააპელაციო სასამართლოს გადაწყვეტილება other: ადმინისტრაციული სააპელაციო სასამართლოს გადაწყვეტილებები - world_location_news_article: - one: ახალი ამბების სტატია - other: ახალი ამბების სტატიები world_news_story: one: მსოფლიო ამბავი other: მსოფლიო ამბები diff --git a/config/locales/kk.yml b/config/locales/kk.yml index bafc72138..2837113ea 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -281,9 +281,6 @@ kk: utaac_decision: one: Әкімшілік аппеляциялық сот шешімі other: Әкімшілік аппеляциялық сот шешімдері - world_location_news_article: - one: Жаңалықтар мақаласы - other: Жаңалықтар мақалалары world_news_story: one: Әлемдегі жаңалықтар оқиғасы other: Әлемдегі жаңалықтар оқиғалары diff --git a/config/locales/ko.yml b/config/locales/ko.yml index d0f2568e9..a5442ae1b 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -209,8 +209,6 @@ ko: other: 투명성 데이터 utaac_decision: other: 행정 항소심판 법원 판결 - world_location_news_article: - other: 뉴스 기사 world_news_story: other: 세계 뉴스 스토리 written_statement: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 8edf5b9b4..fb61b2e39 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -353,10 +353,6 @@ lt: few: one: Administracinių bylų apeliacijų tribunolo sprendimas other: Administracinių bylų apeliacijų tribunolo sprendimai - world_location_news_article: - few: - one: Straipsnis - other: Straipsniai world_news_story: few: one: Pasaulio naujienos diff --git a/config/locales/lv.yml b/config/locales/lv.yml index ffb72dadb..543f85d58 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -281,9 +281,6 @@ lv: utaac_decision: one: Administratīvo lietu apelācijas tiesas lēmums other: Administratīvo lietu apelācijas tiesas lēmumi - world_location_news_article: - one: Raksts - other: Raksti world_news_story: one: Pasaules ziņa other: Pasaules ziņas diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 4acd3711a..eba0e06c8 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -209,8 +209,6 @@ ms: other: Data ketelusan utaac_decision: other: Keputusan tribunal rayuan pentadbiran - world_location_news_article: - other: Artikel berita world_news_story: other: Berita dunia written_statement: diff --git a/config/locales/mt.yml b/config/locales/mt.yml index aebede272..4df46c2b0 100644 --- a/config/locales/mt.yml +++ b/config/locales/mt.yml @@ -425,11 +425,6 @@ mt: many: one: Deċiżjoni tal-qorti dwar appelli amministrattivi other: Deċiżjonijiet tal-qorti dwar appelli amministrattivi - world_location_news_article: - few: - many: - one: Artiklu bl-aħbarijiet - other: Artikli bl-aħbarijiet world_news_story: few: many: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 3b9dc2613..655708b0d 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -281,9 +281,6 @@ ne: utaac_decision: one: प्रशासनिक अपील न्यायाधिकरण निर्णय other: प्रशासनिक अपील न्यायाधिकरण निर्णयहरू - world_location_news_article: - one: समाचार लेख - other: समाचार लेखहरू world_news_story: one: विश्व समाचार कथा other: विश्व समाचार कथाहरु diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 706c29cf6..c0e02a376 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -281,9 +281,6 @@ nl: utaac_decision: one: Beslissing van de rechtbank voor administratief beroep other: Beslissingen van de rechtbank voor administratief beroep - world_location_news_article: - one: Nieuwsartikel - other: Nieuwsartikelen world_news_story: one: Wereldnieuwsbericht other: Wereldnieuwsberichten diff --git a/config/locales/no.yml b/config/locales/no.yml index 310eb4f34..dd5ac7e74 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -281,9 +281,6 @@ utaac_decision: one: Administrativ ankenemndavgjørelse other: Administrative ankenemndavgjørelser - world_location_news_article: - one: Nyhetsartikkel - other: Nyhetsartikler world_news_story: one: Verdensnyhet other: Verdensnyheter diff --git a/config/locales/pa-pk.yml b/config/locales/pa-pk.yml index c547b75ff..d981e7ac5 100644 --- a/config/locales/pa-pk.yml +++ b/config/locales/pa-pk.yml @@ -281,9 +281,6 @@ pa-pk: utaac_decision: one: انتظامی درخواست دی عدالت دا فیصلہ other: انتظامی درخواست دی عدالت دے فیصلے - world_location_news_article: - one: خبراں دا مضمون - other: خبراں دے مضمون world_news_story: one: دُنیا دیاں خبراں دی کہانی other: دُنیا دیاں خبراں دیاں کہانیاں diff --git a/config/locales/pa.yml b/config/locales/pa.yml index dbd50d0f9..d2548120e 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -281,9 +281,6 @@ pa: utaac_decision: one: ਪ੍ਰਬੰਧਕੀ ਅਪੀਲ ਟ੍ਰਿਬਿਊਨਲ ਦਾ ਫੈਸਲਾ other: ਪ੍ਰਬੰਧਕੀ ਅਪੀਲ ਟ੍ਰਿਬਿਊਨਲ ਦੇ ਫੈਸਲੇ - world_location_news_article: - one: ਖਬਰ ਲੇਖ - other: ਖਬਰ ਲੇਖ world_news_story: one: ਵਿਸ਼ਵ ਖ਼ਬਰਾਂ ਦੀ ਕਹਾਣੀ other: ਵਿਸ਼ਵ ਖ਼ਬਰਾਂ diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 8e3d12912..2ab2b9b24 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -425,11 +425,6 @@ pl: many: one: Decyzja administracyjnego trybunału odwoławczego other: Decyzje administracyjnego trybunału odwoławczego - world_location_news_article: - few: - many: - one: Artykuł prasowy - other: Artykuły prasowe world_news_story: few: many: diff --git a/config/locales/ps.yml b/config/locales/ps.yml index bb0c5022f..baaaeac95 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -281,9 +281,6 @@ ps: utaac_decision: one: اداري استیناف د محکمې پریکړه other: د اداري استیناف د محکمې پریکړې - world_location_news_article: - one: د خبر مقاله - other: د خبر مقالې world_news_story: one: د نړۍ خبرونه other: د نړۍ خبرونه diff --git a/config/locales/pt.yml b/config/locales/pt.yml index ffbb885c3..dd5dce080 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -281,9 +281,6 @@ pt: utaac_decision: one: Decisão do tribunal de recurso administrativo other: Decisões do tribunal de recurso administrativo - world_location_news_article: - one: Artigo noticioso - other: Artigos noticiosos world_news_story: one: Reportagem do mundo other: Reportagens do mundo diff --git a/config/locales/ro.yml b/config/locales/ro.yml index ad4bb6124..475698608 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -353,10 +353,6 @@ ro: few: one: Decizie a tribunalului de recurs cu privire dreptul administrativ other: Decizii ale tribunalului de recurs cu privire la dreptul administrativ - world_location_news_article: - few: - one: Articol de știri - other: Articole de știri world_news_story: few: one: Reportaj de știri global diff --git a/config/locales/ru.yml b/config/locales/ru.yml index df3d88f0a..d6232d65f 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -425,11 +425,6 @@ ru: many: one: Решение суда по апелляции на решение административного органа other: Решения суда по апелляции на решение административного органа - world_location_news_article: - few: - many: - one: Новостная статья - other: Новостные статьи world_news_story: few: many: diff --git a/config/locales/si.yml b/config/locales/si.yml index 4698bea0e..c1a96a89e 100644 --- a/config/locales/si.yml +++ b/config/locales/si.yml @@ -281,9 +281,6 @@ si: utaac_decision: one: පරිපාලන අභියාචනා විනිශ්චය මණ්ඩල තීරණය other: පරිපාලන අභියාචනා විනිශ්චය මණ්ඩල තීරණ - world_location_news_article: - one: පුවත් ලිපිය - other: පුවත් ලිපි world_news_story: one: ලෝක පුවත් කතාව other: ලෝක පුවත් කතා diff --git a/config/locales/sk.yml b/config/locales/sk.yml index d733b3e41..6140e453c 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -353,10 +353,6 @@ sk: few: one: Rozhodnutie správneho odvolacieho súdu other: Rozhodnutia správneho odvolacieho súdu - world_location_news_article: - few: - one: Spravodajský článok - other: Spravodajské články world_news_story: few: one: Svetové spravodajstvo diff --git a/config/locales/sl.yml b/config/locales/sl.yml index c23a1c99d..a6761e59e 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -425,11 +425,6 @@ sl: one: Odločitev Pritožbenega delovnega sodišča other: Odločitve Pritožbenega delovnega sodišča two: - world_location_news_article: - few: - one: Časopisni članek - other: Časopisni članki - two: world_news_story: few: one: Novica s sveta diff --git a/config/locales/so.yml b/config/locales/so.yml index d5cd0fa8c..5e025da79 100644 --- a/config/locales/so.yml +++ b/config/locales/so.yml @@ -281,9 +281,6 @@ so: utaac_decision: one: Go'aanka rafcaanka maxkamada ee maamulka other: Go'aamada rafcaanka maxkamada ee maamulka - world_location_news_article: - one: Maqaal war ah - other: Maqaalo war ah world_news_story: one: Warka caalamka other: Wararka caalamka diff --git a/config/locales/sq.yml b/config/locales/sq.yml index dae60a611..251d46104 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -281,9 +281,6 @@ sq: utaac_decision: one: Vendimi i gjykatës së apelit administrativ other: Vendime të gjykatës së apelit administrativ - world_location_news_article: - one: Artikull lajmesh - other: Artikuj lajmesh world_news_story: one: Historia e lajmeve botërore other: Histori të lajmeve botërore diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 7c2364555..789abbe61 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -353,10 +353,6 @@ sr: few: one: Odluka tribunala za administrativne žalbe other: Odluke tribunala za administrativne žalbe - world_location_news_article: - few: - one: Članak vesti - other: Članci vesti world_news_story: few: one: Vest iz sveta diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 215e229d2..648910e2a 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -281,9 +281,6 @@ sv: utaac_decision: one: Administrativa överklagandenämndens beslut other: Administrativa överklagandenämndens beslut - world_location_news_article: - one: Nyhetsartikel - other: Nyhetsartiklar world_news_story: one: Världsnyheter other: Världsnyheter diff --git a/config/locales/sw.yml b/config/locales/sw.yml index 27dd3db77..15539d233 100644 --- a/config/locales/sw.yml +++ b/config/locales/sw.yml @@ -281,9 +281,6 @@ sw: utaac_decision: one: Uamuzi wa mahakama ya rufaa za kesi za usimamizi other: Maamuzi ya mahakama ya rufaa za kesi za usimamizi - world_location_news_article: - one: Makala ya habari - other: Makala ya habari world_news_story: one: Taarifa ya habari za kimataifa other: Taarifa za habari za kimataifa diff --git a/config/locales/ta.yml b/config/locales/ta.yml index 5add908a8..29fe6027d 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -281,9 +281,6 @@ ta: utaac_decision: one: நிர்வாக மேல்முறையீட்டுத் தீர்ப்பாய முடிவு other: நிர்வாக மேல்முறையீட்டுத் தீர்ப்பாய முடிவுகள் - world_location_news_article: - one: செய்திக் கட்டுரை - other: செய்திக் கட்டுரைகள் world_news_story: one: உலகச் செய்தி other: உலகச் செய்திகள் diff --git a/config/locales/th.yml b/config/locales/th.yml index c25afdee6..be043e487 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -209,8 +209,6 @@ th: other: ข้อมูลความโปร่งใส utaac_decision: other: คำพิพากษาของศาลปกครองขั้นอุทธรณ์ - world_location_news_article: - other: บทความข่าว world_news_story: other: ข่าวสารรอบโลก written_statement: diff --git a/config/locales/tk.yml b/config/locales/tk.yml index 58d1311f7..ae9864fc6 100644 --- a/config/locales/tk.yml +++ b/config/locales/tk.yml @@ -281,9 +281,6 @@ tk: utaac_decision: one: Administratiw arza kazyýetiň karary other: Administratiw arza kazyýetiň kararlary - world_location_news_article: - one: Habar makalasy - other: Habar makalalary world_news_story: one: Dünýä habary other: Dünýä habarlary diff --git a/config/locales/tr.yml b/config/locales/tr.yml index d0ea35f14..d526bf9ab 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -281,9 +281,6 @@ tr: utaac_decision: one: İdari temyiz mahkemesi kararı other: İdari temyiz mahkemesi kararları - world_location_news_article: - one: Haber makalesi - other: Haber makaleleri world_news_story: one: Dünya geneli haber makalesi other: Dünya geneli haber makaleleri diff --git a/config/locales/uk.yml b/config/locales/uk.yml index f0d5f8780..fc6a94d26 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -425,11 +425,6 @@ uk: many: one: Рішення арбітражного суду по адміністративній апеляції other: Рішення арбітражного суду по адміністративній апеляції - world_location_news_article: - few: - many: - one: Новини - other: Новини world_news_story: few: many: diff --git a/config/locales/ur.yml b/config/locales/ur.yml index ab844d0fb..04017af4f 100644 --- a/config/locales/ur.yml +++ b/config/locales/ur.yml @@ -281,9 +281,6 @@ ur: utaac_decision: one: انتظامی اپیلز کا عدالتی فیصلہ other: انتظامی اپیلز کے عدالتی فیصلے - world_location_news_article: - one: خبروں کا مضمون - other: خبروں کے مضامین world_news_story: one: دنیا کی خبروں کی کہانی other: دنیا کی خبروں کی کہانیاں diff --git a/config/locales/uz.yml b/config/locales/uz.yml index 883892170..3fd6bcb10 100644 --- a/config/locales/uz.yml +++ b/config/locales/uz.yml @@ -281,9 +281,6 @@ uz: utaac_decision: one: Маъмурий апелляция трибуналининг қарори other: Маъмурий апелляция трибуналининг қарорлари - world_location_news_article: - one: Янгилик мақоласи - other: Янгилик мақолалари world_news_story: one: Янгилик сюжетлари other: Халқаро янги тарихлар diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 2a01f9d7b..bcd3f25ba 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -209,8 +209,6 @@ vi: other: Dữ liệu về tính minh bạch utaac_decision: other: Quyết định của tòa phúc thẩm hành chính - world_location_news_article: - other: Bài viết thời sự world_news_story: other: Bài phóng sự thế giới written_statement: diff --git a/config/locales/yi.yml b/config/locales/yi.yml index 3146c4433..793f8a4e9 100644 --- a/config/locales/yi.yml +++ b/config/locales/yi.yml @@ -281,9 +281,6 @@ yi: utaac_decision: one: other: - world_location_news_article: - one: - other: world_news_story: one: other: diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml index 8293ebd6e..da3749f45 100644 --- a/config/locales/zh-hk.yml +++ b/config/locales/zh-hk.yml @@ -281,9 +281,6 @@ zh-hk: utaac_decision: one: 行政上訴法庭裁決 other: 其他行政上訴法庭裁決 - world_location_news_article: - one: 新聞 - other: 其他新聞 world_news_story: one: 世界新聞故事 other: 其他世界新聞故事 diff --git a/config/locales/zh-tw.yml b/config/locales/zh-tw.yml index 68f38e9f6..c903dedad 100644 --- a/config/locales/zh-tw.yml +++ b/config/locales/zh-tw.yml @@ -281,9 +281,6 @@ zh-tw: utaac_decision: one: 行政上訴審裁處裁決 other: 勞資上訴審裁處裁決 - world_location_news_article: - one: 新聞文章 - other: 新聞文章 world_news_story: one: 世界新聞報導 other: 世界新聞報導 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 39ac020b2..2d194f0e5 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -209,8 +209,6 @@ zh: other: 透明度数据 utaac_decision: other: 行政上诉法庭裁决 - world_location_news_article: - other: 新闻报道 world_news_story: other: 世界新闻故事 written_statement: diff --git a/test/integration/world_location_news_article_test.rb b/test/integration/world_location_news_article_test.rb deleted file mode 100644 index 2331ffa92..000000000 --- a/test/integration/world_location_news_article_test.rb +++ /dev/null @@ -1,55 +0,0 @@ -require "test_helper" - -class WorldLocationNewsArticleTest < ActionDispatch::IntegrationTest - test "world location news article renders title, description and body" do - setup_and_visit_content_item("world_location_news_article") - - assert page.has_css?( - "meta[name='description'][content='Chevening Secretariat announces the Chevening/British Library Fellowship']", - visible: false, - ) - - assert_has_component_title(@content_item["title"]) - assert page.has_text?(@content_item["description"]) - assert page.has_text?("As with the core Chevening Scheme this fellowship is an open competition. Applications from eligible countries will be assessed against each other by an independent panel and the top application for each topic received will be awarded.") - end - - test "renders first published, from and part of in metadata and document footer" do - setup_and_visit_content_item("world_location_news_article") - - assert_has_published_dates("Published 24 November 2015") - assert_footer_has_published_dates("Published 24 November 2015") - end - - test "renders translation links when there is more than one translation" do - setup_and_visit_content_item("world_location_news_article_with_multiple_translations") - - assert page.has_css?(".gem-c-translation-nav") - assert page.has_css?(".gem-c-translation-nav__list-item") - - assert_not page.has_link?("English") - - assert page.has_link?("हिंदी", href: "/government/world-location-news/changes-to-secure-english-language-test-providers-for-uk-visas.hi") - assert page.has_link?("日本", href: "/government/world-location-news/changes-to-secure-english-language-test-providers-for-uk-visas.ja") - assert page.has_link?("中文", href: "/government/world-location-news/changes-to-secure-english-language-test-providers-for-uk-visas.zh") - assert page.has_link?("繁體中文", href: "/government/world-location-news/changes-to-secure-english-language-test-providers-for-uk-visas.zh-tw") - end - - test "renders the lead image" do - setup_and_visit_content_item("world_location_news_article") - - assert page.has_css?("img[src*='placeholder-a6e35fc15d4bfcc9d0781f3888dc548b39288f0fe10a65a4b51fef603540b0c5'][alt='placeholder']") - end - - test "renders history notice" do - setup_and_visit_content_item("world_location_news_article_history_mode") - within ".govuk-notification-banner__content" do - assert page.has_text?("This was published under the 2010 to 2015 Conservative and Liberal Democrat coalition government") - end - end - - test "does not render with the single page notification button" do - setup_and_visit_content_item("world_location_news_article") - assert_not page.has_css?(".gem-c-single-page-notification-button") - end -end diff --git a/test/presenters/world_location_news_article_presenter_test.rb b/test/presenters/world_location_news_article_presenter_test.rb deleted file mode 100644 index d190df35e..000000000 --- a/test/presenters/world_location_news_article_presenter_test.rb +++ /dev/null @@ -1,98 +0,0 @@ -require "presenter_test_helper" - -class WorldLocationNewsArticlePresenterTest - class WorldLocationNewsArticlePresenterTestCase < PresenterTestCase - attr_accessor :example_schema_name - - def schema_name - "world_location_news_article" - end - end - - class PresentedWorldLocationNewsArticleTest < WorldLocationNewsArticlePresenterTestCase - test "is linkable" do - assert presented_item.is_a?(ContentItem::Linkable) - end - - test "is updatable" do - assert presented_item.is_a?(ContentItem::Updatable) - end - - test "is withdrawable" do - assert presented_item.is_a?(ContentItem::Withdrawable) - end - - test "is shareable" do - assert presented_item.is_a?(ContentItem::Shareable) - end - - test "includes political" do - assert presented_item.is_a?(ContentItem::Political) - end - - test "presents the schema name" do - assert_equal schema_item["schema_name"], presented_item.schema_name - end - - test "presents a description" do - assert_equal schema_item["description"], presented_item.description - end - - test "presents a body" do - assert_equal schema_item["details"]["body"], presented_item.body - end - - test "presents a readable first published date" do - assert_equal "24 November 2015", presented_item.published - end - - test "presents the locale" do - assert_equal schema_item["locale"], presented_item.locale - end - - test "presents worldwide organisations as from" do - assert_includes presented_item.from[0], schema_item["links"]["worldwide_organisations"][0]["title"] - end - - test "presents world locations as part_of" do - assert_includes presented_item.part_of[0], schema_item["links"]["world_locations"][0]["title"] - end - end - - class HistoryModePresentedWorldLocationNewsArticle < WorldLocationNewsArticlePresenterTestCase - def example_schema_name - "world_location_news_article_history_mode" - end - - test "presents historically political" do - assert presented_item(example_schema_name).historically_political? - end - end - - class TranslatedPresentedWorldLocationNewsArticle < WorldLocationNewsArticlePresenterTestCase - def example_schema_name - "world_location_news_article_translated" - end - - test "presents the locale as the translated item locale" do - assert_equal "pt", presented_item(example_schema_name).locale - end - end - - class MultipleTranslationsPresentedWorldLocationNewsArticle < WorldLocationNewsArticlePresenterTestCase - def example_schema_name - "world_location_news_article_with_multiple_translations" - end - - setup do - # sorted so assert compares like with like - @expected_translations = schema_item(example_schema_name)["links"]["available_translations"].sort_by { |hash| hash["locale"] } - @presented_translations = presented_item(example_schema_name).available_translations.sort_by { |hash| hash["locale"] } - end - - test "presents the translations" do - assert_equal @expected_translations.first["locale"], @presented_translations.first[:locale] - assert_equal @expected_translations.first["base_path"], @presented_translations.first[:base_path] - end - end -end