| Index: trunk/extensions/UploadWizard/UploadWizard.i18n.php |
| — | — | @@ -226,6 +226,8 @@ |
| 227 | 227 | 'mwe-upwiz-license-confirm-remove' => 'Are you sure you want to remove {{PLURAL:$1|this upload|these uploads}}?', |
| 228 | 228 | 'mwe-upwiz-license-confirm-remove-title' => 'Confirm remove', |
| 229 | 229 | |
| | 230 | + 'mwe-upwiz-license-external' => 'This file is under the following license on $1: <b>$2</b>.', |
| | 231 | + 'mwe-upwiz-license-external-invalid' => 'This file is under the following license on $1: <b>$2</b>. Unfortunately, this license is not appropriate for use on {{SITENAME}}.', |
| 230 | 232 | |
| 231 | 233 | 'mwe-upwiz-categories' => 'Categories', |
| 232 | 234 | 'mwe-upwiz-categories-add' => 'Add', |
| Index: trunk/extensions/UploadWizard/resources/mw.FlickrChecker.js |
| — | — | @@ -11,7 +11,7 @@ |
| 12 | 12 | // Live list at http://api.flickr.com/services/rest/?&method=flickr.photos.licenses.getInfo&api_key=e9d8174a79c782745289969a45d350e8 |
| 13 | 13 | licenseMaps: { |
| 14 | 14 | 'All Rights Reserved': 'invalid', |
| 15 | | - 'Attribution License': 'invalid', |
| | 15 | + 'Attribution License': '{{flickrreview}}{{cc-by-2.0}}', |
| 16 | 16 | 'Attribution-NoDerivs License': 'invalid', |
| 17 | 17 | 'Attribution-NonCommercial-NoDerivs License': 'invalid', |
| 18 | 18 | 'Attribution-NonCommercial License': 'invalid', |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | var photoIdMatches = url.match(/flickr.com\/photos\/[^\/]+\/([0-9]+)/); |
| 38 | 38 | if ( photoIdMatches && photoIdMatches[1] > 0 ) { |
| 39 | 39 | var photoId = photoIdMatches[1]; |
| 40 | | - $.getJSON( this.apiUrl + 'jsoncallback=?', { 'method': 'flickr.photos.getInfo', 'api_key': this.apiKey, 'photo_id': photoId, 'format': 'json' }, |
| | 40 | + $.getJSON( this.apiUrl, { 'nojsoncallback': 1, 'method': 'flickr.photos.getInfo', 'api_key': this.apiKey, 'photo_id': photoId, 'format': 'json' }, |
| 41 | 41 | function( data ) { |
| 42 | 42 | if ( typeof data.photo != 'undefined' ) { |
| 43 | 43 | // The returned data.photo.license is just an ID that we use to look up the license name |
| — | — | @@ -62,7 +62,7 @@ |
| 63 | 63 | * Retrieve the list of all current Flickr licenses and store it in an array (mw.FlickrChecker.licenseList) |
| 64 | 64 | */ |
| 65 | 65 | getLicenses: function() { |
| 66 | | - $.getJSON( this.apiUrl + 'jsoncallback=?', { 'method': 'flickr.photos.licenses.getInfo', 'api_key': this.apiKey, 'format': 'json' }, |
| | 66 | + $.getJSON( this.apiUrl, { 'nojsoncallback': 1, 'method': 'flickr.photos.licenses.getInfo', 'api_key': this.apiKey, 'format': 'json' }, |
| 67 | 67 | function( data ) { |
| 68 | 68 | if ( typeof data.licenses != 'undefined' ) { |
| 69 | 69 | $.each( data.licenses.license, function(index, value) { |