From fd07c72f381da83001396fbe24e400b7170ee9ab Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 31 Dec 2012 10:59:59 -0500 Subject: [PATCH] Bug 9331 - Untranslatable strings in ajax.js This patch moves untranslatable strings from ajax.js into the template where they can be picked up by the translation script. To test that preference-related error messages continue to work, open the system preferences editor in two tabs. Log out in one tab and try to save a system preference in the other. You should see correct error messages. To test that error strings are now translatable, run "perl translate update " from misc/translator, then check if the affected strings shows up in the po file. Signed-off-by: Chris Cormack Still works, and is now translatable Signed-off-by: Jonathan Druart Signed-off-by: Jared Camins-Esakov --- koha-tmpl/intranet-tmpl/prog/en/js/ajax.js | 16 ++++++++-------- .../prog/en/modules/admin/preferences.tt | 11 ++++++++--- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js b/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js index dfc0444135..71f8365045 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js @@ -7,7 +7,7 @@ KOHA.AJAX = { cache: false, dataType: 'json', type: 'POST', - error: function ( xhr, stat, error ) { KOHA.AJAX.BaseError( error_callback, xhr, stat, error ) } + error: function ( xhr, stat, error ) { KOHA.AJAX.BaseError( error_callback, xhr, stat, error ); } } ); $.ajax( options ); }, @@ -15,30 +15,30 @@ KOHA.AJAX = { KOHA.xhr = xhr; if ( !xhr.getResponseHeader( 'content-type' ).match( 'application/json' ) ) { // Something really failed - humanMsg.displayAlert( _( 'Internal Server Error, please reload the page' ) ); + humanMsg.displayAlert( MSG_INTERNAL_SERVER_ERROR ); return; } var error = eval( '(' + xhr.responseText + ')' ); if ( error.type == 'auth' ) { - humanMsg.displayMsg( _( 'You need to log in again, your session has timed out' ) ); + humanMsg.displayMsg( MSG_SESSION_TIMED_OUT ); } if ( callback ) { callback( error ); } else { - humanMsg.displayAlert( _( 'Error; your data might not have been saved' ) ); + humanMsg.displayAlert( MSG_DATA_NOT_SAVED ); } }, MarkRunning: function ( selector, text ) { - text = text || _( 'Loading...' ); + text = text || MSG_LOADING; $( selector ) .attr( 'disabled', 'disabled' ) .each( function () { var $image = $( '' ); var selector_type = this.localName; - if (selector_type == undefined) selector_type = this.nodeName; // IE only + if (selector_type === undefined) selector_type = this.nodeName; // IE only switch ( selector_type.toLowerCase() ) { case 'input': $( this ).data( 'original-text', this.value ); @@ -65,7 +65,7 @@ KOHA.AJAX = { .removeAttr( 'disabled' ) .each( function () { var selector_type = this.localName; - if (selector_type == undefined) selector_type = this.nodeName; // IE only + if (selector_type === undefined) selector_type = this.nodeName; // IE only switch ( selector_type.toLowerCase() ) { case 'input': this.value = $( this ).data( 'original-text' ); @@ -85,4 +85,4 @@ KOHA.AJAX = { } ) .removeData( 'original-text' ); } -} +}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt index 823a825bb9..139c35ed92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -3,9 +3,6 @@ [% INCLUDE 'doc-head-close.inc' %] - - - + + + -- 2.39.5