View | Details | Raw Unified | Return to bug 20346
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-16 / +15 lines)
Lines 434-446 Link Here
434
        function tooltip_display() {
434
        function tooltip_display() {
435
                var dateformat= document.getElementById("date_format").value;
435
                var dateformat= document.getElementById("date_format").value;
436
                if ( dateformat == 'us') {
436
                if ( dateformat == 'us') {
437
                    $('#searchmember_filter').attr("title","Please enter date inputs in the format mm/dd/yyyy").tooltip('show');
437
                    $('#searchmember_filter').attr("title",_("Please enter date inputs in the format mm/dd/yyyy")).tooltip('show');
438
                } else if ( dateformat  == "metric") {
438
                } else if ( dateformat  == "metric") {
439
                    $('#searchmember_filter').attr("title","Please enter date inputs in the format dd/mm/yyyy").tooltip('show');
439
                    $('#searchmember_filter').attr("title",_("Please enter date inputs in the format dd/mm/yyyy")).tooltip('show');
440
                } else if ( dateformat  == "iso") {
440
                } else if ( dateformat  == "iso") {
441
                    $('#searchmember_filter').attr("title","Please enter date inputs in the format yyyy-mm-dd").tooltip('show');
441
                    $('#searchmember_filter').attr("title",_("Please enter date inputs in the format yyyy-mm-dd")).tooltip('show');
442
                } else if ( dateformat == "dmydot") {
442
                } else if ( dateformat == "dmydot") {
443
                    $('#searchmember_filter').attr("title","Please enter date inputs in the format dd.mm.yyyy").tooltip('show');
443
                    $('#searchmember_filter').attr("title",_("Please enter date inputs in the format dd.mm.yyyy")).tooltip('show');
444
                }
444
                }
445
        }
445
        }
446
        // Update the string "Results found ..."
446
        // Update the string "Results found ..."
Lines 460-506 Link Here
460
                searched += "'" + $("#searchmember").val() + "'";
460
                searched += "'" + $("#searchmember").val() + "'";
461
            }
461
            }
462
            if ( $("#categorycode").val() ) {
462
            if ( $("#categorycode").val() ) {
463
                searched += _(" with category ") + "'" + $("#categorycode").find("option:selected").text() + "'";
463
                searched += _(" with category '%s'").format($("#categorycode").find("option:selected").text());
464
            }
464
            }
465
            if ( $("#branchcode").val() ) {
465
            if ( $("#branchcode").val() ) {
466
                searched += _(" in library ") + $("#branchcode").find("option:selected").text();
466
                searched += _(" in library '%s'").format($("#branchcode").find("option:selected").text());
467
            }
467
            }
468
468
469
            //Creating the searched message for the settings set for the filtered event
469
            //Creating the searched message for the settings set for the filtered event
470
            if ( $("#searchmember_filter").val() ) {
470
            if ( $("#searchmember_filter").val() ) {
471
               if ( $("#searchtype_filter").val() == 'start_with' ) {
471
               if ( $("#searchtype_filter").val() == 'start_with' ) {
472
                     filtered = " starting with ";
472
                     filtered = _(" starting with ");
473
               } else {
473
               } else {
474
                     filtered = " containing ";
474
                     filtered = _(" containing ");
475
               }
475
               }
476
               filtered += "'" + $("#searchmember_filter").val() + "'";
476
               filtered += "'" + $("#searchmember_filter").val() + "'";
477
             }
477
             }
478
             if ( $("#firstletter_filter").val() ) {
478
             if ( $("#firstletter_filter").val() ) {
479
                 if ( $("#searchmember_filter").val() || $("#categorycode_filter").val() || $("#branchcode_filter").val()) {
479
                 if ( $("#searchmember_filter").val() || $("#categorycode_filter").val() || $("#branchcode_filter").val()) {
480
                    filtered += " begins with " + "'" + $("#firstletter_filter").val() +"'";
480
                    filtered += _(" begins with '%s'").format($("#firstletter_filter").val());
481
                 } else {
481
                 } else {
482
                    filtered = " begins with " + "'" + $("#firstletter_filter").val() +"'";
482
                    filtered = _(" begins with '%s'").format($("#firstletter_filter").val());
483
                 }
483
                 }
484
             }
484
             }
485
             if ( $("#categorycode_filter").val() ) {
485
             if ( $("#categorycode_filter").val() ) {
486
                  if ( $("#searchmember_filter").val() || $("#firstletter_filter").val() || $("#branchcode_filter").val()) {
486
                  if ( $("#searchmember_filter").val() || $("#firstletter_filter").val() || $("#branchcode_filter").val()) {
487
                    filtered += " with category " + "'" + $("#categorycode_filter").find("option:selected").text() + "'";
487
                    filtered += _(" with category '%s'").format($("#categorycode_filter").find("option:selected").text());
488
                  } else {
488
                  } else {
489
                    filtered = " with category " + "'" + $("#categorycode_filter").find("option:selected").text() + "'";
489
                    filtered = _(" with category '%s'").format($("#categorycode_filter").find("option:selected").text());
490
                  }
490
                  }
491
             }
491
             }
492
             if ( $("#branchcode_filter").val() ) {
492
             if ( $("#branchcode_filter").val() ) {
493
                 if ( $("#searchmember_filter").val() || $("#firstletter_filter").val() ||  $("#categorycode_filter").val()) {
493
                 if ( $("#searchmember_filter").val() || $("#firstletter_filter").val() ||  $("#categorycode_filter").val()) {
494
                    filtered += " in library " + $("#branchcode_filter").find("option:selected").text();
494
                    filtered += _(" in library '%s'").format($("#branchcode_filter").find("option:selected").text());
495
                 } else {
495
                 } else {
496
                    filtered = " in library " + $("#branchcode_filter").find("option:selected").text();
496
                    filtered = _(" in library '%s'").format($("#branchcode_filter").find("option:selected").text());
497
                 }
497
                 }
498
             }
498
             }
499
499
500
             var searchevent;
500
             var searchevent;
501
             //Concatenate the searched and filtered messages into a single message
501
             //Concatenate the searched and filtered messages into a single message
502
             if (first_query != searchmember) {
502
             if (first_query != searchmember) {
503
                searchevent = searched + " filtered by " + filtered;
503
                searchevent = searched + _(" filtered by ") + filtered;
504
                $("#searchpattern").text(searchevent);
504
                $("#searchpattern").text(searchevent);
505
             } else {
505
             } else {
506
                $("#searchpattern").text(searched);
506
                $("#searchpattern").text(searched);
507
- 

Return to bug 20346