Merge pull request #1129 from jetic83/master

Update strings.js solves issue #1124
This commit is contained in:
Ian Gilman 2017-02-13 09:54:49 -08:00 committed by GitHub
commit 2bde6a2ec4
2 changed files with 3 additions and 3 deletions

View File

@ -82,7 +82,7 @@ $.extend( $, /** @lends OpenSeadragon */{
string = container[ props[ i ] ]; string = container[ props[ i ] ];
if ( typeof( string ) != "string" ) { if ( typeof( string ) != "string" ) {
$.console.debug( "Untranslated source string:", prop ); $.console.log( "Untranslated source string:", prop );
string = ""; // FIXME: this breaks gettext()-style convention, which would return source string = ""; // FIXME: this breaks gettext()-style convention, which would return source
} }

View File

@ -22,11 +22,11 @@
test("getInvalidString", function() { test("getInvalidString", function() {
equal(OpenSeadragon.getString("Greeting"), "", "Handled unset string key"); equal(OpenSeadragon.getString("Greeting"), "", "Handled unset string key");
ok(testLog.debug.contains('["Untranslated source string:","Greeting"]'), ok(testLog.log.contains('["Untranslated source string:","Greeting"]'),
'Invalid string keys are logged'); 'Invalid string keys are logged');
equal(OpenSeadragon.getString("Errors"), "", "Handled requesting parent key"); equal(OpenSeadragon.getString("Errors"), "", "Handled requesting parent key");
ok(testLog.debug.contains('["Untranslated source string:","Errors"]'), ok(testLog.log.contains('["Untranslated source string:","Errors"]'),
'Invalid string parent keys are logged'); 'Invalid string parent keys are logged');
}); });