Bugzilla – Attachment 158219 Details for
Bug 34802
Improve translation of title tags: Tags and comments
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34802: Improve translation of title tags: Tags and comments
Bug-34802-Improve-translation-of-title-tags-Tags-a.patch (text/plain), 7.70 KB, created by
Katrin Fischer
on 2023-11-01 21:27:48 UTC
(
hide
)
Description:
Bug 34802: Improve translation of title tags: Tags and comments
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-11-01 21:27:48 UTC
Size:
7.70 KB
patch
obsolete
>From b8ad8d4120b8d971660f9de3e76914dbdbdd31dc Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 15 Sep 2023 13:46:13 +0000 >Subject: [PATCH] Bug 34802: Improve translation of title tags: Tags and > comments > >This patch modifies tag and comments management templates so that title >tags can be more easily translated. The patch also makes some >modifications to titles, breadcrumb navigation, and page headers in >order to make them more consistent with each other and with other >similar pages. > >To test, apply the patch and go to Tools. Test each of the following >pages and each variation of the page to confirm that titles, >breadcrumbs, and page headers look correct. > >- Tags > - Main page > - Viewing tags by status: Approved, pending, and rejected (link in > the right-hand column) > - List of records by tag > - This page has been modified so that the menu of tag link in the > left-hand sidebar is styled consistently with other sidebar menus. >- Comments > - Approved comments > - Comments awaiting moderation > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/reviews/reviewswaiting.tt | 12 ++++++- > .../prog/en/modules/tags/list.tt | 27 ++++++++------ > .../prog/en/modules/tags/review.tt | 36 +++++++++++++++++-- > 3 files changed, 61 insertions(+), 14 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >index 21d49e4de0..13e06c44cc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >@@ -1,8 +1,18 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF ( status ) %]Approved comments[% ELSE %]Comments awaiting moderation[% END %] › Comments › Tools › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF( status ) %] >+ [% t("Approved comments") | html %] >+ [% ELSE %] >+ [% t("Comments awaiting moderation") | html %] >+ [% END %] › >+ [% t("Comments") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="tools_reviewswaiting" class="tools"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >index a2e0ce2f74..b2fb2b521d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -2,9 +2,15 @@ > [% USE Asset %] > [% USE AuthorisedValues %] > [% USE Branches %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF ( do_it ) %]Review[% ELSE %]Review tags[% END %] › Tags › Tools › Koha</title> >+<title>[% FILTER collapse %] >+ [% tx("Results for tag '{tag}'", { tag = tag }) | html %] › >+ [% t("Tags") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : transparent; }</style> >@@ -24,7 +30,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <a href="/cgi-bin/koha/tags/review.pl">Tags</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Results for tag <em>[% tag | html %]</em></span> >+ [% tx("Results for tag '{tag}'", { tag = tag }) | html %] > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >@@ -34,10 +40,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Results for tag <em>[% tag | html %]</em></h1> >+ <h1>[% tx("Results for tag '{tag}'", { tag = tag }) | html %]</h1> > > [% IF ( titles ) %] >-<h3>Titles tagged with the term <em>[% tag | html %]</em></h3> > <div class="page-section"> > <table id="itemst"> > <thead><tr> >@@ -89,12 +94,14 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <ul> >- <li><a href="/cgi-bin/koha/tags/review.pl?approved=1">Approved tags</a></li> >- <li><a href="/cgi-bin/koha/tags/review.pl?approved=-1">Rejected tags</a></li> >- <li><a href="/cgi-bin/koha/tags/review.pl?approved=0">Pending tags</a></li> >- <li><a href="/cgi-bin/koha/tags/review.pl?approved=all">All tags</a></li> >- </ul> >+ <div id="menu"> >+ <ul> >+ <li><a href="/cgi-bin/koha/tags/review.pl?approved=1">Approved tags</a></li> >+ <li><a href="/cgi-bin/koha/tags/review.pl?approved=-1">Rejected tags</a></li> >+ <li><a href="/cgi-bin/koha/tags/review.pl?approved=0">Pending tags</a></li> >+ <li><a href="/cgi-bin/koha/tags/review.pl?approved=all">All tags</a></li> >+ </ul> >+ </div> > [% INCLUDE 'tools-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index 7c66bfb024..cfa435a2d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -4,7 +4,18 @@ > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF ( do_it ) %]Review[% ELSE %]Review tags[% END %] › Tags › Tools › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF ( filter_approved_ok ) %] >+ [% t("Approved") | html %] › >+ [% ELSIF ( filter_approved_pending ) %] >+ [% t("Pending") | html %] › >+ [% ELSIF ( filter_approved_rej ) %] >+ [% t("Rejected") | html %] › >+ [% END %] >+ [% t("Tags") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > .setlabel {width: 6em; font-family: courier; background-color:#E8E8E8;} >@@ -25,8 +36,27 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> > [% END %] >- [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Tags</span> >+ [% IF ( filter_approved_ok || filter_approved_pending || filter_approved_rej ) %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/tags/review.pl">Tags</a> >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Tags</span> >+ [% END %] >+ [% END %] >+ [% IF ( filter_approved_ok ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Approved") | html %] >+ [% END %] >+ [% ELSIF ( filter_approved_pending ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Pending") | html %] >+ [% END %] >+ [% ELSIF ( filter_approved_rej ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Rejected") | html %] >+ [% END %] > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 34802
:
155669
|
157601
| 158219