| Index: branches/wmf/1.16wmf4/extensions/UploadWizard/resources/language/mw.Language.js |
| — | — | @@ -52,7 +52,7 @@ |
| 53 | 53 | mw.getMsg = function( messageKey , args ) { |
| 54 | 54 | |
| 55 | 55 | // Check for missing message key |
| 56 | | - if ( ! messageCache[ messageKey ] ) { |
| | 56 | + if ( ! messageCache[ messageKey ] && 'msg' in mediaWiki ) { |
| 57 | 57 | // Try the ResourceLoader's message store |
| 58 | 58 | // FIXME: The two message stores should be unified in the future |
| 59 | 59 | var rlMsg = mediaWiki.msg( messageKey ); |
| Property changes on: branches/wmf/1.16wmf4/extensions/UploadWizard/resources/mw.LanguageUpWiz.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 60 | 60 | Merged /trunk/extensions/UploadWizard/resources/mw.LanguageUpWiz.js:r77466 |
| Index: branches/wmf/1.16wmf4/extensions/UploadWizard/resources/combined.js |
| — | — | @@ -7478,7 +7478,7 @@ |
| 7479 | 7479 | mw.getMsg = function( messageKey , args ) { |
| 7480 | 7480 | |
| 7481 | 7481 | // Check for missing message key |
| 7482 | | - if ( ! messageCache[ messageKey ] ) { |
| | 7482 | + if ( ! messageCache[ messageKey ] && 'msg' in mediaWiki ) { |
| 7483 | 7483 | // Try the ResourceLoader's message store |
| 7484 | 7484 | // FIXME: The two message stores should be unified in the future |
| 7485 | 7485 | var rlMsg = mediaWiki.msg( messageKey ); |
| Index: branches/wmf/1.16wmf4/extensions/UploadWizard/resources/combined.min.js |
| — | — | @@ -7478,7 +7478,7 @@ |
| 7479 | 7479 | mw.getMsg=function(messageKey,args){ |
| 7480 | 7480 | |
| 7481 | 7481 | |
| 7482 | | -if(!messageCache[messageKey]){ |
| | 7482 | +if(!messageCache[messageKey]&&'msg'in mediaWiki){ |
| 7483 | 7483 | |
| 7484 | 7484 | |
| 7485 | 7485 | var rlMsg=mediaWiki.msg(messageKey); |
| Property changes on: branches/wmf/1.16wmf4/extensions/UploadWizard |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 7486 | 7486 | Merged /trunk/extensions/UploadWizard:r77466 |