From 5614ef85a1f2fb003fe74551b23481461ee84f26 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 18 Aug 2023 11:43:15 +0000 Subject: [PATCH] Bug 34386: Fix inconsistencies in Cities and tows page titles, breadcrumbs, and header This patch updates the cities administration page so that page title, breadcrumb navigation, and headings are consistent with each other and with other parts of Koha. To test, apply the patch and go to Administration -> Cities and towns. Check each variation of the page to confirm that page title, breadcrumb navigation, and heading are correct. - Main page (listing cities) - New city - Edit city - Delete city --- .../prog/en/modules/admin/cities.tt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index d5306a06804..c5b756a1253 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -7,13 +7,13 @@ [% FILTER collapse %] [% IF op =='add_form' %] [% IF city.cityid %] - [% t("Modify city") | html %] + [% tx("Modify city '{city}'", { city = city.city_name }) | html %] [% ELSE %] [% t("New city") | html %] [% END %] › [% ELSE %] [% IF op == 'delete_confirm' %] - [% t("Confirm deletion of city") | html %] › + [% tx("Confirm deletion of city '{city}'", { city = city.city_name }) | html %] › [% END %] [% END %] [% t("Cities") | html %] › @@ -40,7 +40,7 @@ [% END %] [% WRAPPER breadcrumb_item bc_active = 1 %] [% IF city.cityid %] - <span>Modify city</span> + [% tx("Modify city '{city}'", { city = city.city_name }) | html %] [% ELSE %] <span>New city</span> [% END %] @@ -51,7 +51,7 @@ <a href="/cgi-bin/koha/admin/cities.pl">Cities</a> [% END %] [% WRAPPER breadcrumb_item bc_active = 1 %] - <span>Confirm deletion of city</span> + [% tx("Confirm deletion of city '{city}'", { city = city.city_name }) | html %] [% END %] [% ELSE %] @@ -93,7 +93,9 @@ [% IF op == 'add_form' %] [% IF city %] - <h1>Modify a city</h1> + <h1> + [% tx("Modify city '{city}'", { city = city.city_name }) | html %] + </h1> [% ELSE %] <h1>New city</h1> [% END %] @@ -135,7 +137,9 @@ [% IF op == 'delete_confirm' %] <div class="dialog alert"> - <h1>Delete city "[% city.city_name | html %]?"</h1> + <h1> + [% tx("Confirm deletion of city '{city}'", { city = city.city_name }) | html %] + </h1> <table> <tr><th>City id</th> <td>[% city.cityid | html %]</td> -- 2.30.2