From a8ded669e45b4fa6310c88c1867aca73b5b39c37 Mon Sep 17 00:00:00 2001 From: Alex Parsons Date: Wed, 11 Sep 2024 08:54:35 +0000 Subject: [PATCH] Improve subscribe page and links --- classes/Homepage.php | 2 +- classes/SPHomepage.php | 2 +- classes/SectionView/NiView.php | 2 +- classes/SectionView/SeneddView.php | 2 +- .../cy_GB.UTF-8/LC_MESSAGES/TheyWorkForYou.po | 4 ++-- .../templates/html/static/about.php | 21 +++++++++++-------- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/classes/Homepage.php b/classes/Homepage.php index 5912a9887c..b9c0a78e3f 100644 --- a/classes/Homepage.php +++ b/classes/Homepage.php @@ -63,7 +63,7 @@ protected function getSearchBox(array $data): Search\SearchBox{ $search_box->add_quick_link('Find out more about your MP (' . $data["mp_data"]['name'] . ')', $data["mp_data"]['mp_url'], 'torso'); } $search_box->add_quick_link('Create and manage email alerts', '/alert/', 'megaphone'); - $search_box->add_quick_link('Subscribe to our newsletter', 'https://www.mysociety.org/subscribe/', 'mail'); + $search_box->add_quick_link(gettext('Subscribe to our newsletter'), '/about/#about-mysociety', 'mail'); $search_box->add_quick_link('Donate to support our work', '/support-us/', 'pound'); $search_box->add_quick_link('Learn more about TheyWorkForYou', '/about/', 'magnifying-glass'); return $search_box; diff --git a/classes/SPHomepage.php b/classes/SPHomepage.php index e0d0bccf53..90f59c070c 100644 --- a/classes/SPHomepage.php +++ b/classes/SPHomepage.php @@ -27,7 +27,7 @@ protected function getSearchBox(array $data): Search\SearchBox{ $search_box->add_quick_link('Find out more about your MSPs for ' . $data["mp_data"]["constituency"] . ' (' . $regional_con . ')', '/postcode/?pc=' . $data["mp_data"]['postcode'], 'torso' ); } $search_box->add_quick_link('Create and manage email alerts', '/alert/', 'megaphone'); - $search_box->add_quick_link('Subscribe to our newsletter', 'https://www.mysociety.org/subscribe/', 'mail'); + $search_box->add_quick_link(gettext('Subscribe to our newsletter'), '/about/#about-mysociety', 'mail'); $search_box->add_quick_link('Donate to support our work', '/support-us/', 'pound'); $search_box->add_quick_link('Learn more about TheyWorkForYou', '/about/', 'magnifying-glass'); return $search_box; diff --git a/classes/SectionView/NiView.php b/classes/SectionView/NiView.php index ece570107c..2589ab3f70 100644 --- a/classes/SectionView/NiView.php +++ b/classes/SectionView/NiView.php @@ -115,7 +115,7 @@ protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\S $search_box->add_quick_link('Find out more about your MLAs for ' . $constituency, '/postcode/?pc=' . $postcode, 'torso'); } $search_box->add_quick_link('Create and manage email alerts', '/alert/','megaphone'); - $search_box->add_quick_link('Subscribe to our newsletter', 'https://www.mysociety.org/subscribe/', 'mail'); + $search_box->add_quick_link(gettext('Subscribe to our newsletter'), '/about/#about-mysociety', 'mail'); $search_box->add_quick_link('Donate to support our work', '/support-us/','pound'); $search_box->add_quick_link('Learn more about TheyWorkForYou', '/about/', 'magnifying-glass'); return $search_box; diff --git a/classes/SectionView/SeneddView.php b/classes/SectionView/SeneddView.php index aa168ee3a8..c44b1469aa 100644 --- a/classes/SectionView/SeneddView.php +++ b/classes/SectionView/SeneddView.php @@ -121,7 +121,7 @@ protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\S $search_box->add_quick_link(sprintf(gettext('Find out more about your MSs for %s and %s'), $constituencies[0], $constituencies[1]), '/postcode/?pc=' . $data["mp_data"]['postcode'],'torso'); } $search_box->add_quick_link(gettext('Create and manage email alerts'), '/alert/','megaphone'); - $search_box->add_quick_link(gettext('Subscribe to our newsletter'), 'https://www.mysociety.org/subscribe/', 'mail'); + $search_box->add_quick_link(gettext('Subscribe to our newsletter'), '/about/#about-mysociety', 'mail'); $search_box->add_quick_link(gettext('Donate to support our work'), '/support-us/', 'pound'); $search_box->add_quick_link(gettext('Learn more about TheyWorkForYou'), '/about/', 'magnifying-glass'); return $search_box; diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/TheyWorkForYou.po b/locale/cy_GB.UTF-8/LC_MESSAGES/TheyWorkForYou.po index b281ab29ee..55a3d37c5e 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/TheyWorkForYou.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/TheyWorkForYou.po @@ -2619,7 +2619,7 @@ msgid "About mySociety" msgstr "Ynglŷn â mySociety" #: www/includes/easyparliament/templates/html/static/about.php:34 -msgid "TheyWorkForYou is run by mySociety, a UK charity that puts power in more people's hands through the use of digital tools and data." +msgid "TheyWorkForYou is run by mySociety, a UK charity that helps people access information and participate in democracy. We enable people across the UK to become changemakers by providing technology, research and data, openly and for free." msgstr "Mae TheyWorkForYou yn cael ei reoli gan mySociety, elusen yn y Deyrnas Unedig sy'n rhoi grym yn nwylo mwy o bobl drwy ddefnyddio data ac offer digidol." #: www/includes/easyparliament/templates/html/static/about.php:35 @@ -2631,7 +2631,7 @@ msgid "Find out more about how mySociety is funded." msgstr "Rhagor o wybodaeth am y modd y mae mySociety yn cael ei ariannu." #: www/includes/easyparliament/templates/html/static/about.php:39 -msgid "Sign up for updates from mySociety" +msgid "Sign up for updates on our democracy and Parliaments work" msgstr "Cofrestrwch am y newyddion diweddaraf gan mySociety" #: www/includes/easyparliament/templates/html/static/about.php:61 diff --git a/www/includes/easyparliament/templates/html/static/about.php b/www/includes/easyparliament/templates/html/static/about.php index 73750e42cb..f7e748d871 100644 --- a/www/includes/easyparliament/templates/html/static/about.php +++ b/www/includes/easyparliament/templates/html/static/about.php @@ -29,14 +29,9 @@ -
+

-

mySociety, a UK charity that puts power in more people\'s hands through the use of digital tools and data.') ?>

-

TheyWorkForYou and WriteToThem we have made elected representatives more transparent and contactable. Every year, hundreds of thousands of reports are made through FixMyStreet, and over a million Freedom of Information requests have been made through WhatDoTheyKnow.') ?>

- -

- -

+

-
+

mySociety, a UK charity that helps people access information and participate in democracy. We enable people across the UK to become changemakers by providing technology, research and data, openly and for free.') ?>

TheyWorkForYou and WriteToThem we have made elected representatives more transparent and contactable. Every year, hundreds of thousands of reports are made through FixMyStreet, and over a million Freedom of Information requests have been made through WhatDoTheyKnow.') ?>