| Index: branches/js2-work/phase3/js/mwEmbed/includes/languages/mwEmbed.i18n.php |
| — | — | @@ -12,64 +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-share_this_video' => 'Share this video', |
| 46 | | - 'mwe-video_credits' => 'Video credits', |
| 47 | | - 'mwe-menu_btn' => 'Menu', |
| 48 | | - 'mwe-close_btn' => 'Close', |
| 49 | | - 'mwe-ogg-player-vlc-player' => 'VLC player', |
| 50 | | - 'mwe-ogg-player-videoElement' => 'Native Ogg video', |
| 51 | | - 'mwe-ogg-player-oggPlugin' => 'Generic Ogg plugin', |
| 52 | | - 'mwe-ogg-player-quicktime-mozilla' => 'QuickTime plugin', |
| 53 | | - 'mwe-ogg-player-quicktime-activex' => 'QuickTime ActiveX', |
| 54 | | - 'mwe-ogg-player-cortado' => 'Java Cortado', |
| 55 | | - 'mwe-ogg-player-flowplayer' => 'Flowplayer', |
| 56 | | - 'mwe-ogg-player-kplayer' => 'Kaltura player', |
| 57 | | - 'mwe-ogg-player-selected' => '(selected)', |
| 58 | | - 'mwe-ogg-player-omtkplayer' => 'OMTK Flash Vorbis', |
| 59 | | - '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 />', |
| 60 | | - 'mwe-for_best_experience' => 'For a better video playback experience we recommend:<br /><b><a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=mwEmbed">Firefox</a>.</b>', |
| 61 | | - 'mwe-do_not_warn_again' => 'Dismiss for now.', |
| 62 | | - 'mwe-playerSelect' => 'Players', |
| 63 | | - 'mwe-read_before_embed' => '<a href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding" target="_new">Read this</a> before embedding.', |
| 64 | | - 'mwe-embed_site_or_blog' => 'Embed on a page', |
| 65 | | - 'mwe-related_videos' => 'Related videos', |
| 66 | | - 'mwe-seeking' => 'seeking', |
| 67 | | - 'mwe-copy-code' => 'Copy code', |
| 68 | | - 'mwe-video-h264' => 'H.264 video', |
| 69 | | - 'mwe-video-flv' => 'Flash video', |
| 70 | | - 'mwe-video-ogg' => 'Ogg video', |
| 71 | | - 'mwe-video-audio' => 'Ogg audio', |
| | 18 | + 'mwe-credit-title' => 'Title: $1', |
| | 19 | + 'mwe-kaltura-platform-title' => 'Kaltura open source video platform', |
| 72 | 20 | |
| 73 | 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 | + /* |
| 74 | 33 | * js file: /modules/Sequencer/mw.Sequencer.js |
| 75 | 34 | */ |
| 76 | 35 | 'mwe-menu_clipedit' => 'Edit media', |
| — | — | @@ -108,63 +67,12 @@ |
| 109 | 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>).', |
| 110 | 69 | |
| 111 | 70 | /* |
| 112 | | - * js file: /modules/Sequencer/mw.TimedEffectsEdit.js |
| 113 | | - */ |
| 114 | | - 'mwe-transition_in' => 'Transition in', |
| 115 | | - 'mwe-transition_out' => 'Transition out', |
| 116 | | - 'mwe-effects' => 'Effects stack', |
| 117 | | - 'mwe-remove_transition' => 'Remove transition', |
| 118 | | - 'mwe-edit_transin' => 'Edit transition into clip', |
| 119 | | - 'mwe-edit_transout' => 'Edit transition out of clip', |
| 120 | | - 'mwe-add-transition' => 'Add a transition', |
| 121 | | - |
| 122 | | - /* |
| 123 | 71 | * js file: /modules/Sequencer/remotes/RemoteMwSequencer.js |
| 124 | 72 | */ |
| 125 | 73 | 'mwe-no-sequence-create' => 'No sequence exists named $1, You can $2', |
| 126 | 74 | 'mwe-sequence-create-one' => 'start a sequence', |
| 127 | 75 | |
| 128 | 76 | /* |
| 129 | | - * js file: /modules/ClipEdit/mw.ClipEdit.js |
| 130 | | - */ |
| 131 | | - 'mwe-crop' => 'Crop image', |
| 132 | | - 'mwe-apply_crop' => 'Apply crop to image', |
| 133 | | - 'mwe-reset_crop' => 'Reset crop', |
| 134 | | - 'mwe-insert_image_page' => 'Insert into page', |
| 135 | | - 'mwe-insert_into_sequence' => 'Insert into sequence', |
| 136 | | - 'mwe-preview_insert' => 'Preview insert', |
| 137 | | - 'mwe-cancel_image_insert' => 'Cancel insert', |
| 138 | | - 'mwe-sc_attributes' => 'Clip detail edit', |
| 139 | | - 'mwe-sc_inoutpoints' => 'Set in-out points', |
| 140 | | - 'mwe-sc_overlays' => 'Overlays', |
| 141 | | - 'mwe-sc_audio' => 'Audio control', |
| 142 | | - 'mwe-sc_duration' => 'Duration', |
| 143 | | - 'mwe-template_properties' => 'Template properties', |
| 144 | | - 'mwe-custom_title' => 'Custom title', |
| 145 | | - 'mwe-edit_properties' => 'Edit properties', |
| 146 | | - 'mwe-other_properties' => 'Other properties', |
| 147 | | - 'mwe-resource_page' => 'Resource page:', |
| 148 | | - 'mwe-set_in_out_points' => 'Set in-out points', |
| 149 | | - 'mwe-start_time' => 'Start time', |
| 150 | | - 'mwe-end_time' => 'End time', |
| 151 | | - 'mwe-preview_inout' => 'Preview in-out points', |
| 152 | | - 'mwe-edit-tools' => 'Edit tools', |
| 153 | | - 'mwe-inline-description' => 'Caption', |
| 154 | | - 'mwe-edit-video-tools' => 'Edit video tools:', |
| 155 | | - 'mwe-duration' => 'Duration:', |
| 156 | | - 'mwe-layout' => 'Layout', |
| 157 | | - |
| 158 | | - /* |
| 159 | | - * js file: /modules/ApiProxy/mw.proxy.js |
| 160 | | - */ |
| 161 | | - 'mwe-setting-up-proxy' => 'Setting up proxy...', |
| 162 | | - 'mwe-re-try' => 'Retry API request', |
| 163 | | - 'mwe-re-trying' => 'Retrying API request...', |
| 164 | | - 'mwe-proxy-not-ready' => 'Proxy is not configured', |
| 165 | | - '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.', |
| 166 | | - 'mwe-remember-loging' => 'General security reminder: Only login to web sites when your address bar displays that site\'s address.', |
| 167 | | - |
| 168 | | - /* |
| 169 | 77 | * js file: /modules/TimedText/mw.TimedTextEdit.js |
| 170 | 78 | */ |
| 171 | 79 | 'mew-timedtext-editor' => 'Timed text editor', |
| — | — | @@ -217,85 +125,75 @@ |
| 218 | 126 | 'mwe-textcat-cue' => 'Cue points', |
| 219 | 127 | |
| 220 | 128 | /* |
| 221 | | - * js file: /modules/TimedText/old_mvTimeTextEdit.js |
| 222 | | - */ |
| 223 | | - 'mwe-upload-subs-file' => 'Upload subtitle', |
| 224 | | - 'mwe-add-subs-file-title' => 'Select subtitle to upload', |
| 225 | | - 'mwe-error-only-srt' => 'You can only upload srt files.', |
| 226 | | - 'mwe-watch-video' => 'Watch video', |
| 227 | | - 'mwe-select-other-language' => 'Select another language', |
| 228 | | - 'mwe-saving' => 'saving...', |
| 229 | | - |
| 230 | | - /* |
| 231 | 129 | * js file: /modules/TimedText/remotes/RemoteMwTimedText.js |
| 232 | 130 | */ |
| 233 | 131 | 'mwe-language-subtitles-for-clip' => '$1 subtitles for clip: $2', |
| 234 | 132 | 'mwe-language-no-subtitles-for-clip' => 'No $1 subtitles where found for clip: $2', |
| 235 | 133 | |
| 236 | 134 | /* |
| 237 | | - * js file: /modules/AddMedia/mw.RemoteSearchDriver.js |
| | 135 | + * js file: /modules/EmbedPlayer/mw.EmbedPlayer.js |
| 238 | 136 | */ |
| 239 | | - 'mwe-add_media_wizard' => 'Add media wizard', |
| 240 | | - 'mwe-media_search' => 'Media search', |
| 241 | | - 'rsd_box_layout' => 'Box layout', |
| 242 | | - 'rsd_list_layout' => 'List layout', |
| 243 | | - 'rsd_results_desc' => 'Results $1 to $2', |
| 244 | | - 'rsd_results_desc_total' => 'Results $1 to $2 of $3', |
| 245 | | - 'rsd_results_next' => 'next', |
| 246 | | - 'rsd_results_prev' => 'previous', |
| 247 | | - 'rsd_no_results' => 'No search results for <b>$1</b>', |
| 248 | | - 'mwe-upload_tab' => 'Upload', |
| 249 | | - 'rsd_layout' => 'Layout:', |
| 250 | | - 'rsd_resource_edit' => 'Edit resource: $1', |
| 251 | | - 'mwe-resource_description_page' => 'Resource description page', |
| 252 | | - 'mwe-link' => 'link', |
| 253 | | - 'rsd_do_insert' => 'Do insert', |
| 254 | | - 'mwe-cc_title' => 'Creative Commons', |
| 255 | | - 'mwe-cc_by_title' => 'Attribution', |
| 256 | | - 'mwe-cc_nc_title' => 'Noncommercial', |
| 257 | | - 'mwe-cc_nd_title' => 'No Derivative Works', |
| 258 | | - 'mwe-cc_sa_title' => 'Share Alike', |
| 259 | | - 'mwe-cc_pd_title' => 'Public Domain', |
| 260 | | - 'mwe-unknown_license' => 'Unknown license', |
| 261 | | - '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>', |
| 262 | | - 'mwe-results_from' => 'Results from <a href="$1" target="_new" >$2</a>', |
| 263 | | - 'mwe-missing_desc_see_source' => 'This asset is missing a description. Please see the [$1 original source] and help describe it.', |
| 264 | | - 'rsd_config_error' => 'Add media wizard configuration error: $1', |
| 265 | | - 'mwe-your_recent_uploads' => 'Your recent uploads to $1', |
| 266 | | - 'mwe-no_recent_uploads' => 'No recent uploads', |
| 267 | | - 'mwe-upload_a_file' => 'Upload a new file to $1', |
| 268 | | - 'mwe-resource_page_desc' => 'Resource page description:', |
| 269 | | - 'mwe-edit_resource_desc' => 'Edit wiki text resource description:', |
| 270 | | - 'mwe-local_resource_title' => 'Local resource title:', |
| 271 | | - 'mwe-watch_this_page' => 'Watch this page', |
| 272 | | - 'mwe-do_import_resource' => 'Import resource', |
| 273 | | - 'mwe-update_preview' => 'Update resource page preview', |
| 274 | | - 'mwe-cancel_import' => 'Cancel import', |
| 275 | | - 'mwe-importing_asset' => 'Importing asset', |
| 276 | | - 'mwe-preview_insert_resource' => 'Preview insert of resource: $1', |
| 277 | | - 'mwe-checking-resource' => 'Checking for resource', |
| 278 | | - 'mwe-resource-needs-import' => 'Resource $1 needs to be imported to $2', |
| 279 | | - 'mwe-ftype-svg' => 'SVG vector file', |
| 280 | | - 'mwe-ftype-jpg' => 'JPEG image file', |
| 281 | | - 'mwe-ftype-png' => 'PNG image file', |
| 282 | | - 'mwe-ftype-oga' => 'Ogg audio file', |
| 283 | | - 'mwe-ftype-ogg' => 'Ogg video file', |
| 284 | | - 'mwe-ftype-unk' => 'Unknown file format', |
| 285 | | - 'rsd-wiki_commons-title' => 'Wikimedia Commons', |
| 286 | | - 'rsd-wiki_commons' => 'Wikimedia Commons, an archive of freely-licensed educational media content (images, sound and video clips)', |
| 287 | | - 'rsd-kaltura-title' => 'All Sources', |
| 288 | | - 'rsd-kaltura' => 'Kaltura agragated search for free-licenced media across multiple search providers', |
| 289 | | - 'rsd-this_wiki-title' => 'This wiki', |
| 290 | | - 'rsd-this_wiki-desc' => 'The local wiki install', |
| 291 | | - 'rsd-archive_org-title' => 'Archive.org', |
| 292 | | - 'rsd-archive_org-desc' => 'The Internet Archive, a digital library of cultural artifacts', |
| 293 | | - 'rsd-flickr-title' => 'Flickr.com', |
| 294 | | - 'rsd-flickr-desc' => 'Flickr.com, a online photo sharing site', |
| 295 | | - 'rsd-metavid-title' => 'Metavid.org', |
| 296 | | - 'rsd-metavid-desc' => 'Metavid.org, a community archive of US House and Senate floor proceedings', |
| 297 | | - '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-share_this_video' => 'Share this video', |
| | 165 | + 'mwe-video_credits' => 'Video credits', |
| | 166 | + 'mwe-menu_btn' => 'Menu', |
| | 167 | + 'mwe-close_btn' => 'Close', |
| | 168 | + 'mwe-ogg-player-vlc-player' => 'VLC player', |
| | 169 | + 'mwe-ogg-player-videoElement' => 'Native Ogg video', |
| | 170 | + 'mwe-ogg-player-oggPlugin' => 'Generic Ogg plugin', |
| | 171 | + 'mwe-ogg-player-quicktime-mozilla' => 'QuickTime plugin', |
| | 172 | + 'mwe-ogg-player-quicktime-activex' => 'QuickTime ActiveX', |
| | 173 | + 'mwe-ogg-player-cortado' => 'Java Cortado', |
| | 174 | + 'mwe-ogg-player-flowplayer' => 'Flowplayer', |
| | 175 | + 'mwe-ogg-player-kplayer' => 'Kaltura player', |
| | 176 | + 'mwe-ogg-player-selected' => '(selected)', |
| | 177 | + 'mwe-ogg-player-omtkplayer' => 'OMTK Flash Vorbis', |
| | 178 | + '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 />', |
| | 179 | + '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>', |
| | 180 | + 'mwe-do_not_warn_again' => 'Dismiss for now.', |
| | 181 | + 'mwe-playerSelect' => 'Players', |
| | 182 | + 'mwe-read_before_embed' => '<a href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding" target="_new">Read this</a> before embedding.', |
| | 183 | + 'mwe-embed_site_or_blog' => 'Embed on a page', |
| | 184 | + 'mwe-related_videos' => 'Related videos', |
| | 185 | + 'mwe-seeking' => 'seeking', |
| | 186 | + 'mwe-copy-code' => 'Copy code', |
| | 187 | + 'mwe-video-h264' => 'H.264 video', |
| | 188 | + 'mwe-video-flv' => 'Flash video', |
| | 189 | + 'mwe-video-ogg' => 'Ogg video', |
| | 190 | + 'mwe-video-audio' => 'Ogg audio', |
| 298 | 191 | |
| 299 | 192 | /* |
| | 193 | + * js file: /modules/AddMedia/loader.js |
| | 194 | + */ |
| | 195 | + 'mwe-loading-add-media-wiz' => 'Loading add media wizard', |
| | 196 | + |
| | 197 | + /* |
| 300 | 198 | * js file: /modules/AddMedia/mw.BaseUploadInterface.js |
| 301 | 199 | */ |
| 302 | 200 | 'mwe-upload-transcode-in-progress' => 'Transcode and upload in progress (do not close this window)', |
| — | — | @@ -322,56 +220,6 @@ |
| 323 | 221 | '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>).', |
| 324 | 222 | |
| 325 | 223 | /* |
| 326 | | - * js file: /modules/AddMedia/jquery.simpleUploadForm.js |
| 327 | | - */ |
| 328 | | - 'mwe-select_file' => 'Select file', |
| 329 | | - 'mwe-more_license_options' => 'For more license options, view the <a href="$1">normal upload page</a>', |
| 330 | | - 'mwe-select_ownwork' => 'I am uploading entirely my own work, and licencing it under:', |
| 331 | | - 'mwe-license_cc-by-sa' => 'Creative Commons Share Alike (3.0)', |
| 332 | | - 'mwe-upload' => 'Upload file', |
| 333 | | - 'mwe-destfilename' => 'Destination filename:', |
| 334 | | - 'mwe-summary' => 'Summary', |
| 335 | | - 'mwe-error_not_loggedin' => 'You do not appear to be logged in or do not have upload privileges.', |
| 336 | | - 'mwe-watch-this-file' => 'Watch this file', |
| 337 | | - 'mwe-ignore-any-warnings' => 'Ignore any warnings', |
| 338 | | - |
| 339 | | - /* |
| 340 | | - * js file: /modules/AddMedia/mw.Firefogg.js |
| 341 | | - */ |
| 342 | | - 'fogg-select_file' => 'Select file', |
| 343 | | - 'fogg-select_new_file' => 'Select new file', |
| 344 | | - 'fogg-select_url' => 'Select URL', |
| 345 | | - 'fogg-save_local_file' => 'Save Ogg', |
| 346 | | - 'fogg-check_for_firefogg' => 'Checking for Firefogg...', |
| 347 | | - 'fogg-installed' => 'Firefogg is installed', |
| 348 | | - 'fogg-for_improved_uploads' => 'For improved uploads:', |
| 349 | | - 'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about Firefogg</a>.', |
| 350 | | - '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>', |
| 351 | | - 'fogg-passthrough_mode' => 'Your selected file is already Ogg or not a video file', |
| 352 | | - 'fogg-transcoding' => 'Encoding video to Ogg...', |
| 353 | | - 'fogg-encoding-done' => 'Encoding complete', |
| 354 | | - 'fogg-badtoken' => 'Token is not valid', |
| 355 | | - 'fogg-preview' => 'Preview video', |
| 356 | | - 'fogg-hidepreview' => 'Hide preview', |
| 357 | | - |
| 358 | | - /* |
| 359 | | - * js file: /modules/AddMedia/searchLibs/metavidSearch.js |
| 360 | | - */ |
| 361 | | - 'mwe-stream_title' => '$1 $2 to $3', |
| 362 | | - |
| 363 | | - /* |
| 364 | | - * js file: /modules/AddMedia/searchLibs/baseRemoteSearch.js |
| 365 | | - */ |
| 366 | | - 'mwe-imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more information.', |
| 367 | | - 'mwe-import-description' => '$1, imported from $2', |
| 368 | | - |
| 369 | | - /* |
| 370 | | - * js file: /modules/AddMedia/jquery.dragDropFile.js |
| 371 | | - */ |
| 372 | | - 'mwe-upload-multi' => 'Upload {{PLURAL:$1|file|files}}', |
| 373 | | - 'mwe-review-upload' => 'Review file {{PLURAL:$1|upload|uploads}}', |
| 374 | | - |
| 375 | | - /* |
| 376 | 224 | * js file: /modules/AddMedia/mw.FirefoggGUI.js |
| 377 | 225 | */ |
| 378 | 226 | 'fogg-help-sticky' => 'Help (click to stick)', |
| — | — | @@ -438,11 +286,159 @@ |
| 439 | 287 | 'fogg-contact-help' => 'Contact link', |
| 440 | 288 | |
| 441 | 289 | /* |
| 442 | | - * js file: /modules/AddMedia/loader.js |
| | 290 | + * js file: /modules/AddMedia/searchLibs/metavidSearch.js |
| 443 | 291 | */ |
| 444 | | - 'mwe-loading-add-media-wiz' => 'Loading add media wizard', |
| | 292 | + 'mwe-stream_title' => '$1 $2 to $3', |
| 445 | 293 | |
| 446 | 294 | /* |
| | 295 | + * js file: /modules/AddMedia/searchLibs/baseRemoteSearch.js |
| | 296 | + */ |
| | 297 | + 'mwe-imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more information.', |
| | 298 | + 'mwe-import-description' => '$1, imported from $2', |
| | 299 | + |
| | 300 | + /* |
| | 301 | + * js file: /modules/AddMedia/jquery.simpleUploadForm.js |
| | 302 | + */ |
| | 303 | + 'mwe-select_file' => 'Select file', |
| | 304 | + 'mwe-more_license_options' => 'For more license options, view the <a href="$1">normal upload page</a>', |
| | 305 | + 'mwe-select_ownwork' => 'I am uploading entirely my own work, and licencing it under:', |
| | 306 | + 'mwe-license_cc-by-sa' => 'Creative Commons Share Alike (3.0)', |
| | 307 | + 'mwe-upload' => 'Upload file', |
| | 308 | + 'mwe-destfilename' => 'Destination filename:', |
| | 309 | + 'mwe-summary' => 'Summary', |
| | 310 | + 'mwe-error_not_loggedin' => 'You do not appear to be logged in or do not have upload privileges.', |
| | 311 | + 'mwe-watch-this-file' => 'Watch this file', |
| | 312 | + 'mwe-ignore-any-warnings' => 'Ignore any warnings', |
| | 313 | + |
| | 314 | + /* |
| | 315 | + * js file: /modules/AddMedia/mw.RemoteSearchDriver.js |
| | 316 | + */ |
| | 317 | + 'mwe-add_media_wizard' => 'Add media wizard', |
| | 318 | + 'mwe-media_search' => 'Media search', |
| | 319 | + 'rsd_box_layout' => 'Box layout', |
| | 320 | + 'rsd_list_layout' => 'List layout', |
| | 321 | + 'rsd_results_desc' => 'Results $1 to $2', |
| | 322 | + 'rsd_results_desc_total' => 'Results $1 to $2 of $3', |
| | 323 | + 'rsd_results_next' => 'next', |
| | 324 | + 'rsd_results_prev' => 'previous', |
| | 325 | + 'rsd_no_results' => 'No search results for <b>$1</b>', |
| | 326 | + 'mwe-upload_tab' => 'Upload', |
| | 327 | + 'rsd_layout' => 'Layout:', |
| | 328 | + 'rsd_resource_edit' => 'Edit resource: $1', |
| | 329 | + 'mwe-resource_description_page' => 'Resource description page', |
| | 330 | + 'mwe-link' => 'link', |
| | 331 | + 'rsd_do_insert' => 'Do insert', |
| | 332 | + 'mwe-cc_title' => 'Creative Commons', |
| | 333 | + 'mwe-cc_by_title' => 'Attribution', |
| | 334 | + 'mwe-cc_nc_title' => 'Noncommercial', |
| | 335 | + 'mwe-cc_nd_title' => 'No Derivative Works', |
| | 336 | + 'mwe-cc_sa_title' => 'Share Alike', |
| | 337 | + 'mwe-cc_pd_title' => 'Public Domain', |
| | 338 | + 'mwe-unknown_license' => 'Unknown license', |
| | 339 | + '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>', |
| | 340 | + 'mwe-results_from' => 'Results from <a href="$1" target="_new" >$2</a>', |
| | 341 | + 'mwe-missing_desc_see_source' => 'This asset is missing a description. Please see the [$1 original source] and help describe it.', |
| | 342 | + 'rsd_config_error' => 'Add media wizard configuration error: $1', |
| | 343 | + 'mwe-your_recent_uploads' => 'Your recent uploads to $1', |
| | 344 | + 'mwe-no_recent_uploads' => 'No recent uploads', |
| | 345 | + 'mwe-upload_a_file' => 'Upload a new file to $1', |
| | 346 | + 'mwe-resource_page_desc' => 'Resource page description:', |
| | 347 | + 'mwe-edit_resource_desc' => 'Edit wiki text resource description:', |
| | 348 | + 'mwe-local_resource_title' => 'Local resource title:', |
| | 349 | + 'mwe-watch_this_page' => 'Watch this page', |
| | 350 | + 'mwe-do_import_resource' => 'Import resource', |
| | 351 | + 'mwe-update_preview' => 'Update resource page preview', |
| | 352 | + 'mwe-cancel_import' => 'Cancel import', |
| | 353 | + 'mwe-importing_asset' => 'Importing asset', |
| | 354 | + 'mwe-preview_insert_resource' => 'Preview insert of resource: $1', |
| | 355 | + 'mwe-checking-resource' => 'Checking for resource', |
| | 356 | + 'mwe-resource-needs-import' => 'Resource $1 needs to be imported to $2', |
| | 357 | + 'mwe-ftype-svg' => 'SVG vector file', |
| | 358 | + 'mwe-ftype-jpg' => 'JPEG image file', |
| | 359 | + 'mwe-ftype-png' => 'PNG image file', |
| | 360 | + 'mwe-ftype-oga' => 'Ogg audio file', |
| | 361 | + 'mwe-ftype-ogg' => 'Ogg video file', |
| | 362 | + 'mwe-ftype-unk' => 'Unknown file format', |
| | 363 | + 'rsd-wiki_commons-title' => 'Wikimedia Commons', |
| | 364 | + 'rsd-wiki_commons' => 'Wikimedia Commons, an archive of freely-licensed educational media content (images, sound and video clips)', |
| | 365 | + 'rsd-kaltura-title' => 'All Sources', |
| | 366 | + 'rsd-kaltura' => 'Kaltura agragated search for free-licenced media across multiple search providers', |
| | 367 | + 'rsd-this_wiki-title' => 'This wiki', |
| | 368 | + 'rsd-this_wiki-desc' => 'The local wiki install', |
| | 369 | + 'rsd-archive_org-title' => 'Archive.org', |
| | 370 | + 'rsd-archive_org-desc' => 'The Internet Archive, a digital library of cultural artifacts', |
| | 371 | + 'rsd-flickr-title' => 'Flickr.com', |
| | 372 | + 'rsd-flickr-desc' => 'Flickr.com, a online photo sharing site', |
| | 373 | + 'rsd-metavid-title' => 'Metavid.org', |
| | 374 | + 'rsd-metavid-desc' => 'Metavid.org, a community archive of US House and Senate floor proceedings', |
| | 375 | + 'rsd-search-timeout' => 'The search request did not complete. The server may be down experiencing heavy load. You can try again later', |
| | 376 | + |
| | 377 | + /* |
| | 378 | + * js file: /modules/AddMedia/mw.Firefogg.js |
| | 379 | + */ |
| | 380 | + 'fogg-select_file' => 'Select file', |
| | 381 | + 'fogg-select_new_file' => 'Select new file', |
| | 382 | + 'fogg-select_url' => 'Select URL', |
| | 383 | + 'fogg-save_local_file' => 'Save Ogg', |
| | 384 | + 'fogg-check_for_firefogg' => 'Checking for Firefogg...', |
| | 385 | + 'fogg-installed' => 'Firefogg is installed', |
| | 386 | + 'fogg-for_improved_uploads' => 'For improved uploads:', |
| | 387 | + 'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about Firefogg</a>.', |
| | 388 | + '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>', |
| | 389 | + 'fogg-passthrough_mode' => 'Your selected file is already Ogg or not a video file', |
| | 390 | + 'fogg-transcoding' => 'Encoding video to Ogg...', |
| | 391 | + 'fogg-encoding-done' => 'Encoding complete', |
| | 392 | + 'fogg-badtoken' => 'Token is not valid', |
| | 393 | + 'fogg-preview' => 'Preview video', |
| | 394 | + 'fogg-hidepreview' => 'Hide preview', |
| | 395 | + |
| | 396 | + /* |
| | 397 | + * js file: /modules/AddMedia/jquery.dragDropFile.js |
| | 398 | + */ |
| | 399 | + 'mwe-upload-multi' => 'Upload {{PLURAL:$1|file|files}}', |
| | 400 | + 'mwe-review-upload' => 'Review file {{PLURAL:$1|upload|uploads}}', |
| | 401 | + |
| | 402 | + /* |
| | 403 | + * js file: /modules/ClipEdit/mw.ClipEdit.js |
| | 404 | + */ |
| | 405 | + 'mwe-crop' => 'Crop image', |
| | 406 | + 'mwe-apply_crop' => 'Apply crop to image', |
| | 407 | + 'mwe-reset_crop' => 'Reset crop', |
| | 408 | + 'mwe-insert_image_page' => 'Insert into page', |
| | 409 | + 'mwe-insert_into_sequence' => 'Insert into sequence', |
| | 410 | + 'mwe-preview_insert' => 'Preview insert', |
| | 411 | + 'mwe-cancel_image_insert' => 'Cancel insert', |
| | 412 | + 'mwe-sc_attributes' => 'Clip detail edit', |
| | 413 | + 'mwe-sc_inoutpoints' => 'Set in-out points', |
| | 414 | + 'mwe-sc_overlays' => 'Overlays', |
| | 415 | + 'mwe-sc_audio' => 'Audio control', |
| | 416 | + 'mwe-sc_duration' => 'Duration', |
| | 417 | + 'mwe-template_properties' => 'Template properties', |
| | 418 | + 'mwe-custom_title' => 'Custom title', |
| | 419 | + 'mwe-edit_properties' => 'Edit properties', |
| | 420 | + 'mwe-other_properties' => 'Other properties', |
| | 421 | + 'mwe-resource_page' => 'Resource page:', |
| | 422 | + 'mwe-set_in_out_points' => 'Set in-out points', |
| | 423 | + 'mwe-start_time' => 'Start time', |
| | 424 | + 'mwe-end_time' => 'End time', |
| | 425 | + 'mwe-preview_inout' => 'Preview in-out points', |
| | 426 | + 'mwe-edit-tools' => 'Edit tools', |
| | 427 | + 'mwe-inline-description' => 'Caption', |
| | 428 | + 'mwe-edit-video-tools' => 'Edit video tools:', |
| | 429 | + 'mwe-duration' => 'Duration:', |
| | 430 | + 'mwe-layout' => 'Layout', |
| | 431 | + |
| | 432 | + /* |
| | 433 | + * js file: /modules/ApiProxy/mw.proxy.js |
| | 434 | + */ |
| | 435 | + 'mwe-setting-up-proxy' => 'Setting up proxy...', |
| | 436 | + 'mwe-re-try' => 'Retry API request', |
| | 437 | + 'mwe-re-trying' => 'Retrying API request...', |
| | 438 | + 'mwe-proxy-not-ready' => 'Proxy is not configured', |
| | 439 | + '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.', |
| | 440 | + 'mwe-remember-loging' => 'General security reminder: Only login to web sites when your address bar displays that site\'s address.', |
| | 441 | + |
| | 442 | + /* |
| 447 | 443 | * js file: /mwEmbed.js |
| 448 | 444 | */ |
| 449 | 445 | 'mwe-loading_txt' => 'Loading ...', |
| — | — | @@ -455,17 +451,11 @@ |
| 456 | 452 | 'mwe-load-drag-item' => 'Loading dragged item', |
| 457 | 453 | 'mwe-ok' => 'OK', |
| 458 | 454 | 'mwe-cancel' => 'Cancel', |
| 459 | | - 'mwe-enable-gadget' => 'Enable mwEmbed gadgate for all pages', |
| 460 | | - 'mwe-enable-gadget-done' => 'mwEmbed gadgate has been enabled', |
| 461 | | - 'mwe-must-login-gadget' => 'To enable gadget you must <a href="$1">login</a>', |
| | 455 | + 'mwe-enable-gadget' => 'Enable mwEmbed gadget for all pages', |
| | 456 | + 'mwe-enable-gadget-done' => 'mwEmbed gadget has been enabled', |
| | 457 | + 'mwe-must-login-gadget' => 'To enable gadget you must <a target="_new" href="$1">login</a>', |
| 462 | 458 | |
| 463 | 459 | /* |
| 464 | | - * js file: /skins/kskin/kskinConfig.js |
| 465 | | - */ |
| 466 | | - 'mwe-credit-title' => 'Title: $1', |
| 467 | | - 'mwe-kaltura-platform-title' => 'Kaltura open source video platform', |
| 468 | | - |
| 469 | | - /* |
| 470 | 460 | * js file: /tests/testLang.js |
| 471 | 461 | */ |
| 472 | 462 | 'undelete_short' => 'Undelete {{PLURAL:$1|one edit|$1 edits}}', |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/TimedText/old_mvTimeTextEdit.js |
| — | — | @@ -1,158 +0,0 @@ |
| 2 | | -/* |
| 3 | | - * JS2-style mvTimedTextEdit.js |
| 4 | | - */ |
| 5 | | - |
| 6 | | -// Setup configuration vars (if not set already) |
| 7 | | -if ( !mwAddMediaConfig ) |
| 8 | | - var mwAddMediaConfig = { }; |
| 9 | | - |
| 10 | | -var mvTimeTextEdit = { }; |
| 11 | | - |
| 12 | | -mw.addMessages( { |
| 13 | | - "mwe-upload-subs-file" : "Upload subtitle", |
| 14 | | - "mwe-add-subs-file-title" : "Select subtitle to upload", |
| 15 | | - "mwe-error-only-srt" : "You can only upload srt files.", |
| 16 | | - "mwe-watch-video" : "Watch video", |
| 17 | | - "mwe-select-other-language" : "Select another language", |
| 18 | | - "mwe-saving" : "saving..." |
| 19 | | -} ) |
| 20 | | - |
| 21 | | - |
| 22 | | -mw.ready( function() { |
| 23 | | - function getSubtitle( f ) { |
| 24 | | - var name = f.files[0].name; |
| 25 | | - var srtData = f.files[0].getAsBinary(); |
| 26 | | - srtData = srtData.replace( '\r\n', '\n' ); |
| 27 | | - return srtData; |
| 28 | | - } |
| 29 | | - function getVideoTitle() { |
| 30 | | - var videoTitle = wgPageName.split( '.' ); |
| 31 | | - videoTitle.pop(); |
| 32 | | - videoTitle.pop(); |
| 33 | | - videoTitle = videoTitle.join( '.' ).replace( 'TimedText:', 'File:' ); |
| 34 | | - return videoTitle; |
| 35 | | - } |
| 36 | | - function uploadSubtitles() { |
| 37 | | - var request = { |
| 38 | | - 'meta' : 'siteinfo', |
| 39 | | - 'siprop' : 'languages' |
| 40 | | - }; |
| 41 | | - mw.getJSON( request, function( langDataRaw ) { |
| 42 | | - var apprefix = wgTitle.split( '.' ); |
| 43 | | - apprefix.pop(); |
| 44 | | - apprefix.pop(); |
| 45 | | - apprefix = apprefix.join( '.' ); |
| 46 | | - var request = { |
| 47 | | - 'list' : 'allpages', |
| 48 | | - 'apprefix' : apprefix |
| 49 | | - }; |
| 50 | | - mw.getJSON(request, function( subData ) { |
| 51 | | - var availableSubtitles = { }; |
| 52 | | - for ( var i in subData.query.allpages ) { |
| 53 | | - var subPage = subData.query.allpages[i]; |
| 54 | | - var langKey = subPage.title.split( '.' ); |
| 55 | | - var extension = langKey.pop(); |
| 56 | | - langKey = langKey.pop(); |
| 57 | | - availableSubtitles[langKey] = subPage.title; |
| 58 | | - } |
| 59 | | - var langData = { }; |
| 60 | | - var languageSelect = '<select id="timed_text_language">'; |
| 61 | | - |
| 62 | | - var lagRaw = langDataRaw.query.languages; |
| 63 | | - for ( var j in lagRaw ) { |
| 64 | | - var code = lagRaw[j].code; |
| 65 | | - var language = lagRaw[j]['*']; |
| 66 | | - langData[ code ] = language; |
| 67 | | - languageSelect += '<option value="' + code + '">'; |
| 68 | | - if ( availableSubtitles[code] ) { |
| 69 | | - languageSelect += language + '(' + code + ') +'; |
| 70 | | - } else { |
| 71 | | - languageSelect += language + '(' + code + ') -'; |
| 72 | | - } |
| 73 | | - languageSelect += '</option>'; |
| 74 | | - } |
| 75 | | - languageSelect += '/</select>'; |
| 76 | | - var cBtn = { }; |
| 77 | | - cBtn[ gM( 'mwe-cancel' ) ] = function() { |
| 78 | | - $j( this ).dialog( 'close' ); |
| 79 | | - } |
| 80 | | - cBtn[ gM( 'mwe-ok' ) ] = function() { |
| 81 | | - // get language from form |
| 82 | | - langKey = $j( '#timed_text_language' ).val(); |
| 83 | | - var title = wgPageName.split( '.' ); |
| 84 | | - title.pop(); |
| 85 | | - title.pop(); |
| 86 | | - title = title.join( '.' ) + '.' + langKey + '.srt'; |
| 87 | | - |
| 88 | | - var file = $j( '#timed_text_file_upload' ); |
| 89 | | - if ( !file[0].files[0] ) { |
| 90 | | - // no file to upload just jump to the lang key: |
| 91 | | - document.location.href = wgArticlePath.replace( '/$1', '?title=' + title + '&action=edit' ); |
| 92 | | - return ; |
| 93 | | - } |
| 94 | | - var langKey = file[0].files[0].name.split( '.' ); |
| 95 | | - var extension = langKey.pop(); |
| 96 | | - langKey = langKey.pop(); |
| 97 | | - var mimeTypes = { |
| 98 | | - 'srt': 'text/x-srt', |
| 99 | | - 'cmml': 'text/cmml' |
| 100 | | - } |
| 101 | | - if ( !mimeTypes[ extension ] ) { |
| 102 | | - mw.log( 'Error: unknown extension:' + extension ); |
| 103 | | - } |
| 104 | | - |
| 105 | | - |
| 106 | | - if ( extension == "srt" ) { |
| 107 | | - var srt = getSubtitle( file[0] ); |
| 108 | | - $j( this ).text( gM( 'mwe-saving' ) ); |
| 109 | | - $j( '.ui-dialog-buttonpane' ).remove(); |
| 110 | | - |
| 111 | | - var editToken = $j( 'input[name=wpEditToken]' ).val(); |
| 112 | | - var request = { |
| 113 | | - 'action' : 'edit', |
| 114 | | - 'title' : title, |
| 115 | | - 'text' : srt, |
| 116 | | - 'token': editToken |
| 117 | | - }; |
| 118 | | - mw.getJSON( request, function( dialog ) { |
| 119 | | - return function( result ) { |
| 120 | | - document.location.href = wgArticlePath.replace( '/$1', '?title=' + title + '&action=edit' ); |
| 121 | | - $j( dialog ).dialog( 'close' ); |
| 122 | | - } |
| 123 | | - }( this ) ); |
| 124 | | - } else { |
| 125 | | - $j( this ).html( gM( "mwe-error-only-srt" ) ); |
| 126 | | - } |
| 127 | | - } |
| 128 | | - $j.addDialog( gM( "mwe-add-subs-file-title" ), |
| 129 | | - '<input type="file" id="timed_text_file_upload"></input><br />' + languageSelect, |
| 130 | | - cBtn ); |
| 131 | | - $j( '#timed_text_file_upload' ).change( function( ev ) { |
| 132 | | - if ( this.files[0] ) { |
| 133 | | - var langKey = this.files[0].name.split( '.' ); |
| 134 | | - var extension = langKey.pop(); |
| 135 | | - langKey = langKey.pop(); |
| 136 | | - $j( '#timed_text_language' ).val( langKey ); |
| 137 | | - } |
| 138 | | - } ); |
| 139 | | - } ); |
| 140 | | - } ); |
| 141 | | - } |
| 142 | | - var tselect = ( $j( '#wikiEditor-ui-top' ).length != 0 ) ? '#wikiEditor-ui-top':'#toolbar'; |
| 143 | | - $j( tselect ).hide(); |
| 144 | | - var ttoolbar = $j( '<div>' ); |
| 145 | | - $j( tselect ).after( ttoolbar ); |
| 146 | | - |
| 147 | | - var button = $j( '<button>' ); |
| 148 | | - button.click( uploadSubtitles ) |
| 149 | | - button.text( gM( "mwe-upload-subs-file" ) ); |
| 150 | | - ttoolbar.append( button ); |
| 151 | | - ttoolbar.append( ' ' ); |
| 152 | | - |
| 153 | | - var button = $j( '<button>' ); |
| 154 | | - button.click( function() { document.location.href = wgArticlePath.replace( '$1', getVideoTitle() ); } ) |
| 155 | | - button.text( gM( "mwe-watch-video" ) ); |
| 156 | | - ttoolbar.append( button ); |
| 157 | | - |
| 158 | | -} ); |
| 159 | | - |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/TimedText/mw.TimedTextEdit.js |
| — | — | @@ -1,4 +1,4 @@ |
| 2 | | -/** |
| | 2 | +/** |
| 3 | 3 | * Timed text edit interface based off of participatory culture foundation timed text mockups. |
| 4 | 4 | */ |
| 5 | 5 | mw.addMessages( { |
| — | — | @@ -83,7 +83,9 @@ |
| 84 | 84 | */ |
| 85 | 85 | createTabs: function(){ |
| 86 | 86 | var _this = this; |
| 87 | | - $tabContainer = $j('<div id="TimedTextEdit-tabs"><ul></ul></div>'); |
| | 87 | + $tabContainer = $j( '<div />' ) |
| | 88 | + .attr( 'id', "TimedTextEdit-tabs" ) |
| | 89 | + .append( '<ul />' ); |
| 88 | 90 | for(var edit_stage_id in this.textEditStages){ |
| 89 | 91 | var editStage = this.textEditStages[ edit_stage_id ]; |
| 90 | 92 | // Append the menu item: |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.RemoteSearchDriver.js |
| — | — | @@ -1590,6 +1590,8 @@ |
| 1591 | 1591 | return types[i]; |
| 1592 | 1592 | } |
| 1593 | 1593 | } |
| | 1594 | + if( resource.mime == 'application/ogg' ) |
| | 1595 | + return 'video' |
| 1594 | 1596 | // Media type not found: |
| 1595 | 1597 | return false; |
| 1596 | 1598 | }, |
| — | — | @@ -1620,13 +1622,13 @@ |
| 1621 | 1623 | // Append to the top level of model window: |
| 1622 | 1624 | _this.addResourceEditLoader( maxWidth ); |
| 1623 | 1625 | // update add media wizard title: |
| 1624 | | - var dialogTitle = gM( 'mwe-add_media_wizard' ) + ': ' + |
| | 1626 | + var dialogTitle = gM( 'mwe-add_media_wizard' ) + ': ' + |
| 1625 | 1627 | gM( 'rsd_resource_edit', resource.title ); |
| 1626 | 1628 | $j( _this.target_container ).dialog( 'option', 'title', dialogTitle ); |
| 1627 | 1629 | |
| 1628 | 1630 | mw.log( 'did append to: ' + _this.target_container ); |
| 1629 | 1631 | |
| 1630 | | - // Try and keep aspect ratio for the thumbnail that we clicked: |
| | 1632 | + // Try and keep aspect ratio for the thumbnail that we clicked: |
| 1631 | 1633 | var imageRatio = null; |
| 1632 | 1634 | try { |
| 1633 | 1635 | imageRatio = $j( rsdElement ).get(0).height / $j( rsdElement ).get(0).width; |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.BaseUploadInterface.js |
| — | — | @@ -1,5 +1,8 @@ |
| 2 | 2 | /** |
| 3 | | - * The base upload interface. |
| | 3 | + * The base upload interface. |
| | 4 | + * |
| | 5 | + * Progress bars for http-copy-by-url uploading. |
| | 6 | + * Ifame upload target |
| 4 | 7 | * |
| 5 | 8 | * This base upload class is optionally extended by Firefogg |
| 6 | 9 | * |
| — | — | @@ -152,6 +155,8 @@ |
| 153 | 156 | * |
| 154 | 157 | * When done detecting, or if detecting is unnecessary, it calls the callback |
| 155 | 158 | * with the upload mode as the first parameter. |
| | 159 | + * |
| | 160 | + * @param {Function} callback Function called once upload mode is detected |
| 156 | 161 | */ |
| 157 | 162 | detectUploadMode: function( callback ) { |
| 158 | 163 | var _this = this; |
| — | — | @@ -210,7 +215,7 @@ |
| 211 | 216 | }, |
| 212 | 217 | |
| 213 | 218 | /** |
| 214 | | - * Do an upload, with the mode given by this.upload_mode |
| | 219 | + * Do an upload, with the mode given by this.upload_mode |
| 215 | 220 | */ |
| 216 | 221 | doUpload: function() { |
| 217 | 222 | // Note "api" should be called "http_copy_upload" and /post/ should be "form_upload" |
| — | — | @@ -809,6 +814,7 @@ |
| 810 | 815 | /** |
| 811 | 816 | * Update the progress window to display a given message, with a given |
| 812 | 817 | * list of buttons below it. |
| | 818 | + * |
| 813 | 819 | * @param title_txt Plain text |
| 814 | 820 | * @param msg HTML |
| 815 | 821 | * @param buttons See http://docs.jquery.com/UI/Dialog#option-buttons |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/mw.EmbedPlayer.js |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | "mwe-ogg-player-selected" : "(selected)", |
| 62 | 62 | "mwe-ogg-player-omtkplayer" : "OMTK Flash Vorbis", |
| 63 | 63 | "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 \/>", |
| 64 | | - "mwe-for_best_experience" : "For a better video playback experience we recommend:<br \/><b><a href=\"http:\/\/www.mozilla.com\/en-US\/firefox\/upgrade.html?from=mwEmbed\">Firefox<\/a>.<\/b>", |
| | 64 | + "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>", |
| 65 | 65 | "mwe-do_not_warn_again" : "Dismiss for now.", |
| 66 | 66 | "mwe-playerSelect" : "Players", |
| 67 | 67 | "mwe-read_before_embed" : "<a href=\"http:\/\/mediawiki.org\/wiki\/Security_Notes_on_Remote_Embedding\" target=\"_new\">Read this<\/a> before embedding.", |
| — | — | @@ -560,7 +560,7 @@ |
| 561 | 561 | |
| 562 | 562 | // A provider "id" to idenfiy api request type |
| 563 | 563 | provider_type : null, |
| 564 | | - |
| | 564 | + |
| 565 | 565 | // The api url for the provider |
| 566 | 566 | provider_url : null, |
| 567 | 567 | |
| — | — | @@ -568,7 +568,7 @@ |
| 569 | 569 | * MediaSource constructor: |
| 570 | 570 | */ |
| 571 | 571 | init : function( element ) { |
| 572 | | - // mw.log('adding mediaSource: ' + element); |
| | 572 | + // mw.log('adding mediaSource: ' + element); |
| 573 | 573 | this.src = $j( element ).attr( 'src' ); |
| 574 | 574 | this.marked_default = false; |
| 575 | 575 | |
| — | — | @@ -590,8 +590,7 @@ |
| 591 | 591 | this[ attr ] = attr_value; |
| 592 | 592 | } |
| 593 | 593 | } |
| 594 | | - |
| 595 | | - |
| | 594 | + |
| 596 | 595 | if ( $j( element ).attr( 'type' ) ){ |
| 597 | 596 | this.mime_type = $j( element ).attr( 'type' ); |
| 598 | 597 | }else if ( $j( element ).attr( 'content-type' ) ){ |
| — | — | @@ -599,6 +598,7 @@ |
| 600 | 599 | }else{ |
| 601 | 600 | this.mime_type = this.detectType( this.src ); |
| 602 | 601 | } |
| | 602 | + |
| 603 | 603 | |
| 604 | 604 | // Check for parent elements ( supplies categories in "itext" ) |
| 605 | 605 | if( $j( element ).parent().attr('category') ){ |
| — | — | @@ -910,7 +910,8 @@ |
| 911 | 911 | // apply mime filter: |
| 912 | 912 | var source_set = new Array(); |
| 913 | 913 | for ( var i = 0; i < this.sources.length ; i++ ) { |
| 914 | | - if ( this.sources[i].mime_type.indexOf( mime_filter ) != -1 ) |
| | 914 | + if ( this.sources[i].mime_type && |
| | 915 | + this.sources[i].mime_type.indexOf( mime_filter ) != -1 ) |
| 915 | 916 | source_set.push( this.sources[i] ); |
| 916 | 917 | } |
| 917 | 918 | return source_set; |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/nativeEmbed.js |
| — | — | @@ -63,6 +63,7 @@ |
| 64 | 64 | 'style="width:' + this.width + 'px;height:' + this.height + 'px;" ' + |
| 65 | 65 | 'width="' + this.width + '" height="' + this.height + '" ' + |
| 66 | 66 | 'autobuffer="true" ' + |
| | 67 | + 'autoplay="true" ' + |
| 67 | 68 | 'src="' + this.getSrc() + '" >' + |
| 68 | 69 | '</video>'; |
| 69 | 70 | return eb; |
| Index: branches/js2-work/phase3/js/mwEmbed/mwEmbed.js |
| — | — | @@ -2461,9 +2461,9 @@ |
| 2462 | 2462 | "mwe-load-drag-item" : "Loading dragged item", |
| 2463 | 2463 | "mwe-ok" : "OK", |
| 2464 | 2464 | "mwe-cancel" : "Cancel", |
| 2465 | | - "mwe-enable-gadget" : "Enable mwEmbed gadgate for all pages", |
| 2466 | | - "mwe-enable-gadget-done" : "mwEmbed gadgate has been enabled", |
| 2467 | | - "mwe-must-login-gadget" : "To enable gadget you must <a href=\"$1\">login</a>" |
| | 2465 | + "mwe-enable-gadget" : "Enable mwEmbed gadget for all pages", |
| | 2466 | + "mwe-enable-gadget-done" : "mwEmbed gadget has been enabled", |
| | 2467 | + "mwe-must-login-gadget" : "To enable gadget you must <a target=\"_new\" href=\"$1\">login</a>" |
| 2468 | 2468 | } ); |
| 2469 | 2469 | |
| 2470 | 2470 | |
| Index: branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php |
| — | — | @@ -114,7 +114,7 @@ |
| 115 | 115 | /* |
| 116 | 116 | * Add a mw.loadDone class callback if there was no "error" in getting any of the classes |
| 117 | 117 | */ |
| 118 | | - if ( $this->error_msg == '' ){ |
| | 118 | + if ( $this->errorMsg == '' ){ |
| 119 | 119 | $this->jsout .= self::getOnDoneCallback( ); |
| 120 | 120 | } |
| 121 | 121 | |
| — | — | @@ -127,14 +127,14 @@ |
| 128 | 128 | if ( $wgUseFileCache && !$this->debug ) { |
| 129 | 129 | $status = $this->sFileCache->saveToFileCache( $this->jsout ); |
| 130 | 130 | if ( $status !== true ) |
| 131 | | - $this->error_msg .= $status; |
| | 131 | + $this->errorMsg .= $status; |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | // Check for an error msg |
| 135 | | - if ( $this->error_msg != '' ) { |
| | 135 | + if ( $this->errorMsg != '' ) { |
| 136 | 136 | //just set the content type (don't send cache header) |
| 137 | 137 | header( 'Content-Type: text/javascript' ); |
| 138 | | - echo 'alert(\'Error With ScriptLoader ::' . str_replace( "\n", '\'+"\n"+' . "\n'", $this->error_msg ) . '\');'; |
| | 138 | + echo 'alert(\'Error With ScriptLoader ::' . str_replace( "\n", '\'+"\n"+' . "\n'", $this->errorMsg ) . '\');'; |
| 139 | 139 | echo trim( $this->jsout ); |
| 140 | 140 | } else { |
| 141 | 141 | // All good, let's output "cache" headers |
| — | — | @@ -250,7 +250,7 @@ |
| 251 | 251 | } else { |
| 252 | 252 | // Make sure the wiki title ends with .js |
| 253 | 253 | if ( substr( $title_block, -3 ) != '.js' ) { |
| 254 | | - $this->error_msg .= 'WikiTitle includes should end with .js'; |
| | 254 | + $this->errorMsg .= 'WikiTitle includes should end with .js'; |
| 255 | 255 | return false; |
| 256 | 256 | } |
| 257 | 257 | // It's a wiki title, append the output of the wikitext: |
| — | — | @@ -270,11 +270,11 @@ |
| 271 | 271 | |
| 272 | 272 | // Check that the filename ends with .js and does not include ../ traversing |
| 273 | 273 | if ( substr( $file_name, -3 ) != '.js' ) { |
| 274 | | - $this->error_msg .= "\nError file name must end with .js: " . htmlspecialchars( $file_name ) . " \n "; |
| | 274 | + $this->errorMsg .= "\nError file name must end with .js: " . htmlspecialchars( $file_name ) . " \n "; |
| 275 | 275 | return false; |
| 276 | 276 | } |
| 277 | 277 | if ( strpos( $file_name, '../' ) !== false ) { |
| 278 | | - $this->error_msg .= "\nError file name must not traverse paths: " . htmlspecialchars( $file_name ) . " \n "; |
| | 278 | + $this->errorMsg .= "\nError file name must not traverse paths: " . htmlspecialchars( $file_name ) . " \n "; |
| 279 | 279 | return false; |
| 280 | 280 | } |
| 281 | 281 | |
| — | — | @@ -286,13 +286,13 @@ |
| 287 | 287 | if( $jsFileStr ){ |
| 288 | 288 | return $jsout . $jsFileStr; |
| 289 | 289 | }else{ |
| 290 | | - $this->error_msg .= "\nError could not read file: ". htmlspecialchars( $file_name ) ."\n"; |
| | 290 | + $this->errorMsg .= "\nError could not read file: ". htmlspecialchars( $file_name ) ."\n"; |
| 291 | 291 | return false; |
| 292 | 292 | } |
| 293 | 293 | } |
| 294 | 294 | } |
| 295 | 295 | // If we did not return some js |
| 296 | | - $this->error_msg .= "\nUnknown error\n"; |
| | 296 | + $this->errorMsg .= "\nUnknown error\n"; |
| 297 | 297 | return false; |
| 298 | 298 | } |
| 299 | 299 | /** |
| — | — | @@ -423,7 +423,7 @@ |
| 424 | 424 | |
| 425 | 425 | $jsFilePath = self::getJsPathFromClass( $reqClass ); |
| 426 | 426 | if(!$jsFilePath){ |
| 427 | | - $this->error_msg .= 'Requested class: ' . htmlspecialchars( $reqClass ) . ' not found' . "\n"; |
| | 427 | + $this->errorMsg .= 'Requested class: ' . htmlspecialchars( $reqClass ) . ' not found' . "\n"; |
| 428 | 428 | }else{ |
| 429 | 429 | $this->jsFileList[ $reqClass ] = $jsFilePath; |
| 430 | 430 | $this->requestKey .= $reqClass; |
| — | — | @@ -548,7 +548,7 @@ |
| 549 | 549 | } |
| 550 | 550 | |
| 551 | 551 | /** |
| 552 | | - * Retrieve the js file into a string, updates error_msg if not retrivable. |
| | 552 | + * Retrieve the js file into a string, updates errorMsg if not retrivable. |
| 553 | 553 | * |
| 554 | 554 | * @param {String} $filePath File to get |
| 555 | 555 | * @return {String} of the file contents |
| — | — | @@ -563,7 +563,7 @@ |
| 564 | 564 | |
| 565 | 565 | if ( $str === false ) { |
| 566 | 566 | // NOTE: check PHP error level. Don't want to expose paths if errors are hidden. |
| 567 | | - $this->error_msg .= 'Requested File: ' . htmlspecialchars( $IP.'/'.$filePath ) . ' could not be read' . "\n"; |
| | 567 | + $this->errorMsg .= 'Requested File: ' . htmlspecialchars( $IP.'/'.$filePath ) . ' could not be read' . "\n"; |
| 568 | 568 | return false; |
| 569 | 569 | } |
| 570 | 570 | return $str; |