diff --git a/classes/People.php b/classes/People.php index 3b0c7e6016..5ed382ff23 100644 --- a/classes/People.php +++ b/classes/People.php @@ -212,6 +212,7 @@ private function _get_data_by_group($args) { if (!isset($data[$p_id])) { $name = member_full_name($this->house, $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']); $constituency = $row['constituency'] ? gettext($row['constituency']) : ''; + $party = $row['party'] ? gettext($row['party']) : ''; $url = make_member_url($name, $constituency, $this->house, $p_id); $narray = array ( 'person_id' => $p_id, @@ -221,7 +222,7 @@ private function _get_data_by_group($args) { 'name' => $name, 'url' => $url, 'constituency' => $constituency, - 'party' => $row['party'], + 'party' => $party, 'left_reason' => $row['left_reason'], ); $data[$p_id] = $narray; diff --git a/locale/TheyWorkForYou.pot b/locale/TheyWorkForYou.pot index 38ba52bc82..c4d4f91a80 100644 --- a/locale/TheyWorkForYou.pot +++ b/locale/TheyWorkForYou.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-27 12:21+0100\n" +"POT-Creation-Date: 2023-07-05 12:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -392,6 +392,26 @@ msgstr "" msgid "South Wales West" msgstr "" +#: locale/welsh-parties.php:2 +msgid "Conservative" +msgstr "" + +#: locale/welsh-parties.php:3 +msgid "Independent" +msgstr "" + +#: locale/welsh-parties.php:4 +msgid "Labour" +msgstr "" + +#: locale/welsh-parties.php:5 +msgid "Liberal Democrat" +msgstr "" + +#: locale/welsh-parties.php:6 +msgid "Plaid Cymru" +msgstr "" + #: scripts/alertmailer.php:116 msgid "Commons debate" msgstr "" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/TheyWorkForYou.po b/locale/cy_GB.UTF-8/LC_MESSAGES/TheyWorkForYou.po index 36eed3cb34..9c710597f1 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/TheyWorkForYou.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/TheyWorkForYou.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-27 12:21+0100\n" +"POT-Creation-Date: 2023-07-05 12:13+0100\n" "PO-Revision-Date: 2023-03-20 17:59-0000\n" "Language-Team: mySociety\n" "Language: fr\n" @@ -377,6 +377,26 @@ msgstr "Dwyrain De Cymru" msgid "South Wales West" msgstr "Gorllewin De Cymru" +#: locale/welsh-parties.php:2 +msgid "Conservative" +msgstr "Ceidwadwyr" + +#: locale/welsh-parties.php:3 +msgid "Independent" +msgstr "Annibynnol" + +#: locale/welsh-parties.php:4 +msgid "Labour" +msgstr "Llafur" + +#: locale/welsh-parties.php:5 +msgid "Liberal Democrat" +msgstr "Democratiaid Rhyddfrydol" + +#: locale/welsh-parties.php:6 +msgid "Plaid Cymru" +msgstr "Plaid Cymru" + #: scripts/alertmailer.php:116 msgid "Commons debate" msgstr "Dadl Tŷ'r Cyffredin" diff --git a/locale/welsh-parties.php b/locale/welsh-parties.php new file mode 100644 index 0000000000..c9df6dbbb3 --- /dev/null +++ b/locale/welsh-parties.php @@ -0,0 +1,6 @@ + $name, 'house' => $member['house'], "constituency" => $member["constituency"] ? gettext($member["constituency"]) : '', - "party" => $member["party"], + "party" => $member["party"] ? gettext($member["party"]) : '', "person_id" => $person_id, "url" => $URL->generate(), ); diff --git a/www/includes/easyparliament/member.php b/www/includes/easyparliament/member.php index cf3609481e..193fddd38d 100644 --- a/www/includes/easyparliament/member.php +++ b/www/includes/easyparliament/member.php @@ -166,7 +166,7 @@ public function __construct($args) { $this->houses[] = $house; } $const = $row['constituency'] ? gettext($row['constituency']) : ''; - $party = $row['party']; + $party = $row['party'] ? gettext($row['party']) : ''; $entered_house = $row['entered_house']; $left_house = $row['left_house']; $entered_reason = $row['entered_reason']; diff --git a/www/includes/easyparliament/templates/html/divisions/_dot_vote_list.php b/www/includes/easyparliament/templates/html/divisions/_dot_vote_list.php index d41a0e741e..cfed7ca515 100644 --- a/www/includes/easyparliament/templates/html/divisions/_dot_vote_list.php +++ b/www/includes/easyparliament/templates/html/divisions/_dot_vote_list.php @@ -4,7 +4,7 @@