From 598e6b208a4b463ecb0225aac899cd1520ae515b Mon Sep 17 00:00:00 2001 From: Srdjan Date: Mon, 13 Nov 2017 14:25:33 +1300 Subject: [PATCH] Bug 17602: Translations rework --- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 1c11dc3..9e919d6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -887,52 +887,52 @@ $(document).ready(function(){ $("#highlight_toggle_off").show().click(function() {highlightOff();}); [% END %] [% IF ( OverDriveEnabled ) %] - var $overdrive_results = $( '
' + _( 'Searching OverDrive...' ) + '
' ); + var $overdrive_results = $( '
' + MSG_SEARCHING.format('OverDrive') + '
' ); $( '#numresults' ) .append( ' ' ) .append( $overdrive_results ); KOHA.OverDrive.Search( "[% OverDriveLibraryID | html %]", querystring, 1, 0, function( data ) { if ( data.error ) { - $overdrive_results.html( _( 'Error searching OverDrive collection' ) ); + $overdrive_results.html( MSG_ERROR_SEARCHING_COLLECTION.format('OverDrive') ); return; } if ( data.totalItems ) { - $overdrive_results.html( _( 'Found' ) + ' ' + data.totalItems + ' ' + _( 'results' ) + ' ' + _( 'in OverDrive collection' ) ); + $overdrive_results.html( '' + MSG_RESULTS_FOUND_IN_COLLECTION.format(data.totalItems, 'OverDrive') + '' ); } else { $overdrive_results.remove(); } } ); [% END %] [% IF ( RecordedBooksEnabled ) %] - var $recordedbooks_results = $( '
' + _( "Searching RecordedBooks..." ) + '
' ); + var $recordedbooks_results = $( '
' + MSG_SEARCHING.format('RecordedBooks') + '
' ); $( '#numresults' ) .append( ' ' ) .append( $recordedbooks_results ); KOHA.RecordedBooks.search( querystring, [% OPACnumSearchResults || "null" %], null, function( data ) { if ( data.error ) { - $recordedbooks_results.html( _( "Error searching RecordedBooks collection: %s" ).format( data.error ) ); + $recordedbooks_results.html( MSG_ERROR_SEARCHING_COLLECTION.format('RecordedBooks') + ': ' + data.error); return; } // data.total can be either 42 or "60+" if ( typeof(data.total) === 'string' && data.total.charAt(0) > 0 || typeof(data.total) === 'number' && data.total > 0 ) { - $recordedbooks_results.html( _( "Found %s results in RecordedBooks collection" ).format('' + data.total + '') ); + $recordedbooks_results.html( '' + MSG_RESULTS_FOUND_IN_COLLECTION.format(data.total, 'RecordedBooks') + '' ); } else { $recordedbooks_results.remove(); } } ); [% END %] [% IF ( OpenLibrarySearch ) %] - var $openlibrary_results = $( '
' + _( 'Searching Open Library...' ) + '
' ); + var $openlibrary_results = $( '
' + MSG_SEARCHING.format('OpenLibrary' ) + '
' ); $( '#numresults' ) .append( ' ' ) .append( $openlibrary_results ); KOHA.OpenLibrary.search( querystring, null, function( data ) { if ( data.error ) { - $openlibrary_results.html( _( 'Error searching OpenLibrary collection' ) ); + $openlibrary_results.html( MSG_ERROR_SEARCHING_COLLECTION.format('OpenLibrary') ); return; } if ( data.numFound > 0 ) { - $openlibrary_results.html( _( 'Found' ) + ' ' + data.numFound + ' ' + _( 'results' ) + ' ' + _( 'in OpenLibrary collection' ) ); + $openlibrary_results.html( '' + MSG_RESULTS_FOUND_IN_COLLECTION.format(data.numFound, 'OpenLibrary') + '' ); } else { $openlibrary_results.remove(); } -- 2.1.4