| Index: branches/js2-work/phase3/js/mwEmbed/includes/languages/mwEmbed.i18n.php |
| — | — | @@ -160,6 +160,7 @@ |
| 161 | 161 | 'mwe-credits' => 'Credits', |
| 162 | 162 | 'mwe-clip_linkback' => 'Clip source page', |
| 163 | 163 | 'mwe-chose_player' => 'Choose video player', |
| | 164 | + 'mwe-no-player' => 'No player available for $1', |
| 164 | 165 | 'mwe-share_this_video' => 'Share this video', |
| 165 | 166 | 'mwe-video_credits' => 'Video credits', |
| 166 | 167 | 'mwe-menu_btn' => 'Menu', |
| — | — | @@ -291,6 +292,14 @@ |
| 292 | 293 | 'mwe-stream_title' => '$1 $2 to $3', |
| 293 | 294 | |
| 294 | 295 | /* |
| | 296 | + * js file: /modules/AddMedia/searchLibs/kalturaSearch.js |
| | 297 | + */ |
| | 298 | + 'rsd-media-filter-title' => 'Media', |
| | 299 | + 'rsd-media-filter-videos' => 'Videos', |
| | 300 | + 'rsd-media-filter-images' => 'Images', |
| | 301 | + 'rsd-provider-filter-title' => 'Providers', |
| | 302 | + |
| | 303 | + /* |
| 295 | 304 | * js file: /modules/AddMedia/searchLibs/baseRemoteSearch.js |
| 296 | 305 | */ |
| 297 | 306 | 'mwe-imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more information.', |
| — | — | @@ -351,6 +360,7 @@ |
| 352 | 361 | 'mwe-return-search-results' => 'Return to search results', |
| 353 | 362 | 'mwe-importing_asset' => 'Importing asset', |
| 354 | 363 | 'mwe-preview_insert_resource' => 'Preview insert of resource: $1', |
| | 364 | + 'mwe-do-more-modification' => 'Do More Modification', |
| 355 | 365 | 'mwe-checking-resource' => 'Checking for resource', |
| 356 | 366 | 'mwe-resource-needs-import' => 'Resource $1 needs to be imported to $2', |
| 357 | 367 | 'mwe-ftype-svg' => 'SVG vector file', |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/searchLibs/kalturaSearch.js |
| — | — | @@ -3,10 +3,10 @@ |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | 6 | mw.addMessages( { |
| 7 | | - 'rsd-media-filter-title': 'Media', |
| 8 | | - 'rsd-media-filter-videos': 'Videos', |
| 9 | | - 'rsd-media-filter-images': 'Images', |
| 10 | | - 'rsd-provider-filter-title': 'Providers' |
| | 7 | + "rsd-media-filter-title": "Media", |
| | 8 | + "rsd-media-filter-videos": "Videos", |
| | 9 | + "rsd-media-filter-images": "Images", |
| | 10 | + "rsd-provider-filter-title": "Providers" |
| 11 | 11 | } ); |
| 12 | 12 | |
| 13 | 13 | var kalturaFilters = function ( options ) { |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.BaseUploadInterface.js |
| — | — | @@ -390,16 +390,10 @@ |
| 391 | 391 | mw.log( 'mvBaseUploadInterface.doApiCopyUpload' ); |
| 392 | 392 | mw.log( 'doHttpUpload (no form submit) ' ); |
| 393 | 393 | |
| 394 | | - //Special case of upload.js commons hack: |
| 395 | | - var comment_value = $j( '#wpUploadDescription' ).val(); |
| 396 | | - if( comment_value == '' ){ |
| 397 | | - comment_value = $j( "[name='wpUploadDescription']").val(); |
| 398 | | - } |
| 399 | | - |
| 400 | 394 | var httpUpConf = { |
| 401 | 395 | 'url' : $j( '#wpUploadFileURL' ).val(), |
| 402 | 396 | 'filename' : $j( '#wpDestFile' ).val(), |
| 403 | | - 'comment' : comment_value, |
| | 397 | + 'comment' : this.getUploadDescription(), |
| 404 | 398 | 'watch' : ( $j( '#wpWatchthis' ).is( ':checked' ) ) ? 'true' : 'false', |
| 405 | 399 | 'ignorewarnings': ($j('#wpIgnoreWarning' ).is( ':checked' ) ) ? 'true' : 'false' |
| 406 | 400 | } |
| — | — | @@ -407,6 +401,23 @@ |
| 408 | 402 | this.editToken = $j( "#wpEditToken" ).val(); |
| 409 | 403 | this.doHttpUpload( httpUpConf ); |
| 410 | 404 | }, |
| | 405 | + |
| | 406 | + /** |
| | 407 | + * Get the upload description, append the licence if avaliable |
| | 408 | + * |
| | 409 | + * NOTE: wpUploadDescription should be a configuration option. |
| | 410 | + * |
| | 411 | + * @return {String} |
| | 412 | + * value of wpUploadDescription |
| | 413 | + */ |
| | 414 | + getUploadDescription: function(){ |
| | 415 | + //Special case of upload.js commons hack: |
| | 416 | + var comment_value = $j( '#wpUploadDescription' ).val(); |
| | 417 | + if( comment_value == '' ){ |
| | 418 | + comment_value = $j( "[name='wpUploadDescription']").val(); |
| | 419 | + } |
| | 420 | + //check for licence tag: |
| | 421 | + }, |
| 411 | 422 | |
| 412 | 423 | /** |
| 413 | 424 | * Process the result of the form submission, returned to an iframe. |
| Index: branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php |
| — | — | @@ -736,7 +736,7 @@ |
| 737 | 737 | return "\n/* |
| 738 | 738 | * Could not parse JSON language messages in this file, |
| 739 | 739 | * Please check that mw.addMessages call contains valid JSON (not javascript) |
| 740 | | -*/\n\n" . $json_str; //include the original fallback msg string |
| | 740 | +*/\n\n{" . $json_str . "\n}"; //include the original fallback msg string |
| 741 | 741 | } |
| 742 | 742 | } |
| 743 | 743 | } |