| Index: branches/js2-work/phase3/js/mwEmbed/includes/languages/mwEmbed.i18n.php |
| — | — | @@ -12,65 +12,23 @@ |
| 13 | 13 | |
| 14 | 14 | $messages['en'] = array( |
| 15 | 15 | /* |
| 16 | | - * js file: /modules/EmbedPlayer/mw.EmbedPlayer.js |
| | 16 | + * js file: /skins/kskin/kskinConfig.js |
| 17 | 17 | */ |
| 18 | | - 'mwe-loading_plugin' => 'loading plugin ...', |
| 19 | | - 'mwe-select_playback' => 'Set playback preference', |
| 20 | | - 'mwe-link_back' => 'Link back', |
| 21 | | - 'mwe-error_swap_vid' => 'Error: mwEmbed was unable to swap the video tag for the mwEmbed interface', |
| 22 | | - 'mwe-add_to_end_of_sequence' => 'Add to end of sequence', |
| 23 | | - 'mwe-missing_video_stream' => 'The video file for this stream is missing', |
| 24 | | - 'mwe-play_clip' => 'Play clip', |
| 25 | | - 'mwe-pause_clip' => 'Pause clip', |
| 26 | | - 'mwe-volume_control' => 'Volume control', |
| 27 | | - 'mwe-player_options' => 'Player options', |
| 28 | | - 'mwe-timed_text' => 'Timed text', |
| 29 | | - 'mwe-player_fullscreen' => 'Fullscreen', |
| 30 | | - 'mwe-next_clip_msg' => 'Play next clip', |
| 31 | | - 'mwe-prev_clip_msg' => 'Play previous clip', |
| 32 | | - 'mwe-current_clip_msg' => 'Continue playing this clip', |
| 33 | | - 'mwe-seek_to' => 'Seek $1', |
| 34 | | - 'mwe-paused' => 'paused', |
| 35 | | - 'mwe-download_segment' => 'Download selection:', |
| 36 | | - 'mwe-download_full' => 'Download full video file:', |
| 37 | | - 'mwe-download_right_click' => 'To download, right click and select <i>Save link as...</i>', |
| 38 | | - 'mwe-download_clip' => 'Download video', |
| 39 | | - 'mwe-download_text' => 'Download text (<a style="color:white" title="cmml" href="http://wiki.xiph.org/index.php/CMML">CMML</a> xml):', |
| 40 | | - 'mwe-download' => 'Download', |
| 41 | | - 'mwe-share' => 'Share', |
| 42 | | - 'mwe-credits' => 'Credits', |
| 43 | | - 'mwe-clip_linkback' => 'Clip source page', |
| 44 | | - 'mwe-chose_player' => 'Choose video player', |
| 45 | | - 'mwe-no-player' => 'No player available for $1', |
| 46 | | - 'mwe-share_this_video' => 'Share this video', |
| 47 | | - 'mwe-video_credits' => 'Video credits', |
| 48 | | - 'mwe-menu_btn' => 'Menu', |
| 49 | | - 'mwe-close_btn' => 'Close', |
| 50 | | - 'mwe-ogg-player-vlc-player' => 'VLC player', |
| 51 | | - 'mwe-ogg-player-videoElement' => 'Native Ogg video', |
| 52 | | - 'mwe-ogg-player-oggPlugin' => 'Generic Ogg plugin', |
| 53 | | - 'mwe-ogg-player-quicktime-mozilla' => 'QuickTime plugin', |
| 54 | | - 'mwe-ogg-player-quicktime-activex' => 'QuickTime ActiveX', |
| 55 | | - 'mwe-ogg-player-cortado' => 'Java Cortado', |
| 56 | | - 'mwe-ogg-player-flowplayer' => 'Flowplayer', |
| 57 | | - 'mwe-ogg-player-kplayer' => 'Kaltura player', |
| 58 | | - 'mwe-ogg-player-selected' => '(selected)', |
| 59 | | - 'mwe-ogg-player-omtkplayer' => 'OMTK Flash Vorbis', |
| 60 | | - 'mwe-generic_missing_plugin' => 'You browser does not appear to support the following playback type: <b>$1</b><br />Visit the <a href="http://commons.wikimedia.org/wiki/Commons:Media_help">Playback Methods</a> page to download a player.<br />', |
| 61 | | - 'mwe-for_best_experience' => 'For a better video playback experience we recommend the <b><a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=mwEmbed">latest firefox</a>.</b>', |
| 62 | | - 'mwe-do_not_warn_again' => 'Dismiss for now.', |
| 63 | | - 'mwe-playerSelect' => 'Players', |
| 64 | | - 'mwe-read_before_embed' => '<a href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding" target="_new">Read this</a> before embedding.', |
| 65 | | - 'mwe-embed_site_or_blog' => 'Embed on a page', |
| 66 | | - 'mwe-related_videos' => 'Related videos', |
| 67 | | - 'mwe-seeking' => 'seeking', |
| 68 | | - 'mwe-copy-code' => 'Copy code', |
| 69 | | - 'mwe-video-h264' => 'H.264 video', |
| 70 | | - 'mwe-video-flv' => 'Flash video', |
| 71 | | - 'mwe-video-ogg' => 'Ogg video', |
| 72 | | - 'mwe-video-audio' => 'Ogg audio', |
| | 18 | + 'mwe-credit-title' => 'Title: $1', |
| | 19 | + 'mwe-kaltura-platform-title' => 'Kaltura open source video platform', |
| 73 | 20 | |
| 74 | 21 | /* |
| | 22 | + * js file: /modules/Sequencer/mw.TimedEffectsEdit.js |
| | 23 | + */ |
| | 24 | + 'mwe-transition_in' => 'Transition in', |
| | 25 | + 'mwe-transition_out' => 'Transition out', |
| | 26 | + 'mwe-effects' => 'Effects stack', |
| | 27 | + 'mwe-remove_transition' => 'Remove transition', |
| | 28 | + 'mwe-edit_transin' => 'Edit transition into clip', |
| | 29 | + 'mwe-edit_transout' => 'Edit transition out of clip', |
| | 30 | + 'mwe-add-transition' => 'Add a transition', |
| | 31 | + |
| | 32 | + /* |
| 75 | 33 | * js file: /modules/Sequencer/mw.Sequencer.js |
| 76 | 34 | */ |
| 77 | 35 | 'mwe-menu_clipedit' => 'Edit media', |
| — | — | @@ -109,65 +67,12 @@ |
| 110 | 68 | 'mwe-sequencer_credit_line' => 'Developed by <a href="http://kaltura.com">Kaltura, Inc.</a> in partnership with the <a href="http://wikimediafoundation.org/wiki/Home">Wikimedia Foundation</a> (<a href="#">more information</a>).', |
| 111 | 69 | |
| 112 | 70 | /* |
| 113 | | - * js file: /modules/Sequencer/mw.TimedEffectsEdit.js |
| 114 | | - */ |
| 115 | | - 'mwe-transition_in' => 'Transition in', |
| 116 | | - 'mwe-transition_out' => 'Transition out', |
| 117 | | - 'mwe-effects' => 'Effects stack', |
| 118 | | - 'mwe-remove_transition' => 'Remove transition', |
| 119 | | - 'mwe-edit_transin' => 'Edit transition into clip', |
| 120 | | - 'mwe-edit_transout' => 'Edit transition out of clip', |
| 121 | | - 'mwe-add-transition' => 'Add a transition', |
| 122 | | - |
| 123 | | - /* |
| 124 | 71 | * js file: /modules/Sequencer/remotes/RemoteMwSequencer.js |
| 125 | 72 | */ |
| 126 | 73 | 'mwe-no-sequence-create' => 'No sequence exists named $1, You can $2', |
| 127 | 74 | 'mwe-sequence-create-one' => 'start a sequence', |
| 128 | 75 | |
| 129 | 76 | /* |
| 130 | | - * js file: /modules/ClipEdit/mw.ClipEdit.js |
| 131 | | - */ |
| 132 | | - 'mwe-crop' => 'Crop image', |
| 133 | | - 'mwe-apply_crop' => 'Apply crop to image', |
| 134 | | - 'mwe-reset_crop' => 'Reset crop', |
| 135 | | - 'mwe-insert_image_page' => 'Insert into page', |
| 136 | | - 'mwe-insert_into_sequence' => 'Insert into sequence', |
| 137 | | - 'mwe-preview_insert' => 'Preview insert', |
| 138 | | - 'mwe-cancel_image_insert' => 'Cancel insert', |
| 139 | | - 'mwe-sc_attributes' => 'Clip detail edit', |
| 140 | | - 'mwe-sc_inoutpoints' => 'Set in-out points', |
| 141 | | - 'mwe-sc_overlays' => 'Overlays', |
| 142 | | - 'mwe-sc_audio' => 'Audio control', |
| 143 | | - 'mwe-sc_duration' => 'Duration', |
| 144 | | - 'mwe-template_properties' => 'Template properties', |
| 145 | | - 'mwe-custom_title' => 'Custom title', |
| 146 | | - 'mwe-edit_properties' => 'Edit properties', |
| 147 | | - 'mwe-other_properties' => 'Other properties', |
| 148 | | - 'mwe-resource_page' => 'Resource page:', |
| 149 | | - 'mwe-set_in_out_points' => 'Set in-out points', |
| 150 | | - 'mwe-start_time' => 'Start time', |
| 151 | | - 'mwe-end_time' => 'End time', |
| 152 | | - 'mwe-preview_inout' => 'Preview in-out points', |
| 153 | | - 'mwe-edit-tools' => 'Edit tools', |
| 154 | | - 'mwe-inline-description' => 'Caption', |
| 155 | | - 'mwe-edit-video-tools' => 'Edit video tools:', |
| 156 | | - 'mwe-duration' => 'Duration:', |
| 157 | | - 'mwe-layout' => 'Layout', |
| 158 | | - 'mwe-layout_right' => 'Right side image layout', |
| 159 | | - 'mwe-layout_left' => 'Left side image layout', |
| 160 | | - |
| 161 | | - /* |
| 162 | | - * js file: /modules/ApiProxy/mw.proxy.js |
| 163 | | - */ |
| 164 | | - 'mwe-setting-up-proxy' => 'Setting up proxy...', |
| 165 | | - 'mwe-re-try' => 'Retry API request', |
| 166 | | - 'mwe-re-trying' => 'Retrying API request...', |
| 167 | | - 'mwe-proxy-not-ready' => 'Proxy is not configured', |
| 168 | | - 'mwe-please-login' => 'You are not <a target="_new" href="$1">logged in</a> on $2 or mwEmbed has not been enabled. Resolve the issue, and then retry the request.', |
| 169 | | - 'mwe-remember-loging' => 'General security reminder: Only login to web sites when your address bar displays that site\'s address.', |
| 170 | | - |
| 171 | | - /* |
| 172 | 77 | * js file: /modules/TimedText/mw.TimedTextEdit.js |
| 173 | 78 | */ |
| 174 | 79 | 'mew-timedtext-editor' => 'Timed text editor', |
| — | — | @@ -226,75 +131,76 @@ |
| 227 | 132 | 'mwe-language-no-subtitles-for-clip' => 'No $1 subtitles where found for clip: $2', |
| 228 | 133 | |
| 229 | 134 | /* |
| 230 | | - * js file: /modules/AddMedia/mw.RemoteSearchDriver.js |
| | 135 | + * js file: /modules/EmbedPlayer/mw.EmbedPlayer.js |
| 231 | 136 | */ |
| 232 | | - 'mwe-add_media_wizard' => 'Add media wizard', |
| 233 | | - 'mwe-media_search' => 'Media search', |
| 234 | | - 'rsd_box_layout' => 'Box layout', |
| 235 | | - 'rsd_list_layout' => 'List layout', |
| 236 | | - 'rsd_results_desc' => 'Results $1 to $2', |
| 237 | | - 'rsd_results_desc_total' => 'Results $1 to $2 of $3', |
| 238 | | - 'rsd_results_next' => 'next', |
| 239 | | - 'rsd_results_prev' => 'previous', |
| 240 | | - 'rsd_no_results' => 'No search results for <b>$1</b>', |
| 241 | | - 'mwe-upload_tab' => 'Upload', |
| 242 | | - 'rsd_layout' => 'Layout:', |
| 243 | | - 'rsd_resource_edit' => 'Edit resource: $1', |
| 244 | | - 'mwe-resource_description_page' => 'Resource description page', |
| 245 | | - 'mwe-link' => 'link', |
| 246 | | - 'rsd_do_insert' => 'Do insert', |
| 247 | | - 'mwe-cc_title' => 'Creative Commons', |
| 248 | | - 'mwe-cc_by_title' => 'Attribution', |
| 249 | | - 'mwe-cc_nc_title' => 'Noncommercial', |
| 250 | | - 'mwe-cc_nd_title' => 'No Derivative Works', |
| 251 | | - 'mwe-cc_sa_title' => 'Share Alike', |
| 252 | | - 'mwe-cc_pd_title' => 'Public Domain', |
| 253 | | - 'mwe-unknown_license' => 'Unknown license', |
| 254 | | - 'mwe-no_import_by_url' => 'This user or wiki <b>cannot</b> import assets from remote URLs.<p>Do you need to login?</p><p>Is upload_by_url permission set for you?<br />Does the wiki have <a href="http://www.mediawiki.org/wiki/Manual:$wgAllowCopyUploads">$wgAllowCopyUploads</a> enabled?</p>', |
| 255 | | - 'mwe-results_from' => 'Results from <a href="$1" target="_new" >$2</a>', |
| 256 | | - 'mwe-missing_desc_see_source' => 'This asset is missing a description. Please see the [$1 original source] and help describe it.', |
| 257 | | - 'rsd_config_error' => 'Add media wizard configuration error: $1', |
| 258 | | - 'mwe-your_recent_uploads' => 'Your recent uploads to $1', |
| 259 | | - 'mwe-no_recent_uploads' => 'No recent uploads', |
| 260 | | - 'mwe-upload_a_file' => 'Upload a new file to $1', |
| 261 | | - 'mwe-resource_page_desc' => 'Resource page description:', |
| 262 | | - 'mwe-edit_resource_desc' => 'Edit wiki text resource description:', |
| 263 | | - 'mwe-local_resource_title' => 'Local resource title:', |
| 264 | | - 'mwe-watch_this_page' => 'Watch this page', |
| 265 | | - 'mwe-do_import_resource' => 'Import resource', |
| 266 | | - 'mwe-update_preview' => 'Update resource page preview', |
| 267 | | - 'mwe-return-search-results' => 'Return to search results', |
| 268 | | - 'mwe-importing_asset' => 'Importing asset', |
| 269 | | - 'mwe-preview_insert_resource' => 'Preview insert of resource: $1', |
| 270 | | - 'mwe-do-more-modification' => 'Do More Modification', |
| 271 | | - 'mwe-checking-resource' => 'Checking for resource', |
| 272 | | - 'mwe-resource-needs-import' => 'Resource $1 needs to be imported to $2', |
| 273 | | - 'mwe-ftype-svg' => 'SVG vector file', |
| 274 | | - 'mwe-ftype-jpg' => 'JPEG image file', |
| 275 | | - 'mwe-ftype-png' => 'PNG image file', |
| 276 | | - 'mwe-ftype-oga' => 'Ogg audio file', |
| 277 | | - 'mwe-ftype-ogg' => 'Ogg video file', |
| 278 | | - 'mwe-ftype-unk' => 'Unknown file format', |
| 279 | | - 'rsd-wiki_commons-title' => 'Wikimedia Commons', |
| 280 | | - 'rsd-wiki_commons' => 'Wikimedia Commons, an archive of freely-licensed educational media content (images, sound and video clips)', |
| 281 | | - 'rsd-kaltura-title' => 'All Sources', |
| 282 | | - 'rsd-kaltura' => 'Kaltura agragated search for free-licenced media across multiple search providers', |
| 283 | | - 'rsd-this_wiki-title' => 'This wiki', |
| 284 | | - 'rsd-this_wiki-desc' => 'The local wiki install', |
| 285 | | - 'rsd-archive_org-title' => 'Archive.org', |
| 286 | | - 'rsd-archive_org-desc' => 'The Internet Archive, a digital library of cultural artifacts', |
| 287 | | - 'rsd-flickr-title' => 'Flickr.com', |
| 288 | | - 'rsd-flickr-desc' => 'Flickr.com, a online photo sharing site', |
| 289 | | - 'rsd-metavid-title' => 'Metavid.org', |
| 290 | | - 'rsd-metavid-desc' => 'Metavid.org, a community archive of US House and Senate floor proceedings', |
| 291 | | - 'rsd-search-timeout' => 'The search request did not complete. The server may be down experiencing heavy load. You can try again later', |
| | 137 | + 'mwe-loading_plugin' => 'loading plugin ...', |
| | 138 | + 'mwe-select_playback' => 'Set playback preference', |
| | 139 | + 'mwe-link_back' => 'Link back', |
| | 140 | + 'mwe-error_swap_vid' => 'Error: mwEmbed was unable to swap the video tag for the mwEmbed interface', |
| | 141 | + 'mwe-add_to_end_of_sequence' => 'Add to end of sequence', |
| | 142 | + 'mwe-missing_video_stream' => 'The video file for this stream is missing', |
| | 143 | + 'mwe-play_clip' => 'Play clip', |
| | 144 | + 'mwe-pause_clip' => 'Pause clip', |
| | 145 | + 'mwe-volume_control' => 'Volume control', |
| | 146 | + 'mwe-player_options' => 'Player options', |
| | 147 | + 'mwe-timed_text' => 'Timed text', |
| | 148 | + 'mwe-player_fullscreen' => 'Fullscreen', |
| | 149 | + 'mwe-next_clip_msg' => 'Play next clip', |
| | 150 | + 'mwe-prev_clip_msg' => 'Play previous clip', |
| | 151 | + 'mwe-current_clip_msg' => 'Continue playing this clip', |
| | 152 | + 'mwe-seek_to' => 'Seek $1', |
| | 153 | + 'mwe-paused' => 'paused', |
| | 154 | + 'mwe-download_segment' => 'Download selection:', |
| | 155 | + 'mwe-download_full' => 'Download full video file:', |
| | 156 | + 'mwe-download_right_click' => 'To download, right click and select <i>Save link as...</i>', |
| | 157 | + 'mwe-download_clip' => 'Download video', |
| | 158 | + 'mwe-download_text' => 'Download text (<a style="color:white" title="cmml" href="http://wiki.xiph.org/index.php/CMML">CMML</a> xml):', |
| | 159 | + 'mwe-download' => 'Download', |
| | 160 | + 'mwe-share' => 'Share', |
| | 161 | + 'mwe-credits' => 'Credits', |
| | 162 | + 'mwe-clip_linkback' => 'Clip source page', |
| | 163 | + 'mwe-chose_player' => 'Choose video player', |
| | 164 | + 'mwe-no-player' => 'No player available for $1', |
| | 165 | + 'mwe-share_this_video' => 'Share this video', |
| | 166 | + 'mwe-video_credits' => 'Video credits', |
| | 167 | + 'mwe-menu_btn' => 'Menu', |
| | 168 | + 'mwe-close_btn' => 'Close', |
| | 169 | + 'mwe-ogg-player-vlc-player' => 'VLC player', |
| | 170 | + 'mwe-ogg-player-videoElement' => 'Native Ogg video', |
| | 171 | + 'mwe-ogg-player-oggPlugin' => 'Generic Ogg plugin', |
| | 172 | + 'mwe-ogg-player-quicktime-mozilla' => 'QuickTime plugin', |
| | 173 | + 'mwe-ogg-player-quicktime-activex' => 'QuickTime ActiveX', |
| | 174 | + 'mwe-ogg-player-cortado' => 'Java Cortado', |
| | 175 | + 'mwe-ogg-player-flowplayer' => 'Flowplayer', |
| | 176 | + 'mwe-ogg-player-kplayer' => 'Kaltura player', |
| | 177 | + 'mwe-ogg-player-selected' => '(selected)', |
| | 178 | + 'mwe-ogg-player-omtkplayer' => 'OMTK Flash Vorbis', |
| | 179 | + 'mwe-generic_missing_plugin' => 'You browser does not appear to support the following playback type: <b>$1</b><br />Visit the <a href="http://commons.wikimedia.org/wiki/Commons:Media_help">Playback Methods</a> page to download a player.<br />', |
| | 180 | + 'mwe-for_best_experience' => 'For a better video playback experience we recommend the <b><a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=mwEmbed">latest firefox</a>.</b>', |
| | 181 | + 'mwe-do_not_warn_again' => 'Dismiss for now.', |
| | 182 | + 'mwe-playerSelect' => 'Players', |
| | 183 | + 'mwe-read_before_embed' => '<a href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding" target="_new">Read this</a> before embedding.', |
| | 184 | + 'mwe-embed_site_or_blog' => 'Embed on a page', |
| | 185 | + 'mwe-related_videos' => 'Related videos', |
| | 186 | + 'mwe-seeking' => 'seeking', |
| | 187 | + 'mwe-copy-code' => 'Copy code', |
| | 188 | + 'mwe-video-h264' => 'H.264 video', |
| | 189 | + 'mwe-video-flv' => 'Flash video', |
| | 190 | + 'mwe-video-ogg' => 'Ogg video', |
| | 191 | + 'mwe-video-audio' => 'Ogg audio', |
| 292 | 192 | |
| 293 | 193 | /* |
| | 194 | + * js file: /modules/AddMedia/loader.js |
| | 195 | + */ |
| | 196 | + 'mwe-loading-add-media-wiz' => 'Loading add media wizard', |
| | 197 | + |
| | 198 | + /* |
| 294 | 199 | * js file: /modules/AddMedia/mw.BaseUploadInterface.js |
| 295 | 200 | */ |
| 296 | 201 | 'mwe-upload-transcode-in-progress' => 'Transcode and upload in progress (do not close this window)', |
| 297 | 202 | 'mwe-upload-in-progress' => 'Upload in progress (do not close this window)', |
| 298 | 203 | 'mwe-upload-transcoded-status' => 'Transcoded', |
| | 204 | + 'mwe-uploaded-time-remaining' => 'Time remaining: $1', |
| 299 | 205 | 'mwe-uploaded-status' => 'Uploaded', |
| 300 | 206 | 'mwe-upload-stats-fileprogress' => '$1 of $2', |
| 301 | 207 | 'mwe-upload_completed' => 'Your upload is complete', |
| — | — | @@ -316,64 +222,6 @@ |
| 317 | 223 | 'mwe-wgfogg_warning_bad_extension' => 'You have selected a file with an unsuported extension (<a href="http://commons.wikimedia.org/wiki/Commons:Firefogg#Supported_File_Types">more information</a>).', |
| 318 | 224 | |
| 319 | 225 | /* |
| 320 | | - * js file: /modules/AddMedia/jquery.simpleUploadForm.js |
| 321 | | - */ |
| 322 | | - 'mwe-select_file' => 'Select file', |
| 323 | | - 'mwe-more_license_options' => 'For more license options, view the <a href="$1">normal upload page</a>', |
| 324 | | - 'mwe-select_ownwork' => 'I am uploading entirely my own work, and licencing it under:', |
| 325 | | - 'mwe-license_cc-by-sa' => 'Creative Commons Share Alike (3.0)', |
| 326 | | - 'mwe-upload' => 'Upload file', |
| 327 | | - 'mwe-destfilename' => 'Destination filename:', |
| 328 | | - 'mwe-summary' => 'Summary', |
| 329 | | - 'mwe-error_not_loggedin' => 'You do not appear to be logged in or do not have upload privileges.', |
| 330 | | - 'mwe-watch-this-file' => 'Watch this file', |
| 331 | | - 'mwe-ignore-any-warnings' => 'Ignore any warnings', |
| 332 | | - |
| 333 | | - /* |
| 334 | | - * js file: /modules/AddMedia/mw.Firefogg.js |
| 335 | | - */ |
| 336 | | - 'fogg-select_file' => 'Select file', |
| 337 | | - 'fogg-select_new_file' => 'Select new file', |
| 338 | | - 'fogg-select_url' => 'Select URL', |
| 339 | | - 'fogg-save_local_file' => 'Save Ogg', |
| 340 | | - 'fogg-check_for_firefogg' => 'Checking for Firefogg...', |
| 341 | | - 'fogg-installed' => 'Firefogg is installed', |
| 342 | | - 'fogg-for_improved_uploads' => 'For improved uploads:', |
| 343 | | - 'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about Firefogg</a>.', |
| 344 | | - 'fogg-use_latest_firefox' => 'Please first install <a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=firefogg">Firefox 3.5</a> (or later). <i>Then revisit this page to install the <b>Firefogg</b> extension.</i>', |
| 345 | | - 'fogg-passthrough_mode' => 'Your selected file is already Ogg or not a video file', |
| 346 | | - 'fogg-transcoding' => 'Encoding video to Ogg...', |
| 347 | | - 'fogg-encoding-done' => 'Encoding complete', |
| 348 | | - 'fogg-badtoken' => 'Token is not valid', |
| 349 | | - 'fogg-preview' => 'Preview video', |
| 350 | | - 'fogg-hidepreview' => 'Hide preview', |
| 351 | | - |
| 352 | | - /* |
| 353 | | - * js file: /modules/AddMedia/searchLibs/metavidSearch.js |
| 354 | | - */ |
| 355 | | - 'mwe-stream_title' => '$1 $2 to $3', |
| 356 | | - |
| 357 | | - /* |
| 358 | | - * js file: /modules/AddMedia/searchLibs/kalturaSearch.js |
| 359 | | - */ |
| 360 | | - 'rsd-media-filter-title' => 'Media', |
| 361 | | - 'rsd-media-filter-videos' => 'Videos', |
| 362 | | - 'rsd-media-filter-images' => 'Images', |
| 363 | | - 'rsd-provider-filter-title' => 'Providers', |
| 364 | | - |
| 365 | | - /* |
| 366 | | - * js file: /modules/AddMedia/searchLibs/baseRemoteSearch.js |
| 367 | | - */ |
| 368 | | - 'mwe-imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more information.', |
| 369 | | - 'mwe-import-description' => '$1, imported from $2', |
| 370 | | - |
| 371 | | - /* |
| 372 | | - * js file: /modules/AddMedia/jquery.dragDropFile.js |
| 373 | | - */ |
| 374 | | - 'mwe-upload-multi' => 'Upload {{PLURAL:$1|file|files}}', |
| 375 | | - 'mwe-review-upload' => 'Review file {{PLURAL:$1|upload|uploads}}', |
| 376 | | - |
| 377 | | - /* |
| 378 | 226 | * js file: /modules/AddMedia/mw.FirefoggGUI.js |
| 379 | 227 | */ |
| 380 | 228 | 'fogg-help-sticky' => 'Help (click to stick)', |
| — | — | @@ -440,11 +288,170 @@ |
| 441 | 289 | 'fogg-contact-help' => 'Contact link', |
| 442 | 290 | |
| 443 | 291 | /* |
| 444 | | - * js file: /modules/AddMedia/loader.js |
| | 292 | + * js file: /modules/AddMedia/searchLibs/metavidSearch.js |
| 445 | 293 | */ |
| 446 | | - 'mwe-loading-add-media-wiz' => 'Loading add media wizard', |
| | 294 | + 'mwe-stream_title' => '$1 $2 to $3', |
| 447 | 295 | |
| 448 | 296 | /* |
| | 297 | + * js file: /modules/AddMedia/searchLibs/kalturaSearch.js |
| | 298 | + */ |
| | 299 | + 'rsd-media-filter-title' => 'Media', |
| | 300 | + 'rsd-media-filter-videos' => 'Videos', |
| | 301 | + 'rsd-media-filter-images' => 'Images', |
| | 302 | + 'rsd-provider-filter-title' => 'Providers', |
| | 303 | + |
| | 304 | + /* |
| | 305 | + * js file: /modules/AddMedia/searchLibs/baseRemoteSearch.js |
| | 306 | + */ |
| | 307 | + 'mwe-imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more information.', |
| | 308 | + 'mwe-import-description' => '$1, imported from $2', |
| | 309 | + |
| | 310 | + /* |
| | 311 | + * js file: /modules/AddMedia/jquery.simpleUploadForm.js |
| | 312 | + */ |
| | 313 | + 'mwe-select_file' => 'Select file', |
| | 314 | + 'mwe-more_license_options' => 'For more license options, view the <a href="$1">normal upload page</a>', |
| | 315 | + 'mwe-select_ownwork' => 'I am uploading entirely my own work, and licensing it under:', |
| | 316 | + 'mwe-license_cc-by-sa' => 'Creative Commons Share Alike (3.0)', |
| | 317 | + 'mwe-upload' => 'Upload file', |
| | 318 | + 'mwe-destfilename' => 'Destination filename:', |
| | 319 | + 'mwe-summary' => 'Summary', |
| | 320 | + 'mwe-error_not_loggedin' => 'You do not appear to be logged in or do not have upload privileges.', |
| | 321 | + 'mwe-watch-this-file' => 'Watch this file', |
| | 322 | + 'mwe-ignore-any-warnings' => 'Ignore any warnings', |
| | 323 | + |
| | 324 | + /* |
| | 325 | + * js file: /modules/AddMedia/mw.RemoteSearchDriver.js |
| | 326 | + */ |
| | 327 | + 'mwe-add_media_wizard' => 'Add media wizard', |
| | 328 | + 'mwe-media_search' => 'Media search', |
| | 329 | + 'rsd_box_layout' => 'Box layout', |
| | 330 | + 'rsd_list_layout' => 'List layout', |
| | 331 | + 'rsd_results_desc' => 'Results $1 to $2', |
| | 332 | + 'rsd_results_desc_total' => 'Results $1 to $2 of $3', |
| | 333 | + 'rsd_results_next' => 'next', |
| | 334 | + 'rsd_results_prev' => 'previous', |
| | 335 | + 'rsd_no_results' => 'No search results for <b>$1</b>', |
| | 336 | + 'mwe-upload_tab' => 'Upload', |
| | 337 | + 'rsd_layout' => 'Layout:', |
| | 338 | + 'rsd_resource_edit' => 'Edit resource: $1', |
| | 339 | + 'mwe-resource_description_page' => 'Resource description page', |
| | 340 | + 'mwe-link' => 'link', |
| | 341 | + 'rsd_do_insert' => 'Do insert', |
| | 342 | + 'mwe-cc_title' => 'Creative Commons', |
| | 343 | + 'mwe-cc_by_title' => 'Attribution', |
| | 344 | + 'mwe-cc_nc_title' => 'Noncommercial', |
| | 345 | + 'mwe-cc_nd_title' => 'No Derivative Works', |
| | 346 | + 'mwe-cc_sa_title' => 'Share Alike', |
| | 347 | + 'mwe-cc_pd_title' => 'Public Domain', |
| | 348 | + 'mwe-unknown_license' => 'Unknown license', |
| | 349 | + 'mwe-no_import_by_url' => 'This user or wiki <b>cannot</b> import assets from remote URLs.<p>Do you need to login?</p><p>Is upload_by_url permission set for you?<br />Does the wiki have <a href="http://www.mediawiki.org/wiki/Manual:$wgAllowCopyUploads">$wgAllowCopyUploads</a> enabled?</p>', |
| | 350 | + 'mwe-results_from' => 'Results from <a href="$1" target="_new" >$2</a>', |
| | 351 | + 'mwe-missing_desc_see_source' => 'This asset is missing a description. Please see the [$1 original source] and help describe it.', |
| | 352 | + 'rsd_config_error' => 'Add media wizard configuration error: $1', |
| | 353 | + 'mwe-your_recent_uploads' => 'Your recent uploads to $1', |
| | 354 | + 'mwe-no_recent_uploads' => 'No recent uploads', |
| | 355 | + 'mwe-upload_a_file' => 'Upload a new file to $1', |
| | 356 | + 'mwe-resource_page_desc' => 'Resource page description:', |
| | 357 | + 'mwe-edit_resource_desc' => 'Edit wiki text resource description:', |
| | 358 | + 'mwe-local_resource_title' => 'Local resource title:', |
| | 359 | + 'mwe-watch_this_page' => 'Watch this page', |
| | 360 | + 'mwe-do_import_resource' => 'Import resource', |
| | 361 | + 'mwe-update_preview' => 'Update resource page preview', |
| | 362 | + 'mwe-return-search-results' => 'Return to search results', |
| | 363 | + 'mwe-importing_asset' => 'Importing asset', |
| | 364 | + 'mwe-preview_insert_resource' => 'Preview insert of resource: $1', |
| | 365 | + 'mwe-do-more-modification' => 'Do More Modification', |
| | 366 | + 'mwe-checking-resource' => 'Checking for resource', |
| | 367 | + 'mwe-resource-needs-import' => 'Resource $1 needs to be imported to $2', |
| | 368 | + 'mwe-ftype-svg' => 'SVG vector file', |
| | 369 | + 'mwe-ftype-jpg' => 'JPEG image file', |
| | 370 | + 'mwe-ftype-png' => 'PNG image file', |
| | 371 | + 'mwe-ftype-oga' => 'Ogg audio file', |
| | 372 | + 'mwe-ftype-ogg' => 'Ogg video file', |
| | 373 | + 'mwe-ftype-unk' => 'Unknown file format', |
| | 374 | + 'rsd-wiki_commons-title' => 'Wikimedia Commons', |
| | 375 | + 'rsd-wiki_commons' => 'Wikimedia Commons, an archive of freely-licensed educational media content (images, sound and video clips)', |
| | 376 | + 'rsd-kaltura-title' => 'All Sources', |
| | 377 | + 'rsd-kaltura' => 'Kaltura agragated search for free-licenced media across multiple search providers', |
| | 378 | + 'rsd-this_wiki-title' => 'This wiki', |
| | 379 | + 'rsd-this_wiki-desc' => 'The local wiki install', |
| | 380 | + 'rsd-archive_org-title' => 'Archive.org', |
| | 381 | + 'rsd-archive_org-desc' => 'The Internet Archive, a digital library of cultural artifacts', |
| | 382 | + 'rsd-flickr-title' => 'Flickr.com', |
| | 383 | + 'rsd-flickr-desc' => 'Flickr.com, a online photo sharing site', |
| | 384 | + 'rsd-metavid-title' => 'Metavid.org', |
| | 385 | + 'rsd-metavid-desc' => 'Metavid.org, a community archive of US House and Senate floor proceedings', |
| | 386 | + 'rsd-search-timeout' => 'The search request did not complete. The server may be down experiencing heavy load. You can try again later', |
| | 387 | + |
| | 388 | + /* |
| | 389 | + * js file: /modules/AddMedia/mw.Firefogg.js |
| | 390 | + */ |
| | 391 | + 'fogg-select_file' => 'Select file', |
| | 392 | + 'fogg-select_new_file' => 'Select new file', |
| | 393 | + 'fogg-select_url' => 'Select URL', |
| | 394 | + 'fogg-save_local_file' => 'Save Ogg', |
| | 395 | + 'fogg-check_for_firefogg' => 'Checking for Firefogg...', |
| | 396 | + 'fogg-installed' => 'Firefogg is installed', |
| | 397 | + 'fogg-for_improved_uploads' => 'For improved uploads:', |
| | 398 | + 'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about Firefogg</a>.', |
| | 399 | + 'fogg-use_latest_firefox' => 'Please first install <a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=firefogg">Firefox 3.5</a> (or later). <i>Then revisit this page to install the <b>Firefogg</b> extension.</i>', |
| | 400 | + 'fogg-passthrough_mode' => 'Your selected file is already Ogg or not a video file', |
| | 401 | + 'fogg-transcoding' => 'Encoding video to Ogg...', |
| | 402 | + 'fogg-encoding-done' => 'Encoding complete', |
| | 403 | + 'fogg-badtoken' => 'Token is not valid', |
| | 404 | + 'fogg-preview' => 'Preview video', |
| | 405 | + 'fogg-hidepreview' => 'Hide preview', |
| | 406 | + |
| | 407 | + /* |
| | 408 | + * js file: /modules/AddMedia/jquery.dragDropFile.js |
| | 409 | + */ |
| | 410 | + 'mwe-upload-multi' => 'Upload {{PLURAL:$1|file|files}}', |
| | 411 | + 'mwe-review-upload' => 'Review file {{PLURAL:$1|upload|uploads}}', |
| | 412 | + |
| | 413 | + /* |
| | 414 | + * js file: /modules/ClipEdit/mw.ClipEdit.js |
| | 415 | + */ |
| | 416 | + 'mwe-crop' => 'Crop image', |
| | 417 | + 'mwe-apply_crop' => 'Apply crop to image', |
| | 418 | + 'mwe-reset_crop' => 'Reset crop', |
| | 419 | + 'mwe-insert_image_page' => 'Insert into page', |
| | 420 | + 'mwe-insert_into_sequence' => 'Insert into sequence', |
| | 421 | + 'mwe-preview_insert' => 'Preview insert', |
| | 422 | + 'mwe-cancel_image_insert' => 'Cancel insert', |
| | 423 | + 'mwe-sc_attributes' => 'Clip detail edit', |
| | 424 | + 'mwe-sc_inoutpoints' => 'Set in-out points', |
| | 425 | + 'mwe-sc_overlays' => 'Overlays', |
| | 426 | + 'mwe-sc_audio' => 'Audio control', |
| | 427 | + 'mwe-sc_duration' => 'Duration', |
| | 428 | + 'mwe-template_properties' => 'Template properties', |
| | 429 | + 'mwe-custom_title' => 'Custom title', |
| | 430 | + 'mwe-edit_properties' => 'Edit properties', |
| | 431 | + 'mwe-other_properties' => 'Other properties', |
| | 432 | + 'mwe-resource_page' => 'Resource page:', |
| | 433 | + 'mwe-set_in_out_points' => 'Set in-out points', |
| | 434 | + 'mwe-start_time' => 'Start time', |
| | 435 | + 'mwe-end_time' => 'End time', |
| | 436 | + 'mwe-preview_inout' => 'Preview in-out points', |
| | 437 | + 'mwe-edit-tools' => 'Edit tools', |
| | 438 | + 'mwe-inline-description' => 'Caption', |
| | 439 | + 'mwe-edit-video-tools' => 'Edit video tools:', |
| | 440 | + 'mwe-duration' => 'Duration:', |
| | 441 | + 'mwe-layout' => 'Layout', |
| | 442 | + 'mwe-layout_right' => 'Right side image layout', |
| | 443 | + 'mwe-layout_left' => 'Left side image layout', |
| | 444 | + |
| | 445 | + /* |
| | 446 | + * js file: /modules/ApiProxy/mw.proxy.js |
| | 447 | + */ |
| | 448 | + 'mwe-setting-up-proxy' => 'Setting up proxy...', |
| | 449 | + 'mwe-re-try' => 'Retry API request', |
| | 450 | + 'mwe-re-trying' => 'Retrying API request...', |
| | 451 | + 'mwe-proxy-not-ready' => 'Proxy is not configured', |
| | 452 | + 'mwe-please-login' => 'You are not <a target="_new" href="$1">logged in</a> on $2 or mwEmbed has not been enabled. Resolve the issue, and then retry the request.', |
| | 453 | + 'mwe-remember-loging' => 'General security reminder: Only login to web sites when your address bar displays that site\'s address.', |
| | 454 | + |
| | 455 | + /* |
| 449 | 456 | * js file: /mwEmbed.js |
| 450 | 457 | */ |
| 451 | 458 | 'mwe-loading_txt' => 'Loading ...', |
| — | — | @@ -460,74 +467,9 @@ |
| 461 | 468 | 'mwe-enable-gadget' => 'Enable mwEmbed gadget for all pages', |
| 462 | 469 | 'mwe-enable-gadget-done' => 'mwEmbed gadget has been enabled', |
| 463 | 470 | 'mwe-must-login-gadget' => 'To enable gadget you must <a target="_new" href="$1">login</a>', |
| 464 | | - |
| 465 | | - /* |
| 466 | | - * js file: /skins/kskin/kskinConfig.js |
| 467 | | - */ |
| 468 | | - 'mwe-credit-title' => 'Title: $1', |
| 469 | | - 'mwe-kaltura-platform-title' => 'Kaltura open source video platform', |
| 470 | | - |
| | 471 | + 'mwe-test-plural' => 'I ran {{PLURAL:$1|$1 test|$1 tests}}', |
| 471 | 472 | ); |
| 472 | 473 | |
| 473 | | -/** Message documentation (Message documentation) |
| 474 | | - * @author EugeneZelenko |
| 475 | | - * @author Fryed-peach |
| 476 | | - * @author McDutchie |
| 477 | | - * @author Mormegil |
| 478 | | - * @author Purodha |
| 479 | | - * @author Siebrand |
| 480 | | - * @author Tbleher |
| 481 | | - * @author Translationista |
| 482 | | - */ |
| 483 | | -$messages['qqq'] = array( |
| 484 | | - 'mwe-sc_inoutpoints' => 'In-out-points are start and end times with reagards to a part of the video that should be shown. So if a video has a length of 60 seconds, the in-point can be at 10 seconds, the out-point at 40 seconds, so that the length of the fragment shown is 30 seconds.', |
| 485 | | - 'mwe-sc_duration' => '{{Identical|Duration}}', |
| 486 | | - 'mwe-set_in_out_points' => 'In-out-points are start and end times with reagards to a part of the video that should be shown. So if a video has a length of 60 seconds, the in-point can be at 10 seconds, the out-point at 40 seconds, so that the length of the fragment shown is 30 seconds.', |
| 487 | | - 'mwe-preview_inout' => 'This message is used for the button that performs the action of previewing the user set start and end time of an audio or video asset.', |
| 488 | | - 'mwe-edit-tools' => 'Caption in the [[mw:Extension:Add Media Wizard|Add Media Wizard]], meaning “Tools which can be used to edit the image”.', |
| 489 | | - 'mwe-edit-video-tools' => 'This message is used as a header (h3). It heads the tools that are used to edit (the) video in the mwEmbed JavaScript library.', |
| 490 | | - 'mwe-duration' => '{{Identical|Duration}}', |
| 491 | | - 'mwe-close' => '{{Identical|Close}}', |
| 492 | | - 'mwe-transition_out' => 'Transition out describes the button when clicked displays the interface for setting the transition-out of a video clip. The outgoing transition happens at the end of a video clip display.', |
| 493 | | - 'mwe-menu_options' => '{{Identical|Options}}', |
| 494 | | - 'mwe-zoom_in' => '{{Identical|Zoom in}}', |
| 495 | | - 'mwe-zoom_out' => '{{Identical|Zoom out}}', |
| 496 | | - 'mwe-loading_txt' => '{{Identical|Loading}}', |
| 497 | | - 'mwe-error_load_lib' => 'Parameters: |
| 498 | | -* $1 Corresponds to the JavaScript file that was not retrievable or does not define its class name. |
| 499 | | -* $2 Is the class name that was associated with the JavaScript file that was not found or could not be retrieved.', |
| 500 | | - 'mwe-ok' => '{{Identical|OK}}', |
| 501 | | - 'mwe-cancel' => '{{Identical|Cancel}}', |
| 502 | | - 'fogg-help-sticky' => 'This is the tooltip message for the help icon. Mousing over this icon displays the help message. This tooltip tells the user that when they click the icon the help message will remain displayed.', |
| 503 | | - 'fogg-videoBitrate-help' => 'This is an explanation of what the term "video bitrate" means (i.e. the speed of video encoding in kilobits per second).', |
| 504 | | - 'fogg-title-title' => '{{Identical|Title}}', |
| 505 | | - 'fogg-date-title' => '{{Identical|Date}}', |
| 506 | | - 'fogg-copyright-title' => '{{Identical|Copyright}}', |
| 507 | | - 'fogg-license-title' => '{{Identical|License}}', |
| 508 | | - 'fogg-contact-title' => '{{Identical|Contact}}', |
| 509 | | - 'mwe-add_media_wizard' => 'This message is used as the title of the popup window of the "Add media wizard"', |
| 510 | | - 'rsd_results_desc_total' => 'Parameters: |
| 511 | | -* $1 is the lowest result number in the displayed set for the current search |
| 512 | | -* $2 is the highest result number in the displayed set for the current search |
| 513 | | -* $3 is the number of results for the current search', |
| 514 | | - 'rsd_results_next' => '{{Identical|Next}}', |
| 515 | | - 'rsd_results_prev' => '{{Identical|Previous}}', |
| 516 | | - 'mwe-upload_tab' => '{{Identical|Upload}}', |
| 517 | | - 'mwe-link' => '{{Identical|Link}}', |
| 518 | | - 'mwe-cc_title' => '{{optional}}', |
| 519 | | - 'mwe-select_file' => '{{Identical|Select file}}', |
| 520 | | - 'mwe-upload' => '{{Identical|Upload file}}', |
| 521 | | - 'mwe-summary' => '{{Identical|Summary}}', |
| 522 | | - 'mwe-upload-multi' => '{{Identical|Upload file}}', |
| 523 | | - 'mwe-credit-title' => '{{Identical|Title}}', |
| 524 | | - 'mwe-closed_captions' => "Closed captions are also known as '''subtitles'''.", |
| 525 | | - 'mwe-seek_to' => 'This is a status message in the mwEmbed JavaScript video viewer. Parameters: |
| 526 | | -* $1 is the time of the video that is being sought', |
| 527 | | - 'mwe-download' => '{{Identical|Download}}', |
| 528 | | - 'mwe-close_btn' => '{{Identical|Close}}', |
| 529 | | - 'mwe-playerselect' => '{{Identical|Player}}', |
| 530 | | -); |
| 531 | | - |
| 532 | 474 | /** Afrikaans (Afrikaans) |
| 533 | 475 | * @author Naudefj |
| 534 | 476 | */ |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.RemoteSearchDriver.js |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | "rsd-wiki_commons": "Wikimedia Commons, an archive of freely-licensed educational media content (images, sound and video clips)", |
| 62 | 62 | |
| 63 | 63 | "rsd-kaltura-title" : "All Sources", |
| 64 | | - "rsd-kaltura" : "Kaltura agragated search for free-licenced media across multiple search providers", |
| | 64 | + "rsd-kaltura" : "Kaltura agragated search for free-licensed media across multiple search providers", |
| 65 | 65 | |
| 66 | 66 | "rsd-this_wiki-title" : "This wiki", |
| 67 | 67 | "rsd-this_wiki-desc" : "The local wiki install", |
| — | — | @@ -101,7 +101,7 @@ |
| 102 | 102 | */ |
| 103 | 103 | 'import_url_mode': 'api', |
| 104 | 104 | |
| 105 | | - // Target title used for previews of wiki page usally: wgPageName |
| | 105 | + // Target title used for previews of wiki page usually: wgPageName |
| 106 | 106 | 'target_title': null, |
| 107 | 107 | |
| 108 | 108 | // Edit tools (can be an array of tools or keyword 'all') |
| — | — | @@ -129,8 +129,14 @@ |
| 130 | 130 | 'upload_api_proxy_frame': null, |
| 131 | 131 | |
| 132 | 132 | // Enabled providers can be keyword 'all' or an array of enabled content provider keys |
| 133 | | - 'enabled_providers': 'all', |
| | 133 | + 'enabled_providers': 'all', |
| 134 | 134 | |
| | 135 | + // Enalbed license types can any set of |
| | 136 | + // 'pd' (public domain), 'by' ( attribution ) , 'sa' (share alike ), |
| | 137 | + // 'nd' ( no derivatives ) |
| | 138 | + // 'nc' ( non-comercial ), 'all' ( all found licenses are "ok") |
| | 139 | + 'enabled_licenses' : ['pd', 'by', 'sa' ], |
| | 140 | + |
| 135 | 141 | // Set a default provider |
| 136 | 142 | 'default_provider': null, |
| 137 | 143 | |
| — | — | @@ -562,11 +568,31 @@ |
| 563 | 569 | * @param license_url the url of the license |
| 564 | 570 | */ |
| 565 | 571 | getLicenseFromUrl: function( license_url ) { |
| 566 | | - // Check for some pre-defined url types: |
| | 572 | + // Get the license key: |
| | 573 | + var licenseKey = this.getLicenseKeyFromUrl( license_url ); |
| | 574 | + if( licenseKey ){ |
| | 575 | + // Return the license object: |
| | 576 | + return this.getLicenseFromKey( licenseKey , license_url ); |
| | 577 | + } |
| | 578 | + // Could not find it return mwe-unknown_license |
| | 579 | + return { |
| | 580 | + 'title': gM( 'mwe-unknown_license' ), |
| | 581 | + 'img_html': '<span>' + gM( 'mwe-unknown_license' ) + '</span>', |
| | 582 | + 'lurl': license_url |
| | 583 | + }; |
| | 584 | + }, |
| | 585 | + |
| | 586 | + /** |
| | 587 | + * Get a license key from a url string |
| | 588 | + * @parma {String} license_url License url to get key from |
| | 589 | + * @return mixed license key or false if not found. |
| | 590 | + */ |
| | 591 | + getLicenseKeyFromUrl: function( license_url ){ |
| | 592 | + // Check for some pre-defined us gov url: |
| 567 | 593 | if ( license_url == 'http://www.usa.gov/copyright.shtml' || |
| 568 | | - license_url == 'http://creativecommons.org/licenses/publicdomain' ) |
| 569 | | - return this.getLicenseFromKey( 'pd' , license_url ); |
| 570 | | - |
| | 594 | + license_url == 'http://creativecommons.org/licenses/publicdomain' ){ |
| | 595 | + return 'pd'; |
| | 596 | + } |
| 571 | 597 | // First do a direct lookup check: |
| 572 | 598 | for ( var j = 0; j < this.licenses.cc.licenses.length; j++ ) { |
| 573 | 599 | var jLicense = this.licenses.cc.licenses[ j ]; |
| — | — | @@ -578,18 +604,30 @@ |
| 579 | 605 | } |
| 580 | 606 | // Check the license_url for a given key |
| 581 | 607 | if ( mw.parseUri( license_url ).path.indexOf( '/' + keyCheck + '/' ) != -1 ) { |
| 582 | | - return this.getLicenseFromKey( jLicense , license_url ); |
| | 608 | + return jLicense; |
| 583 | 609 | } |
| 584 | 610 | } |
| 585 | | - // Could not find it return mwe-unknown_license |
| 586 | | - return { |
| 587 | | - 'title': gM( 'mwe-unknown_license' ), |
| 588 | | - 'img_html': '<span>' + gM( 'mwe-unknown_license' ) + '</span>', |
| 589 | | - 'lurl': license_url |
| 590 | | - }; |
| | 611 | + return false; |
| 591 | 612 | }, |
| 592 | | - |
| | 613 | + |
| 593 | 614 | /** |
| | 615 | + * Check if the license is compatible with this.enabled_licenses |
| | 616 | + * @retrun true if license is compatible and false if not |
| | 617 | + */ |
| | 618 | + checkCompatibleLicense: function( license_url ) { |
| | 619 | + var licenseKey = this.getLicenseKeyFromUrl( license_url ); |
| | 620 | + if( ! licenseKey ) |
| | 621 | + return false; |
| | 622 | + var licenseSet = licenseKey.split( '-' ); |
| | 623 | + for ( var i = 0; i < licenseSet.length; i++ ) { |
| | 624 | + if( $j.inArray( licenseSet[i], this.enabled_licenses ) == -1){ |
| | 625 | + return false; |
| | 626 | + } |
| | 627 | + } |
| | 628 | + return true; |
| | 629 | + }, |
| | 630 | + |
| | 631 | + /** |
| 594 | 632 | * Get mime type icon from a provided mime type |
| 595 | 633 | * @param str mime type of the requested file |
| 596 | 634 | */ |
| — | — | @@ -1250,7 +1288,7 @@ |
| 1251 | 1289 | * searches e.g. filter state changes. This is probably also the future way to |
| 1252 | 1290 | * implement "pushing" results. |
| 1253 | 1291 | * |
| 1254 | | - * The returned callback accepts two arguements. |
| | 1292 | + * The returned callback accepts two arguments. |
| 1255 | 1293 | * |
| 1256 | 1294 | * The first, mandatory, is the |
| 1257 | 1295 | * provider object. This should be curried with the current provider object |
| — | — | @@ -1263,7 +1301,6 @@ |
| 1264 | 1302 | var _this = this; |
| 1265 | 1303 | |
| 1266 | 1304 | return function ( provider, $location ) { |
| 1267 | | - |
| 1268 | 1305 | var d = new Date(); |
| 1269 | 1306 | var searchTime = d.getMilliseconds(); |
| 1270 | 1307 | |
| — | — | @@ -1444,7 +1481,7 @@ |
| 1445 | 1482 | $resultsContainer.append( $resultsBody ); |
| 1446 | 1483 | |
| 1447 | 1484 | // @@TODO should abstract footer and header ~outside~ of search results |
| 1448 | | - // to have less leakgege with upload tab |
| | 1485 | + // to have less leakage with upload tab |
| 1449 | 1486 | if ( this.current_provider != 'upload' ) { |
| 1450 | 1487 | $resultsContainer.append( _this.createResultsFooter() ); |
| 1451 | 1488 | } |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/jquery.simpleUploadForm.js |
| — | — | @@ -7,7 +7,7 @@ |
| 8 | 8 | mw.addMessages( { |
| 9 | 9 | "mwe-select_file" : "Select file", |
| 10 | 10 | "mwe-more_license_options" : "For more license options, view the <a href=\"$1\">normal upload page<\/a>", |
| 11 | | - "mwe-select_ownwork" : "I am uploading entirely my own work, and licencing it under:", |
| | 11 | + "mwe-select_ownwork" : "I am uploading entirely my own work, and licensing it under:", |
| 12 | 12 | "mwe-license_cc-by-sa" : "Creative Commons Share Alike (3.0)", |
| 13 | 13 | "mwe-upload" : "Upload file", |
| 14 | 14 | "mwe-destfilename" : "Destination filename:", |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/searchLibs/archiveOrgSearch.js |
| — | — | @@ -71,12 +71,19 @@ |
| 72 | 72 | // Set result info: |
| 73 | 73 | this.num_results = data.response.numFound; |
| 74 | 74 | |
| 75 | | - for ( var resource_id in data.response.docs ) { |
| | 75 | + for ( var resource_id in data.response.docs ) { |
| 76 | 76 | var resource = data.response.docs[resource_id]; |
| | 77 | + |
| | 78 | + // Skip the resource if the license is not compatible |
| | 79 | + // ( archive.org does not let us filter the license on search ) |
| | 80 | + if( ! _this.rsd.checkCompatibleLicense( resource.licenseurl ) ){ |
| | 81 | + continue; |
| | 82 | + } |
| | 83 | + |
| 77 | 84 | var resource = { |
| 78 | 85 | // @@todo we should add .ogv or oga if video or audio: |
| 79 | 86 | 'titleKey' : resource.identifier + '.ogv', |
| 80 | | - 'id': resource.identifier, |
| | 87 | + 'id' : resource.identifier, |
| 81 | 88 | 'link' : _this.detailsUrl + resource.identifier, |
| 82 | 89 | 'title' : resource.title, |
| 83 | 90 | 'poster' : _this.downloadUrl + resource.identifier + '/format=thumbnail', |
| — | — | @@ -87,10 +94,10 @@ |
| 88 | 95 | 'src' : _this.downloadUrl + resource.identifier + '/format=Ogg+video', |
| 89 | 96 | 'mime' : 'application/ogg', |
| 90 | 97 | // Set the license: (rsd is a pointer to the parent remoteSearchDriver ) |
| 91 | | - 'license' : this.rsd.getLicenseFromUrl( resource.licenseurl ), |
| | 98 | + 'license' : _this.rsd.getLicenseFromUrl( resource.licenseurl ), |
| 92 | 99 | 'pSobj' :_this |
| 93 | 100 | |
| 94 | | - }; |
| | 101 | + }; |
| 95 | 102 | this.resultsObj[ resource_id ] = resource; |
| 96 | 103 | } |
| 97 | 104 | } |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/searchLibs/kalturaSearch.js |
| — | — | @@ -14,13 +14,19 @@ |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | kalturaFilters.prototype = { |
| 18 | | - |
| | 18 | + // List of filters |
| 19 | 19 | filterList: {}, |
| 20 | 20 | |
| | 21 | + // A callback function to be called once filter changes are updated |
| 21 | 22 | filterChangeCallBack: function() {}, |
| 22 | 23 | |
| | 24 | + // Flag to reset the filter set |
| 23 | 25 | resetRequired: false, |
| 24 | 26 | |
| | 27 | + /** |
| | 28 | + * Constructor |
| | 29 | + * @param Object options Set of options for the search |
| | 30 | + */ |
| 25 | 31 | init: function( options ) { |
| 26 | 32 | |
| 27 | 33 | this.resetFilters(); |
| — | — | @@ -264,6 +270,12 @@ |
| 265 | 271 | for ( var resource_id in data ) { |
| 266 | 272 | var result = data[ resource_id ]; |
| 267 | 273 | |
| | 274 | + // Skip the resource if the license is not compatible |
| | 275 | + if( result.license_url && ! _this.rsd.checkCompatibleLicense( resource.licenseurl ) ){ |
| | 276 | + continue; |
| | 277 | + } |
| | 278 | + |
| | 279 | + |
| 268 | 280 | // Update mappings: |
| 269 | 281 | result[ 'poster' ] = result[ 'thumbnail' ]; |
| 270 | 282 | result[ 'pSobj' ] = _this; |