Bugzilla – Attachment 73520 Details for
Bug 20346
Patron filtering resulting in new search rather than filtering existing results
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20346 - Making JS strings translatable
Bug-20346---Making-JS-strings-translatable.patch (text/plain), 5.78 KB, created by
Alex Buckley
on 2018-04-02 10:26:51 UTC
(
hide
)
Description:
Bug 20346 - Making JS strings translatable
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2018-04-02 10:26:51 UTC
Size:
5.78 KB
patch
obsolete
>From 325f6b74d09fea051f58d01beb44bb7918a71a3f Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >Date: Mon, 2 Apr 2018 10:24:49 +0000 >Subject: [PATCH] Bug 20346 - Making JS strings translatable > >This is based on tester feedback in comments 7 and 8 > >Sponsored-By: Catalyst IT >--- > .../prog/en/modules/members/member.tt | 30 +++++++++++----------- > 1 file changed, 15 insertions(+), 15 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index 53f78df..5bd45be 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -434,13 +434,13 @@ > function tooltip_display() { > var dateformat= document.getElementById("date_format").value; > if ( dateformat == 'us') { >- $('#searchmember_filter').attr("title","Please enter date inputs in the format mm/dd/yyyy").tooltip('show'); >+ $('#searchmember_filter').attr("title",_("Please enter date inputs in the format mm/dd/yyyy")).tooltip('show'); > } else if ( dateformat == "metric") { >- $('#searchmember_filter').attr("title","Please enter date inputs in the format dd/mm/yyyy").tooltip('show'); >+ $('#searchmember_filter').attr("title",_("Please enter date inputs in the format dd/mm/yyyy")).tooltip('show'); > } else if ( dateformat == "iso") { >- $('#searchmember_filter').attr("title","Please enter date inputs in the format yyyy-mm-dd").tooltip('show'); >+ $('#searchmember_filter').attr("title",_("Please enter date inputs in the format yyyy-mm-dd")).tooltip('show'); > } else if ( dateformat == "dmydot") { >- $('#searchmember_filter').attr("title","Please enter date inputs in the format dd.mm.yyyy").tooltip('show'); >+ $('#searchmember_filter').attr("title",_("Please enter date inputs in the format dd.mm.yyyy")).tooltip('show'); > } > } > // Update the string "Results found ..." >@@ -460,47 +460,47 @@ > searched += "'" + $("#searchmember").val() + "'"; > } > if ( $("#categorycode").val() ) { >- searched += _(" with category ") + "'" + $("#categorycode").find("option:selected").text() + "'"; >+ searched += _(" with category '%s'").format($("#categorycode").find("option:selected").text()); > } > if ( $("#branchcode").val() ) { >- searched += _(" in library ") + $("#branchcode").find("option:selected").text(); >+ searched += _(" in library '%s'").format($("#branchcode").find("option:selected").text()); > } > > //Creating the searched message for the settings set for the filtered event > if ( $("#searchmember_filter").val() ) { > if ( $("#searchtype_filter").val() == 'start_with' ) { >- filtered = " starting with "; >+ filtered = _(" starting with "); > } else { >- filtered = " containing "; >+ filtered = _(" containing "); > } > filtered += "'" + $("#searchmember_filter").val() + "'"; > } > if ( $("#firstletter_filter").val() ) { > if ( $("#searchmember_filter").val() || $("#categorycode_filter").val() || $("#branchcode_filter").val()) { >- filtered += " begins with " + "'" + $("#firstletter_filter").val() +"'"; >+ filtered += _(" begins with '%s'").format($("#firstletter_filter").val()); > } else { >- filtered = " begins with " + "'" + $("#firstletter_filter").val() +"'"; >+ filtered = _(" begins with '%s'").format($("#firstletter_filter").val()); > } > } > if ( $("#categorycode_filter").val() ) { > if ( $("#searchmember_filter").val() || $("#firstletter_filter").val() || $("#branchcode_filter").val()) { >- filtered += " with category " + "'" + $("#categorycode_filter").find("option:selected").text() + "'"; >+ filtered += _(" with category '%s'").format($("#categorycode_filter").find("option:selected").text()); > } else { >- filtered = " with category " + "'" + $("#categorycode_filter").find("option:selected").text() + "'"; >+ filtered = _(" with category '%s'").format($("#categorycode_filter").find("option:selected").text()); > } > } > if ( $("#branchcode_filter").val() ) { > if ( $("#searchmember_filter").val() || $("#firstletter_filter").val() || $("#categorycode_filter").val()) { >- filtered += " in library " + $("#branchcode_filter").find("option:selected").text(); >+ filtered += _(" in library '%s'").format($("#branchcode_filter").find("option:selected").text()); > } else { >- filtered = " in library " + $("#branchcode_filter").find("option:selected").text(); >+ filtered = _(" in library '%s'").format($("#branchcode_filter").find("option:selected").text()); > } > } > > var searchevent; > //Concatenate the searched and filtered messages into a single message > if (first_query != searchmember) { >- searchevent = searched + " filtered by " + filtered; >+ searchevent = searched + _(" filtered by ") + filtered; > $("#searchpattern").text(searchevent); > } else { > $("#searchpattern").text(searched); >-- >2.1.4
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 20346
:
72496
|
72520
|
72523
|
72623
|
72624
|
72815
|
73520