From d1e4f48c0e72022dbb21b54d8384ac501b9e5529 Mon Sep 17 00:00:00 2001 From: Huw Diprose Date: Tue, 28 Sep 2021 16:52:51 +0100 Subject: [PATCH 01/10] Remove SavePage locale content --- config/locales/ar.yml | 12 ------------ config/locales/az.yml | 12 ------------ config/locales/be.yml | 12 ------------ config/locales/bg.yml | 12 ------------ config/locales/bn.yml | 12 ------------ config/locales/cs.yml | 12 ------------ config/locales/cy.yml | 12 ------------ config/locales/da.yml | 12 ------------ config/locales/de.yml | 12 ------------ config/locales/dr.yml | 12 ------------ config/locales/el.yml | 12 ------------ config/locales/en.yml | 12 ------------ config/locales/es-419.yml | 12 ------------ config/locales/es.yml | 12 ------------ config/locales/et.yml | 12 ------------ config/locales/fa.yml | 12 ------------ config/locales/fi.yml | 12 ------------ config/locales/fr.yml | 12 ------------ config/locales/gd.yml | 12 ------------ config/locales/gu.yml | 12 ------------ config/locales/he.yml | 12 ------------ config/locales/hi.yml | 12 ------------ config/locales/hr.yml | 12 ------------ config/locales/hu.yml | 12 ------------ config/locales/hy.yml | 12 ------------ config/locales/id.yml | 12 ------------ config/locales/is.yml | 12 ------------ config/locales/it.yml | 12 ------------ config/locales/ja.yml | 12 ------------ config/locales/ka.yml | 12 ------------ config/locales/kk.yml | 12 ------------ config/locales/ko.yml | 12 ------------ config/locales/lt.yml | 12 ------------ config/locales/lv.yml | 12 ------------ config/locales/ms.yml | 12 ------------ config/locales/mt.yml | 12 ------------ config/locales/ne.yml | 12 ------------ config/locales/nl.yml | 12 ------------ config/locales/no.yml | 12 ------------ config/locales/pa-pk.yml | 12 ------------ config/locales/pa.yml | 12 ------------ config/locales/pl.yml | 12 ------------ config/locales/ps.yml | 12 ------------ config/locales/pt.yml | 12 ------------ config/locales/ro.yml | 12 ------------ config/locales/ru.yml | 12 ------------ config/locales/si.yml | 12 ------------ config/locales/sk.yml | 12 ------------ config/locales/sl.yml | 12 ------------ config/locales/so.yml | 12 ------------ config/locales/sq.yml | 12 ------------ config/locales/sr.yml | 12 ------------ config/locales/sv.yml | 12 ------------ config/locales/sw.yml | 12 ------------ config/locales/ta.yml | 12 ------------ config/locales/th.yml | 12 ------------ config/locales/tk.yml | 12 ------------ config/locales/tr.yml | 12 ------------ config/locales/uk.yml | 12 ------------ config/locales/ur.yml | 12 ------------ config/locales/uz.yml | 12 ------------ config/locales/vi.yml | 12 ------------ config/locales/yi.yml | 12 ------------ config/locales/zh-hk.yml | 12 ------------ config/locales/zh-tw.yml | 12 ------------ config/locales/zh.yml | 12 ------------ 66 files changed, 792 deletions(-) diff --git a/config/locales/ar.yml b/config/locales/ar.yml index fbb7e3f66..6a44ab420 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -21,18 +21,6 @@ ar: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: شارك هذه الصفحة consultation: diff --git a/config/locales/az.yml b/config/locales/az.yml index 8ddb3c627..706b0551b 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -21,18 +21,6 @@ az: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/be.yml b/config/locales/be.yml index c326ddc80..af2842965 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -21,18 +21,6 @@ be: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 93af86e24..cf7cf1104 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -21,18 +21,6 @@ bg: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index d0d7e7533..4980abce1 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -21,18 +21,6 @@ bn: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 41602c5dd..2d853e38a 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -21,18 +21,6 @@ cs: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 30cb242bd..4875a9d90 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -25,18 +25,6 @@ cy: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/da.yml b/config/locales/da.yml index 99cbc09cc..fdd2f57da 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -21,18 +21,6 @@ da: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/de.yml b/config/locales/de.yml index 38ea82999..b37e3fac4 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -21,18 +21,6 @@ de: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/dr.yml b/config/locales/dr.yml index 42ebd9c72..12e155617 100644 --- a/config/locales/dr.yml +++ b/config/locales/dr.yml @@ -21,18 +21,6 @@ dr: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/el.yml b/config/locales/el.yml index f31d149a6..71fbb469c 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -21,18 +21,6 @@ el: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/en.yml b/config/locales/en.yml index 9254393f0..32e75f262 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -25,18 +25,6 @@ en: from: hide_all: hide all show_all: show all - save_this_page: - add_page_button: Add to your saved pages - confirmations: - page_removed: - message: You’ve removed this from your saved pages - page_saved: - message: You’ve added this to your saved pages - page_not_saved_heading: Save this page so you can come back to it later - page_was_saved_heading: You’ve saved this page - remove_page_button: Remove from your saved pages - see_saved_pages_signed_in: See your saved pages - see_saved_pages_signed_out: Sign in to see your saved pages. share_links: share_this_page: Share this page consultation: diff --git a/config/locales/es-419.yml b/config/locales/es-419.yml index 2813d2e06..dfb1d5e06 100644 --- a/config/locales/es-419.yml +++ b/config/locales/es-419.yml @@ -21,18 +21,6 @@ es-419: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/es.yml b/config/locales/es.yml index 9aeb8e1d5..adb732b19 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -21,18 +21,6 @@ es: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/et.yml b/config/locales/et.yml index bef5adbb8..fcc2f7b51 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -21,18 +21,6 @@ et: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index c50188da5..799ad33b0 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -21,18 +21,6 @@ fa: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index cbdf4f4d7..1fed9258b 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -21,18 +21,6 @@ fi: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 3b7aec9b9..19d5fd87d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -21,18 +21,6 @@ fr: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 2c405ab99..74e4b0832 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -21,18 +21,6 @@ gd: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/gu.yml b/config/locales/gu.yml index ef4f98195..e57e5ca47 100644 --- a/config/locales/gu.yml +++ b/config/locales/gu.yml @@ -21,18 +21,6 @@ gu: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/he.yml b/config/locales/he.yml index a6709b36a..8d541e694 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -21,18 +21,6 @@ he: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/hi.yml b/config/locales/hi.yml index f199344e2..6b98f9bdc 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -21,18 +21,6 @@ hi: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 1dfe4316d..5708fb205 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -21,18 +21,6 @@ hr: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 2f9a15573..3a3c3344b 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -21,18 +21,6 @@ hu: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/hy.yml b/config/locales/hy.yml index c7d8529d8..f89fcfd06 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -21,18 +21,6 @@ hy: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/id.yml b/config/locales/id.yml index 5c2d75aa4..7bb8fa022 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -21,18 +21,6 @@ id: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/is.yml b/config/locales/is.yml index 178818db4..c6809f1f1 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -21,18 +21,6 @@ is: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/it.yml b/config/locales/it.yml index 9efb17dbb..2e77b714b 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -21,18 +21,6 @@ it: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 867cf38b6..879d9485f 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -21,18 +21,6 @@ ja: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 5033d48a5..4e77a9453 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -21,18 +21,6 @@ ka: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/kk.yml b/config/locales/kk.yml index c72e5581b..62bfdcf41 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -21,18 +21,6 @@ kk: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 17be61b5f..970cd0232 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -21,18 +21,6 @@ ko: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 59abdbf1c..dfcc44b61 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -21,18 +21,6 @@ lt: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 48ce809aa..3f772c386 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -21,18 +21,6 @@ lv: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/ms.yml b/config/locales/ms.yml index c29aa9603..50eff4942 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -21,18 +21,6 @@ ms: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/mt.yml b/config/locales/mt.yml index e5457bb34..28116df69 100644 --- a/config/locales/mt.yml +++ b/config/locales/mt.yml @@ -21,18 +21,6 @@ mt: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 60af620dc..9a37bc987 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -21,18 +21,6 @@ ne: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index c9b3197d2..f7f8b6d16 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -21,18 +21,6 @@ nl: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/no.yml b/config/locales/no.yml index 76d593965..ba4fca4e0 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -21,18 +21,6 @@ from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/pa-pk.yml b/config/locales/pa-pk.yml index d1097e251..10aeacddf 100644 --- a/config/locales/pa-pk.yml +++ b/config/locales/pa-pk.yml @@ -21,18 +21,6 @@ pa-pk: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 4df16e4ee..e2f5700f1 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -21,18 +21,6 @@ pa: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index d4027eb32..41307e87c 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -21,18 +21,6 @@ pl: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/ps.yml b/config/locales/ps.yml index f318b39fd..053e3a10e 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -21,18 +21,6 @@ ps: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/pt.yml b/config/locales/pt.yml index ee112067c..ca1ca1c56 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -21,18 +21,6 @@ pt: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/ro.yml b/config/locales/ro.yml index b3e7dbdac..40ccc4756 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -21,18 +21,6 @@ ro: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 8aae3bba9..7f1f10073 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -21,18 +21,6 @@ ru: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/si.yml b/config/locales/si.yml index 11478a7b7..1bb7add6a 100644 --- a/config/locales/si.yml +++ b/config/locales/si.yml @@ -21,18 +21,6 @@ si: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 11b1a3884..0faf357c2 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -21,18 +21,6 @@ sk: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 4b5466ea5..c264cd68e 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -21,18 +21,6 @@ sl: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/so.yml b/config/locales/so.yml index 206bd965c..23af5395a 100644 --- a/config/locales/so.yml +++ b/config/locales/so.yml @@ -21,18 +21,6 @@ so: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 261370bba..dd58f1aa2 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -21,18 +21,6 @@ sq: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index f41f0578a..67522da3c 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -21,18 +21,6 @@ sr: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 727afc0e0..59e06b847 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -21,18 +21,6 @@ sv: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/sw.yml b/config/locales/sw.yml index 73ef27345..c02bd1dd6 100644 --- a/config/locales/sw.yml +++ b/config/locales/sw.yml @@ -21,18 +21,6 @@ sw: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/ta.yml b/config/locales/ta.yml index c25052147..a574c575b 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -21,18 +21,6 @@ ta: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/th.yml b/config/locales/th.yml index ffb326e8e..211258112 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -21,18 +21,6 @@ th: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/tk.yml b/config/locales/tk.yml index 6c8c671e1..5b8a433d1 100644 --- a/config/locales/tk.yml +++ b/config/locales/tk.yml @@ -21,18 +21,6 @@ tk: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index ee8863c3c..4e6953671 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -21,18 +21,6 @@ tr: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 7d48d92a8..3e9ed1031 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -21,18 +21,6 @@ uk: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/ur.yml b/config/locales/ur.yml index 38169a966..55d32968c 100644 --- a/config/locales/ur.yml +++ b/config/locales/ur.yml @@ -21,18 +21,6 @@ ur: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/uz.yml b/config/locales/uz.yml index f17cc2233..69a4e9744 100644 --- a/config/locales/uz.yml +++ b/config/locales/uz.yml @@ -21,18 +21,6 @@ uz: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index ea304b5d0..c742f130f 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -21,18 +21,6 @@ vi: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/yi.yml b/config/locales/yi.yml index 6694872e6..0e3931d98 100644 --- a/config/locales/yi.yml +++ b/config/locales/yi.yml @@ -258,18 +258,6 @@ yi: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml index f6c7c145f..a02aa5938 100644 --- a/config/locales/zh-hk.yml +++ b/config/locales/zh-hk.yml @@ -21,18 +21,6 @@ zh-hk: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/zh-tw.yml b/config/locales/zh-tw.yml index a3ace7f7e..b1a1df685 100644 --- a/config/locales/zh-tw.yml +++ b/config/locales/zh-tw.yml @@ -21,18 +21,6 @@ zh-tw: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 22bdf3fb5..e30d9454a 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -21,18 +21,6 @@ zh: from: hide_all: show_all: - save_this_page: - add_page_button: - confirmations: - page_removed: - message: - page_saved: - message: - page_not_saved_heading: - page_was_saved_heading: - remove_page_button: - see_saved_pages_signed_in: - see_saved_pages_signed_out: share_links: share_this_page: consultation: From e858440960d68b6484855507e9e347dc53f9ca1c Mon Sep 17 00:00:00 2001 From: Huw Diprose Date: Tue, 28 Sep 2021 16:53:53 +0100 Subject: [PATCH 02/10] Remove 'content_items/save_page' partial from content_items --- app/views/content_items/_body_with_related_links.html.erb | 2 -- app/views/content_items/case_study.html.erb | 2 -- app/views/content_items/consultation.html.erb | 2 -- app/views/content_items/contact.html.erb | 2 -- .../content_items/corporate_information_page.html.erb | 7 ------- app/views/content_items/detailed_guide.html.erb | 2 -- app/views/content_items/document_collection.html.erb | 2 -- app/views/content_items/fatality_notice.html.erb | 1 - app/views/content_items/html_publication.html.erb | 1 - app/views/content_items/news_article.html.erb | 2 -- app/views/content_items/publication.html.erb | 1 - app/views/content_items/specialist_document.html.erb | 2 -- app/views/content_items/speech.html.erb | 2 -- app/views/content_items/statistical_data_set.html.erb | 1 - app/views/content_items/statistics_announcement.html.erb | 2 -- app/views/content_items/take_part.html.erb | 1 - app/views/content_items/topical_event_about_page.html.erb | 2 -- app/views/content_items/travel_advice.html.erb | 2 -- app/views/content_items/working_group.html.erb | 2 -- .../content_items/world_location_news_article.html.erb | 2 -- 20 files changed, 40 deletions(-) diff --git a/app/views/content_items/_body_with_related_links.html.erb b/app/views/content_items/_body_with_related_links.html.erb index b4ed7b956..aaca7628c 100644 --- a/app/views/content_items/_body_with_related_links.html.erb +++ b/app/views/content_items/_body_with_related_links.html.erb @@ -24,8 +24,6 @@ } %> <% end %> - - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/case_study.html.erb b/app/views/content_items/case_study.html.erb index ed2cba897..23c3f5b62 100644 --- a/app/views/content_items/case_study.html.erb +++ b/app/views/content_items/case_study.html.erb @@ -40,8 +40,6 @@ history: @content_item.history } %> - - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/consultation.html.erb b/app/views/content_items/consultation.html.erb index 6f9935f76..d498109b2 100644 --- a/app/views/content_items/consultation.html.erb +++ b/app/views/content_items/consultation.html.erb @@ -200,8 +200,6 @@ history: @content_item.history } %> - - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/contact.html.erb b/app/views/content_items/contact.html.erb index 5fb76aa50..ed24e5819 100644 --- a/app/views/content_items/contact.html.erb +++ b/app/views/content_items/contact.html.erb @@ -103,8 +103,6 @@ <%= body %> <% end %> - - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/corporate_information_page.html.erb b/app/views/content_items/corporate_information_page.html.erb index 6fcf8127c..4e3bc45dc 100644 --- a/app/views/content_items/corporate_information_page.html.erb +++ b/app/views/content_items/corporate_information_page.html.erb @@ -56,10 +56,3 @@ -<% if save_this_page_enabled? %> -
-
- <%= render 'content_items/save_page' %> -
-
-<% end %> diff --git a/app/views/content_items/detailed_guide.html.erb b/app/views/content_items/detailed_guide.html.erb index 4d4af535a..edcc80b8f 100644 --- a/app/views/content_items/detailed_guide.html.erb +++ b/app/views/content_items/detailed_guide.html.erb @@ -68,8 +68,6 @@ margin_top: 0, margin_bottom: 6, } unless brexit_child_taxon %> - - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/document_collection.html.erb b/app/views/content_items/document_collection.html.erb index 475a48d20..234382b7b 100644 --- a/app/views/content_items/document_collection.html.erb +++ b/app/views/content_items/document_collection.html.erb @@ -40,8 +40,6 @@ } %> <% end %> - - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/fatality_notice.html.erb b/app/views/content_items/fatality_notice.html.erb index 1bc1db406..8ac0b138a 100644 --- a/app/views/content_items/fatality_notice.html.erb +++ b/app/views/content_items/fatality_notice.html.erb @@ -40,7 +40,6 @@ history: @content_item.history } %> - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/html_publication.html.erb b/app/views/content_items/html_publication.html.erb index 7fb5b29cc..765fed835 100644 --- a/app/views/content_items/html_publication.html.erb +++ b/app/views/content_items/html_publication.html.erb @@ -59,7 +59,6 @@ <%= render "govuk_publishing_components/components/govspeak_html_publication", {} do %> <%= raw(@content_item.govspeak_body[:content]) %> <% end %> - <%= render 'content_items/save_page' %>
diff --git a/app/views/content_items/news_article.html.erb b/app/views/content_items/news_article.html.erb index caeb0c7eb..972448914 100644 --- a/app/views/content_items/news_article.html.erb +++ b/app/views/content_items/news_article.html.erb @@ -48,8 +48,6 @@ history: @content_item.history } %>
- - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/publication.html.erb b/app/views/content_items/publication.html.erb index a7147c5e2..fc4b4e4b3 100644 --- a/app/views/content_items/publication.html.erb +++ b/app/views/content_items/publication.html.erb @@ -56,7 +56,6 @@ history: @content_item.history } %> - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/specialist_document.html.erb b/app/views/content_items/specialist_document.html.erb index 15db1aa93..b2fffc9ec 100644 --- a/app/views/content_items/specialist_document.html.erb +++ b/app/views/content_items/specialist_document.html.erb @@ -62,8 +62,6 @@ <% end %> <% end %> - - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/speech.html.erb b/app/views/content_items/speech.html.erb index b0374f2da..1322050a4 100644 --- a/app/views/content_items/speech.html.erb +++ b/app/views/content_items/speech.html.erb @@ -44,8 +44,6 @@ history: @content_item.history } %> - - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/statistical_data_set.html.erb b/app/views/content_items/statistical_data_set.html.erb index f639cfa88..75eacc85d 100644 --- a/app/views/content_items/statistical_data_set.html.erb +++ b/app/views/content_items/statistical_data_set.html.erb @@ -41,7 +41,6 @@ } %> <% end %> - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/statistics_announcement.html.erb b/app/views/content_items/statistics_announcement.html.erb index 3e750fac2..97b640aa6 100644 --- a/app/views/content_items/statistics_announcement.html.erb +++ b/app/views/content_items/statistics_announcement.html.erb @@ -42,8 +42,6 @@ <%= render 'govuk_publishing_components/components/notice', title: nbsp_between_last_two_words(@content_item.forthcoming_notice_title) %> <% end %> - - <%= render 'content_items/save_page' %>
<%= render 'govuk_publishing_components/components/related_navigation', content_item: @content_item.content_item.parsed_content, context: :sidebar %> diff --git a/app/views/content_items/take_part.html.erb b/app/views/content_items/take_part.html.erb index 1a066c4c8..ed124a4c1 100644 --- a/app/views/content_items/take_part.html.erb +++ b/app/views/content_items/take_part.html.erb @@ -28,7 +28,6 @@ <%= raw(@content_item.body) %> <% end %>
- <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/topical_event_about_page.html.erb b/app/views/content_items/topical_event_about_page.html.erb index 4b00bfab3..a1886a48d 100644 --- a/app/views/content_items/topical_event_about_page.html.erb +++ b/app/views/content_items/topical_event_about_page.html.erb @@ -23,8 +23,6 @@ <%= raw(@content_item.body) %> <% end %> <% end %> - - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/travel_advice.html.erb b/app/views/content_items/travel_advice.html.erb index 3162ee58e..3eb5eac71 100644 --- a/app/views/content_items/travel_advice.html.erb +++ b/app/views/content_items/travel_advice.html.erb @@ -71,8 +71,6 @@
<%= render 'govuk_publishing_components/components/print_link', href: @content_item.print_link, text: t("multi_page.print_entire_guide") %>
- - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/working_group.html.erb b/app/views/content_items/working_group.html.erb index 46a619f99..35d9d89b9 100644 --- a/app/views/content_items/working_group.html.erb +++ b/app/views/content_items/working_group.html.erb @@ -35,7 +35,5 @@ <%= raw(@additional_body) %> <% end %> <% end %> - - <%= render 'content_items/save_page' %> diff --git a/app/views/content_items/world_location_news_article.html.erb b/app/views/content_items/world_location_news_article.html.erb index 350b151c8..d097cbcfc 100644 --- a/app/views/content_items/world_location_news_article.html.erb +++ b/app/views/content_items/world_location_news_article.html.erb @@ -49,8 +49,6 @@ history: @content_item.history } %> - - <%= render 'content_items/save_page' %> <%= render 'shared/sidebar_navigation' %> From 10ba1cf7d27521eded6d65cc4b7d4c4ca68170e5 Mon Sep 17 00:00:00 2001 From: Huw Diprose Date: Tue, 28 Sep 2021 16:55:09 +0100 Subject: [PATCH 03/10] Remove save_this_page partial --- app/views/content_items/_save_page.html.erb | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 app/views/content_items/_save_page.html.erb diff --git a/app/views/content_items/_save_page.html.erb b/app/views/content_items/_save_page.html.erb deleted file mode 100644 index 5489159cd..000000000 --- a/app/views/content_items/_save_page.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%= content_tag(:div, class: "responsive-bottom-margin") do %> - <%= render 'components/save_this_page', { - page_path: request.path, - signed_in: logged_in?, - page_is_saved: user_has_saved_page?, - } %> -<% end if save_this_page_enabled? %> From fd4bb9fbb01c29d9b652673b09fa80ef7e29b1cc Mon Sep 17 00:00:00 2001 From: Huw Diprose Date: Tue, 28 Sep 2021 16:55:46 +0100 Subject: [PATCH 04/10] Remove SCSS from save-this-page --- app/assets/stylesheets/components/_save-this-page.scss | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 app/assets/stylesheets/components/_save-this-page.scss diff --git a/app/assets/stylesheets/components/_save-this-page.scss b/app/assets/stylesheets/components/_save-this-page.scss deleted file mode 100644 index de0da05c9..000000000 --- a/app/assets/stylesheets/components/_save-this-page.scss +++ /dev/null @@ -1,9 +0,0 @@ -.app-c-save-this-page { - border: 1px solid govuk-colour('mid-grey'); - border-top: 2px solid govuk-colour('blue'); - padding: govuk-spacing(4) govuk-spacing(4) 0; - - @include govuk-media-query($from: desktop) { - display: inline-block; - } -} From 82aa0a2f407a5c64b58fd192f8e9a2139df61402 Mon Sep 17 00:00:00 2001 From: Huw Diprose Date: Tue, 28 Sep 2021 16:56:50 +0100 Subject: [PATCH 05/10] Remove save-this-page logic and helpers --- app/controllers/content_items_controller.rb | 22 -------------- app/helpers/application_helper.rb | 12 -------- app/helpers/save_this_page_helper.rb | 32 --------------------- 3 files changed, 66 deletions(-) delete mode 100644 app/helpers/save_this_page_helper.rb diff --git a/app/controllers/content_items_controller.rb b/app/controllers/content_items_controller.rb index 5c92fdd5a..c56c8ad50 100644 --- a/app/controllers/content_items_controller.rb +++ b/app/controllers/content_items_controller.rb @@ -1,5 +1,4 @@ class ContentItemsController < ApplicationController - include GovukPersonalisation::ControllerConcern include Slimmer::Template include AbTests::ExploreMenuAbTestable include AbTests::SabPagesTestable @@ -217,25 +216,4 @@ def error_redirect(exception) ) redirect_to destination, status: status_code end - - def save_this_page_enabled? - ENV["FEATURE_FLAG_SAVE_A_PAGE"] == "enabled" - end - helper_method :save_this_page_enabled? - - helper_method :logged_in? - - def user_has_saved_page? - return false unless @account_session_header - - GdsApi.account_api.get_saved_page( - page_path: request.path, - govuk_account_session: @account_session_header, - ).to_hash["saved_page"].present? - rescue GdsApi::HTTPNotFound - false - rescue GdsApi::HTTPUnauthorized - logout! - end - helper_method :user_has_saved_page? end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ae3d63249..274bdd347 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -28,18 +28,6 @@ def current_path_without_query_string request.original_fullpath.split("?", 2).first end - def has_saved_page_confirmation? - return false unless save_this_page_enabled? - - personalisation_param.present? - end - - def personalisation_param - return unless %w[page_saved page_removed].include?(params["personalisation"]) - - params["personalisation"] - end - private def active_proposition_mapping diff --git a/app/helpers/save_this_page_helper.rb b/app/helpers/save_this_page_helper.rb deleted file mode 100644 index 0a443d1be..000000000 --- a/app/helpers/save_this_page_helper.rb +++ /dev/null @@ -1,32 +0,0 @@ -module SaveThisPageHelper - attr_reader :page_is_saved, :signed_in, :page_path - - PAGE_IS_SAVED_LINK_HREF = { - true => "#{Plek.new.website_root}/account/saved-pages/remove?page_path=", - false => "#{Plek.new.website_root}/account/saved-pages/add?page_path=", - }.freeze - - SEE_SAVED_PAGES_LOGGED_IN = { - true => "components.save_this_page.see_saved_pages_signed_in", - false => "components.save_this_page.see_saved_pages_signed_out", - }.freeze - - def heading_text(options) - options[:page_is_saved] ? I18n.t("components.save_this_page.page_was_saved_heading") : I18n.t("components.save_this_page.page_not_saved_heading") - end - - def link_text(options) - options[:page_is_saved] ? I18n.t("components.save_this_page.remove_page_button") : I18n.t("components.save_this_page.add_page_button") - end - - def link_href(options) - page_is_saved = options[:page_is_saved] || false - page_path = options[:page_path] || "" - PAGE_IS_SAVED_LINK_HREF[page_is_saved] + page_path - end - - def additional_text(options) - signed_in = options[:signed_in] || false - I18n.t(SEE_SAVED_PAGES_LOGGED_IN[signed_in], link: "#{Plek.new.website_root}/account/saved-pages", additional_class: options[:additional_class]) - end -end From 1a6032f51bf5126635132b0042f0e81ad8dd7c37 Mon Sep 17 00:00:00 2001 From: Huw Diprose Date: Tue, 28 Sep 2021 16:57:16 +0100 Subject: [PATCH 06/10] Remove save_this_page component --- app/views/components/_save_this_page.html.erb | 14 ----------- app/views/components/docs/save_this_page.yml | 25 ------------------- 2 files changed, 39 deletions(-) delete mode 100644 app/views/components/_save_this_page.html.erb delete mode 100644 app/views/components/docs/save_this_page.yml diff --git a/app/views/components/_save_this_page.html.erb b/app/views/components/_save_this_page.html.erb deleted file mode 100644 index 7f9d29fe9..000000000 --- a/app/views/components/_save_this_page.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -<% - page_path ||= nil - shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns) -%> -<%= content_tag(:div, class: "app-c-save-this-page") do %> - <%= content_tag(shared_helper.get_heading_level, heading_text(local_assigns), class: "govuk-heading-s") %> - <%= render "govuk_publishing_components/components/button", { - text: link_text(local_assigns), - href: link_href(local_assigns), - margin_bottom: 4, - secondary_solid: true, - } %> - <%= content_tag(:p, sanitize(additional_text(local_assigns)), class: 'govuk-body') %> -<% end if page_path %> diff --git a/app/views/components/docs/save_this_page.yml b/app/views/components/docs/save_this_page.yml deleted file mode 100644 index 53f50c8ed..000000000 --- a/app/views/components/docs/save_this_page.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Save this page -description: Allows users to save a page on GOV.UK -body: Will not render without a `page_path` -accessibility_criteria: | - Buttons in this component must: - - * be keyboard focusable - * inform the user about which item they operate on - * preserve focus after interacting with them -shared_accessibility_criteria: -- link -examples: - default: - description: Displays the signed out user view by default - data: - page_path: /government/organisations/prime-ministers-office-10-downing-street - signed_in_and_has_not_saved_page: - data: - page_path: /government/organisations/prime-ministers-office-10-downing-street - signed_in: true - signed_in_and_has_already_saved_page: - data: - page_path: /government/organisations/prime-ministers-office-10-downing-street - signed_in: true - page_is_saved: true From 7cfd922477667c36294f7b6922cf64599ded9047 Mon Sep 17 00:00:00 2001 From: Huw Diprose Date: Tue, 28 Sep 2021 16:57:46 +0100 Subject: [PATCH 07/10] Remove save page confirmation --- app/views/layouts/application.html.erb | 2 -- app/views/shared/_save_page_confirmation.html.erb | 15 --------------- 2 files changed, 17 deletions(-) delete mode 100644 app/views/shared/_save_page_confirmation.html.erb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 523b84ff9..ee22d40d1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -42,8 +42,6 @@ <%= render 'govuk_publishing_components/components/phase_banner', phase: @content_item.phase %> <% end %> - <%= render 'shared/save_page_confirmation' %> - <% unless @do_not_show_breadcrumbs %> <% if @content_item.try(:back_link) %> <%= render 'govuk_publishing_components/components/back_link', href: @content_item.back_link %> diff --git a/app/views/shared/_save_page_confirmation.html.erb b/app/views/shared/_save_page_confirmation.html.erb deleted file mode 100644 index c9e68a92e..000000000 --- a/app/views/shared/_save_page_confirmation.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -<% if has_saved_page_confirmation? %> -
-
-
- <%= render "govuk_publishing_components/components/success_alert", { - message: t("components.save_this_page.confirmations.#{personalisation_param}.message"), - description: sanitize(additional_text({ - additional_class: "govuk-notification-banner__link", - signed_in: logged_in?, - })), - } %> -
-
-
-<% end %> From 2b0d3c11e47ef767d5f00f7521b613583c995638 Mon Sep 17 00:00:00 2001 From: Huw Diprose Date: Tue, 28 Sep 2021 16:58:06 +0100 Subject: [PATCH 08/10] Remove tests for save a page feature --- test/components/save_this_page_test.rb | 49 ------------- test/controllers/save_a_page_test.rb | 82 ---------------------- test/helpers/save_this_page_helper_test.rb | 57 --------------- 3 files changed, 188 deletions(-) delete mode 100644 test/components/save_this_page_test.rb delete mode 100644 test/controllers/save_a_page_test.rb delete mode 100644 test/helpers/save_this_page_helper_test.rb diff --git a/test/components/save_this_page_test.rb b/test/components/save_this_page_test.rb deleted file mode 100644 index b70e98a0d..000000000 --- a/test/components/save_this_page_test.rb +++ /dev/null @@ -1,49 +0,0 @@ -require "component_test_helper" - -class SaveThisPageTest < ComponentTestCase - def component_name - "save_this_page" - end - - test "does not render without page path" do - assert_empty render_component({}) - assert_empty render_component( - signed_in: true, - page_is_saved: true, - ) - end - - test "renders signed out state by default" do - render_component(page_path: "/test") - assert_select ".app-c-save-this-page a.govuk-button", text: "Add to your saved pages", href: "#{Plek.new.website_root}/account/saved-pages/add?page_path=/test" - assert_select ".app-c-save-this-page .govuk-link", text: "Sign in" - end - - test "renders signed out state when signed_in is false" do - render_component( - page_path: "/test", - signed_in: false, - ) - assert_select ".app-c-save-this-page a.govuk-button", text: "Add to your saved pages", href: "#{Plek.new.website_root}/account/saved-pages/add?page_path=/test" - assert_select ".app-c-save-this-page .govuk-link", text: "Sign in" - end - - test "renders signed in state with 'save this page' option" do - render_component( - page_path: "/test", - signed_in: true, - ) - assert_select ".app-c-save-this-page a.govuk-button", text: "Add to your saved pages", href: "#{Plek.new.website_root}/account/saved-pages/add?page_path=/test" - assert_select ".app-c-save-this-page .govuk-link", text: "See your saved pages" - end - - test "renders with 'remove this page' option if page has already been saved" do - render_component( - page_path: "/test", - signed_in: true, - page_is_saved: true, - ) - assert_select ".app-c-save-this-page a.govuk-button", text: "Remove from your saved pages", href: "/account/saved-pages/remove?page_path=/test" - assert_select ".app-c-save-this-page .govuk-link", text: "See your saved pages" - end -end diff --git a/test/controllers/save_a_page_test.rb b/test/controllers/save_a_page_test.rb deleted file mode 100644 index 280279d42..000000000 --- a/test/controllers/save_a_page_test.rb +++ /dev/null @@ -1,82 +0,0 @@ -require "test_helper" -require "gds_api/test_helpers/account_api" - -class ContentItemsControllerTest < ActionController::TestCase - include GdsApi::TestHelpers::AccountApi - include GdsApi::TestHelpers::ContentStore - include GovukPersonalisation::TestHelpers::Requests - - SAVE_A_PAGE_CSS_SELECTOR = ".app-c-save-this-page".freeze - - test "does not show the save-page button when the feature flag is off" do - stub_feature_flag_off - set_up_and_visit_content_item("detailed_guide", "detailed_guide") - - assert_not has_save_this_page_button_css_selector - end - - test "logged out - shows the add_page_button when the feature flag is on" do - stub_feature_flag_on - set_up_and_visit_content_item("detailed_guide", "detailed_guide") - - assert has_save_page_button("/guidance/salary-sacrifice-and-the-effects-on-paye") - end - - test "invalid session - shows the add_page_button when the feature flag is on" do - stub_feature_flag_on - stub_account_api_unauthorized_get_saved_page(page_path: "/guidance/salary-sacrifice-and-the-effects-on-paye") - set_up_and_visit_content_item("detailed_guide", "detailed_guide") - - assert has_save_page_button("/guidance/salary-sacrifice-and-the-effects-on-paye") - end - - test "logged in - shows the add_page_button when the feature flag is on and page is not saved" do - stub_feature_flag_on - mock_logged_in_session - stub_account_api_does_not_have_saved_page(page_path: "/guidance/salary-sacrifice-and-the-effects-on-paye") - set_up_and_visit_content_item("detailed_guide", "detailed_guide") - - assert has_save_page_button("/guidance/salary-sacrifice-and-the-effects-on-paye") - end - - test "logged in - shows the remove_page_button when the feature flag is on and page is saved" do - stub_feature_flag_on - mock_logged_in_session - stub_account_api_get_saved_page(page_path: "/guidance/salary-sacrifice-and-the-effects-on-paye") - set_up_and_visit_content_item("detailed_guide", "detailed_guide") - - assert has_remove_this_page_button("/guidance/salary-sacrifice-and-the-effects-on-paye") - end - -private - - def stub_feature_flag_on - @controller.stubs(:save_this_page_enabled?).returns(true) - end - - def stub_feature_flag_off - @controller.stubs(:save_this_page_enabled?).returns(false) - end - - def set_up_and_visit_content_item(document_type, example_name) - content_item = content_store_has_schema_example(document_type, example_name) - stub_content_store_has_item(content_item["base_path"], content_item) - path = content_item["base_path"][1..] - - get :show, params: { path: path } - end - - def has_save_this_page_button_css_selector - response.body.include?(SAVE_A_PAGE_CSS_SELECTOR) - end - - def has_save_page_button(page_path = "/test") - response.body.include?(I18n.t("components.save_this_page.add_page_button")) && - response.body.include?("#{Plek.new.website_root}/account/saved-pages/add?page_path=#{page_path}") - end - - def has_remove_this_page_button(page_path = "/test") - response.body.include?(I18n.t("components.save_this_page.remove_page_button")) && - response.body.include?("#{Plek.new.website_root}/account/saved-pages/remove?page_path=#{page_path}") - end -end diff --git a/test/helpers/save_this_page_helper_test.rb b/test/helpers/save_this_page_helper_test.rb deleted file mode 100644 index 62f0fcdc9..000000000 --- a/test/helpers/save_this_page_helper_test.rb +++ /dev/null @@ -1,57 +0,0 @@ -require "test_helper" - -class SaveThisPageHelperTest < ActionView::TestCase - test "displays correctly by default" do - params = { page_path: "/test" } - has_save_this_page_button(params) - has_page_not_saved_heading(params) - has_signed_out_additional_text(params) - end - - test "displays correctly when user is signed out" do - params = { page_path: "/test", signed_in: false } - has_save_this_page_button(params) - has_page_not_saved_heading(params) - has_signed_out_additional_text(params) - end - - test "displays correctly when user is signed in and has not saved the page" do - params = { page_path: "/test", signed_in: true, page_is_saved: false } - has_save_this_page_button(params) - has_page_not_saved_heading(params) - has_signed_in_additional_text(params) - end - - test "displays correctly when user is signed in and has already saved the page" do - params = { page_path: "/test", signed_in: true, page_is_saved: true } - has_remove_this_page_button(params) - has_page_was_saved_heading(params) - has_signed_in_additional_text(params) - end - - def has_save_this_page_button(params) - assert_equal I18n.t("components.save_this_page.add_page_button"), link_text(params) - assert_equal "#{Plek.new.website_root}/account/saved-pages/add?page_path=/test", link_href(params) - end - - def has_remove_this_page_button(params) - assert_equal I18n.t("components.save_this_page.remove_page_button"), link_text(params) - assert_equal "#{Plek.new.website_root}/account/saved-pages/remove?page_path=/test", link_href(params) - end - - def has_page_not_saved_heading(params) - assert_equal I18n.t("components.save_this_page.page_not_saved_heading"), heading_text(params) - end - - def has_page_was_saved_heading(params) - assert_equal I18n.t("components.save_this_page.page_was_saved_heading"), heading_text(params) - end - - def has_signed_in_additional_text(params) - assert_equal I18n.t("components.save_this_page.see_saved_pages_signed_in", link: "#{Plek.new.website_root}/account/saved-pages", additional_class: ""), additional_text(params) - end - - def has_signed_out_additional_text(params) - assert_equal I18n.t("components.save_this_page.see_saved_pages_signed_out", link: "#{Plek.new.website_root}/account/saved-pages", additional_class: ""), additional_text(params) - end -end From c299bd51459e63a6feedfd569b6ca0224e79305f Mon Sep 17 00:00:00 2001 From: Huw Diprose Date: Tue, 28 Sep 2021 16:59:06 +0100 Subject: [PATCH 09/10] Remove GOV.UK Personalisation Gem For now we have removed everywhere this gem was used. It may return with subsequent Accounts or personalisation features, but perhaps better to clean it up now whilst we remember and return it when there is a need --- Gemfile | 1 - Gemfile.lock | 1 - 2 files changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index bfb1da2aa..8502a53ae 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,6 @@ gem "dalli" gem "gds-api-adapters" gem "govuk_ab_testing" gem "govuk_app_config" -gem "govuk_personalisation" gem "govuk_publishing_components" gem "htmlentities" gem "plek" diff --git a/Gemfile.lock b/Gemfile.lock index 7d02e658a..1a53d0b31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -416,7 +416,6 @@ DEPENDENCIES gds-api-adapters govuk_ab_testing govuk_app_config - govuk_personalisation govuk_publishing_components govuk_schemas govuk_test From d15d1e0d701f9279fd79fed534b62a07b88faa21 Mon Sep 17 00:00:00 2001 From: Huw Diprose Date: Tue, 28 Sep 2021 17:40:58 +0100 Subject: [PATCH 10/10] Update GDS API Adaptors to v75.0.0 v75 removes the saved page API calls for account-api. v74 replaces level_of_authentication param with mfa --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1a53d0b31..1fc34db8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,7 +123,7 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) ffi (1.13.1) - gds-api-adapters (73.1.0) + gds-api-adapters (75.0.0) addressable link_header null_logger @@ -373,7 +373,7 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) + unf_ext (0.0.8) unicode-display_width (2.1.0) unicorn (5.8.0) kgio (~> 2.6)