r61486 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r61485‎ | r61486 | r61487 >
Date:12:44, 25 January 2010
Author:dale
Status:deferred
Tags:
Comment:
* added one click opt-in button for mwEmbed gadget for use with "withJS" param
* updated language files
Modified paths:
  • /branches/js2-work/phase3/js/mwEmbed/includes/languages/mwEmbed.i18n.php (modified) (history)
  • /branches/js2-work/phase3/js/mwEmbed/includes/maintenance/mergeJavascriptMsg.php (modified) (history)
  • /branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/loader.js (modified) (history)
  • /branches/js2-work/phase3/js/mwEmbed/mwEmbed.js (modified) (history)
  • /branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js (modified) (history)

Diff [purge]

Index: branches/js2-work/phase3/js/mwEmbed/includes/maintenance/mergeJavascriptMsg.php
——@@ -92,7 +92,7 @@
9393
9494 $objects = new RecursiveIteratorIterator( new RecursiveDirectoryIterator( $path ), RecursiveIteratorIterator::SELF_FIRST );
9595 foreach ( $objects as $fname => $object ) {
96 - if ( substr( $fname, - 3 ) == '.js' ) {
 96+ if ( substr( $fname, - 3 ) == '.js' && strpos( $fname, '/cache/' ) === false ) {
9797 $jsFileText = file_get_contents( $fname );
9898 $mwPos = strpos( $fname, 'mwEmbed' ) + 7;
9999 $curFileName = substr( $fname, $mwPos );
Index: branches/js2-work/phase3/js/mwEmbed/includes/languages/mwEmbed.i18n.php
——@@ -12,23 +12,64 @@
1313
1414 $messages['en'] = array(
1515 /*
16 - * js file: /skins/kskin/kskinConfig.js
 16+ * js file: /modules/EmbedPlayer/mw.EmbedPlayer.js
1717 */
18 - 'mwe-credit-title' => 'Title: $1',
19 - 'mwe-kaltura-platform-title' => 'Kaltura open source video platform',
 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',
2072
2173 /*
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 - /*
3374 * js file: /modules/Sequencer/mw.Sequencer.js
3475 */
3576 'mwe-menu_clipedit' => 'Edit media',
——@@ -67,22 +108,63 @@
68109 '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>).',
69110
70111 /*
 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+ /*
71123 * js file: /modules/Sequencer/remotes/RemoteMwSequencer.js
72124 */
73125 'mwe-no-sequence-create' => 'No sequence exists named $1, You can $2',
74126 'mwe-sequence-create-one' => 'start a sequence',
75127
76128 /*
77 - * js file: /modules/TimedText/old_mvTimeTextEdit.js
 129+ * js file: /modules/ClipEdit/mw.ClipEdit.js
78130 */
79 - 'mwe-upload-subs-file' => 'Upload subtitle',
80 - 'mwe-add-subs-file-title' => 'Select subtitle to upload',
81 - 'mwe-error-only-srt' => 'You can only upload srt files.',
82 - 'mwe-watch-video' => 'Watch video',
83 - 'mwe-select-other-language' => 'Select another language',
84 - 'mwe-saving' => 'saving...',
 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',
85157
86158 /*
 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+ /*
87169 * js file: /modules/TimedText/mw.TimedTextEdit.js
88170 */
89171 'mew-timedtext-editor' => 'Timed text editor',
——@@ -135,75 +217,85 @@
136218 'mwe-textcat-cue' => 'Cue points',
137219
138220 /*
 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+ /*
139231 * js file: /modules/TimedText/remotes/RemoteMwTimedText.js
140232 */
141233 'mwe-language-subtitles-for-clip' => '$1 subtitles for clip: $2',
142234 'mwe-language-no-subtitles-for-clip' => 'No $1 subtitles where found for clip: $2',
143235
144236 /*
145 - * js file: /modules/EmbedPlayer/mw.EmbedPlayer.js
 237+ * js file: /modules/AddMedia/mw.RemoteSearchDriver.js
146238 */
147 - 'mwe-loading_plugin' => 'loading plugin ...',
148 - 'mwe-select_playback' => 'Set playback preference',
149 - 'mwe-link_back' => 'Link back',
150 - 'mwe-error_swap_vid' => 'Error: mwEmbed was unable to swap the video tag for the mwEmbed interface',
151 - 'mwe-add_to_end_of_sequence' => 'Add to end of sequence',
152 - 'mwe-missing_video_stream' => 'The video file for this stream is missing',
153 - 'mwe-play_clip' => 'Play clip',
154 - 'mwe-pause_clip' => 'Pause clip',
155 - 'mwe-volume_control' => 'Volume control',
156 - 'mwe-player_options' => 'Player options',
157 - 'mwe-timed_text' => 'Timed text',
158 - 'mwe-player_fullscreen' => 'Fullscreen',
159 - 'mwe-next_clip_msg' => 'Play next clip',
160 - 'mwe-prev_clip_msg' => 'Play previous clip',
161 - 'mwe-current_clip_msg' => 'Continue playing this clip',
162 - 'mwe-seek_to' => 'Seek $1',
163 - 'mwe-paused' => 'paused',
164 - 'mwe-download_segment' => 'Download selection:',
165 - 'mwe-download_full' => 'Download full video file:',
166 - 'mwe-download_right_click' => 'To download, right click and select <i>Save link as...</i>',
167 - 'mwe-download_clip' => 'Download video',
168 - 'mwe-download_text' => 'Download text (<a style="color:white" title="cmml" href="http://wiki.xiph.org/index.php/CMML">CMML</a> xml):',
169 - 'mwe-download' => 'Download',
170 - 'mwe-share' => 'Share',
171 - 'mwe-credits' => 'Credits',
172 - 'mwe-clip_linkback' => 'Clip source page',
173 - 'mwe-chose_player' => 'Choose video player',
174 - 'mwe-share_this_video' => 'Share this video',
175 - 'mwe-video_credits' => 'Video credits',
176 - 'mwe-menu_btn' => 'Menu',
177 - 'mwe-close_btn' => 'Close',
178 - 'mwe-ogg-player-vlc-player' => 'VLC player',
179 - 'mwe-ogg-player-videoElement' => 'Native Ogg video',
180 - 'mwe-ogg-player-oggPlugin' => 'Generic Ogg plugin',
181 - 'mwe-ogg-player-quicktime-mozilla' => 'QuickTime plugin',
182 - 'mwe-ogg-player-quicktime-activex' => 'QuickTime ActiveX',
183 - 'mwe-ogg-player-cortado' => 'Java Cortado',
184 - 'mwe-ogg-player-flowplayer' => 'Flowplayer',
185 - 'mwe-ogg-player-kplayer' => 'Kaltura player',
186 - 'mwe-ogg-player-selected' => '(selected)',
187 - 'mwe-ogg-player-omtkplayer' => 'OMTK Flash Vorbis',
188 - '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 />',
189 - '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 3.5</a>.</b>',
190 - 'mwe-do_not_warn_again' => 'Dismiss for now.',
191 - 'mwe-playerSelect' => 'Players',
192 - 'mwe-read_before_embed' => '<a href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding" target="_new">Read this</a> before embedding.',
193 - 'mwe-embed_site_or_blog' => 'Embed on a page',
194 - 'mwe-related_videos' => 'Related videos',
195 - 'mwe-seeking' => 'seeking',
196 - 'mwe-copy-code' => 'Copy code',
197 - 'mwe-video-h264' => 'H.264 video',
198 - 'mwe-video-flv' => 'Flash video',
199 - 'mwe-video-ogg' => 'Ogg video',
200 - 'mwe-video-audio' => 'Ogg audio',
 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',
201298
202299 /*
203 - * js file: /modules/AddMedia/loader.js
204 - */
205 - 'mwe-loading-add-media-wiz' => 'Loading add media wizard',
206 -
207 - /*
208300 * js file: /modules/AddMedia/mw.BaseUploadInterface.js
209301 */
210302 'mwe-upload-transcode-in-progress' => 'Transcode and upload in progress (do not close this window)',
——@@ -230,6 +322,56 @@
231323 '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>).',
232324
233325 /*
 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+ /*
234376 * js file: /modules/AddMedia/mw.FirefoggGUI.js
235377 */
236378 'fogg-help-sticky' => 'Help (click to stick)',
——@@ -296,159 +438,11 @@
297439 'fogg-contact-help' => 'Contact link',
298440
299441 /*
300 - * js file: /modules/AddMedia/searchLibs/metavidSearch.js
 442+ * js file: /modules/AddMedia/loader.js
301443 */
302 - 'mwe-stream_title' => '$1 $2 to $3',
 444+ 'mwe-loading-add-media-wiz' => 'Loading add media wizard',
303445
304446 /*
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 licencing 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_local_resource_title' => 'Local resource title',
342 - 'rsd_do_insert' => 'Do insert',
343 - 'mwe-cc_title' => 'Creative Commons',
344 - 'mwe-cc_by_title' => 'Attribution',
345 - 'mwe-cc_nc_title' => 'Noncommercial',
346 - 'mwe-cc_nd_title' => 'No Derivative Works',
347 - 'mwe-cc_sa_title' => 'Share Alike',
348 - 'mwe-cc_pd_title' => 'Public Domain',
349 - 'mwe-unknown_license' => 'Unknown license',
350 - '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>',
351 - 'mwe-results_from' => 'Results from <a href="$1" target="_new" >$2</a>',
352 - 'mwe-missing_desc_see_source' => 'This asset is missing a description. Please see the [$1 original source] and help describe it.',
353 - 'rsd_config_error' => 'Add media wizard configuration error: $1',
354 - 'mwe-your_recent_uploads' => 'Your recent uploads to $1',
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-cancel_import' => 'Cancel import',
363 - 'mwe-importing_asset' => 'Importing asset',
364 - 'mwe-preview_insert_resource' => 'Preview insert of resource: $1',
365 - 'mwe-checking-resource' => 'Checking for resource',
366 - 'mwe-resource-needs-import' => 'Resource $1 needs to be imported to $2',
367 - 'mwe-ftype-svg' => 'SVG vector file',
368 - 'mwe-ftype-jpg' => 'JPEG image file',
369 - 'mwe-ftype-png' => 'PNG image file',
370 - 'mwe-ftype-oga' => 'Ogg audio file',
371 - 'mwe-ftype-ogg' => 'Ogg video file',
372 - 'mwe-ftype-unk' => 'Unknown file format',
373 - 'rsd-wiki_commons-title' => 'Wikimedia Commons',
374 - 'rsd-wiki_commons' => 'Wikimedia Commons, an archive of freely-licensed educational media content (images, sound and video clips)',
375 - 'rsd-kaltura-title' => 'All Sources',
376 - 'rsd-kaltura' => 'Kaltura agragated search for free-licenced media across multiple search providers',
377 - 'rsd-this_wiki-title' => 'This wiki',
378 - 'rsd-this_wiki-desc' => 'The local wiki install',
379 - 'rsd-archive_org-title' => 'Archive.org',
380 - 'rsd-archive_org-desc' => 'The Internet Archive, a digital library of cultural artifacts',
381 - 'rsd-flickr-title' => 'Flickr.com',
382 - 'rsd-flickr-desc' => 'Flickr.com, a online photo sharing site',
383 - 'rsd-metavid-title' => 'Metavid.org',
384 - 'rsd-metavid-desc' => 'Metavid.org, a community archive of US House and Senate floor proceedings',
385 - 'rsd-search-timeout' => 'The search request did not complete. The server may be down experiencing heavy load. You can try again later',
386 -
387 - /*
388 - * js file: /modules/AddMedia/mw.Firefogg.js
389 - */
390 - 'fogg-select_file' => 'Select file',
391 - 'fogg-select_new_file' => 'Select new file',
392 - 'fogg-select_url' => 'Select URL',
393 - 'fogg-save_local_file' => 'Save Ogg',
394 - 'fogg-check_for_firefogg' => 'Checking for Firefogg...',
395 - 'fogg-installed' => 'Firefogg is installed',
396 - 'fogg-for_improved_uploads' => 'For improved uploads:',
397 - 'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about Firefogg</a>.',
398 - '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>',
399 - 'fogg-passthrough_mode' => 'Your selected file is already Ogg or not a video file',
400 - 'fogg-transcoding' => 'Encoding video to Ogg...',
401 - 'fogg-encoding-done' => 'Encoding complete',
402 - 'fogg-badtoken' => 'Token is not valid',
403 - 'fogg-preview' => 'Preview video',
404 - 'fogg-hidepreview' => 'Hide preview',
405 -
406 - /*
407 - * js file: /modules/AddMedia/jquery.dragDropFile.js
408 - */
409 - 'mwe-upload-multi' => 'Upload {{PLURAL:$1|file|files}}',
410 - 'mwe-review-upload' => 'Review file {{PLURAL:$1|upload|uploads}}',
411 -
412 - /*
413 - * js file: /modules/ClipEdit/mw.ClipEdit.js
414 - */
415 - 'mwe-crop' => 'Crop image',
416 - 'mwe-apply_crop' => 'Apply crop to image',
417 - 'mwe-reset_crop' => 'Reset crop',
418 - 'mwe-insert_image_page' => 'Insert into page',
419 - 'mwe-insert_into_sequence' => 'Insert into sequence',
420 - 'mwe-preview_insert' => 'Preview insert',
421 - 'mwe-cancel_image_insert' => 'Cancel insert',
422 - 'mwe-sc_attributes' => 'Clip detail edit',
423 - 'mwe-sc_inoutpoints' => 'Set in-out points',
424 - 'mwe-sc_overlays' => 'Overlays',
425 - 'mwe-sc_audio' => 'Audio control',
426 - 'mwe-sc_duration' => 'Duration',
427 - 'mwe-template_properties' => 'Template properties',
428 - 'mwe-custom_title' => 'Custom title',
429 - 'mwe-edit_properties' => 'Edit properties',
430 - 'mwe-other_properties' => 'Other properties',
431 - 'mwe-resource_page' => 'Resource page:',
432 - 'mwe-set_in_out_points' => 'Set in-out points',
433 - 'mwe-start_time' => 'Start time',
434 - 'mwe-end_time' => 'End time',
435 - 'mwe-preview_inout' => 'Preview in-out points',
436 - 'mwe-edit-tools' => 'Edit tools',
437 - 'mwe-inline-description' => 'Caption',
438 - 'mwe-edit-video-tools' => 'Edit video tools:',
439 - 'mwe-duration' => 'Duration:',
440 - 'mwe-layout' => 'Layout',
441 -
442 - /*
443 - * js file: /modules/ApiProxy/mw.proxy.js
444 - */
445 - 'mwe-setting-up-proxy' => 'Setting up proxy...',
446 - 'mwe-re-try' => 'Retry API request',
447 - 'mwe-re-trying' => 'Retrying API request...',
448 - 'mwe-proxy-not-ready' => 'Proxy is not configured',
449 - '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.',
450 - 'mwe-remember-loging' => 'General security reminder: Only login to web sites when your address bar displays that site\'s address.',
451 -
452 - /*
453447 * js file: /mwEmbed.js
454448 */
455449 'mwe-loading_txt' => 'Loading ...',
——@@ -461,8 +455,17 @@
462456 'mwe-load-drag-item' => 'Loading dragged item',
463457 'mwe-ok' => 'OK',
464458 '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>',
465462
466463 /*
 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+ /*
467470 * js file: /tests/testLang.js
468471 */
469472 'undelete_short' => 'Undelete {{PLURAL:$1|one edit|$1 edits}}',
Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/loader.js
——@@ -23,7 +23,7 @@
2424 "flickrSearch" : "modules/AddMedia/searchLibs/flickrSearch.js",
2525 "baseRemoteSearch" : "modules/AddMedia/searchLibs/baseRemoteSearch.js",
2626 "kalturaSearch" : "modules/AddMedia/searchLibs/kalturaSearch.js"
27 -});
 27+});
2828
2929 /**
3030 * Note: We should move relevant parts of these style sheets to the addMedia/css folder
Index: branches/js2-work/phase3/js/mwEmbed/mwEmbed.js
——@@ -2460,7 +2460,10 @@
24612461 "mwe-apiproxy-setup" : "Setting up API proxy",
24622462 "mwe-load-drag-item" : "Loading dragged item",
24632463 "mwe-ok" : "OK",
2464 - "mwe-cancel" : "Cancel"
 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>"
24652468 } );
24662469
24672470
Index: branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js
——@@ -4,9 +4,14 @@
55 */
66 var urlparts = getRemoteEmbedPath();
77 var mwEmbedHostPath = urlparts[0];
8 -var mwRemoteVersion = 'r77';
 8+var mwRemoteVersion = 'r80';
99 var mwUseScriptLoader = true;
1010
 11+//Log the mwRemote version ( will determin what version of js we get )
 12+if( window.console ){
 13+ window.console.log( 'mwEmbed:remote:' + mwRemoteVersion );
 14+}
 15+
1116 // Setup up request Params:
1217 var reqParts = urlparts[1].substring( 1 ).split( '&' );
1318 var mwReqParam = { };
——@@ -31,10 +36,11 @@
3237 if( !ranRewrites){
3338 var ranRewrites = 'none';
3439 }
35 -function doPageSpecificRewrite() {
 40+function doPageSpecificRewrite() {
3641 if( ranRewrites != 'none')
3742 return ;
38 - ranRewrites = 'done';
 43+ ranRewrites = 'done';
 44+
3945 // Add media wizard
4046 if ( wgAction == 'edit' || wgAction == 'submit' ) {
4147 loadMwEmbed( [
——@@ -321,12 +327,16 @@
322328 // Inject mwEmbed if needed
323329 if ( typeof MW_EMBED_VERSION == 'undefined' ) {
324330 if ( ( mwReqParam['uselang'] || mwReqParam[ 'useloader' ] ) && mwUseScriptLoader ) {
325 - var rurl = mwEmbedHostPath + '/mwEmbed/jsScriptLoader.php?class=mwEmbed';
 331+ var rurl = mwEmbedHostPath + '/mwEmbed/jsScriptLoader.php?class=';
326332
 333+ var coma = '';
327334 // Add jQuery too if we need it:
328335 if ( typeof window.jQuery == 'undefined' ) {
329 - rurl += ',window.jQuery';
 336+ rurl += 'window.jQuery';
 337+ coma = ',';
330338 }
 339+ // Add Core mwEmbed lib:
 340+ rurl += coma + 'mwEmbed';
331341
332342 // Add scriptLoader requested classSet
333343 for( var i=0; i < classSet.length; i++ ){
——@@ -360,10 +370,129 @@
361371 // Make sure mwEmbed is "setup" by using the addOnLoadHook:
362372 mw.ready( function(){
363373 callback();
 374+
 375+ // All enabled pages should check if we have the gadget already installed
 376+ // if not offer a convenient drop down
 377+ mwCheckForGadget();
364378 })
365379 }
366380 }
367381 /**
 382+ * checks if the gadget is installed
 383+ * run after mwEmbed setup so $j and mw interface is available:
 384+ */
 385+function mwCheckForGadget(){
 386+ scripts = document.getElementsByTagName( 'script' );
 387+ for( var i = 0 ; i < scripts.length ; i ++){
 388+ if ( scripts[i].src &&
 389+ scripts[i].src.indexOf( 'MediaWiki:Gadget-mwEmbed.js' ) !== -1){
 390+ mw.log('gadget already installed');
 391+ //gadget found / enabled
 392+ return true;
 393+ }
 394+ }
 395+ // No gadget found load jQuery if we don't have it
 396+ mw.log('gadget not installed, show install menu');
 397+ var $gadgetBtn = $j.button({
 398+ 'text' : gM( 'mwe-enable-gadget' ),
 399+ 'icon_id': 'check'
 400+ })
 401+ .css({
 402+ 'font-size': '90%'
 403+ })
 404+ .buttonHover()
 405+ .click(function (){
 406+ if( !wgUserName ){
 407+ $j( this )
 408+ .after( gM('mwe-must-login-gadget',
 409+ wgArticlePath.replace(
 410+ '$1', 'Special:UserLogin?returnto=' + wgPageName ) )
 411+ )
 412+ .remove();
 413+ return ;
 414+ }
 415+
 416+ // Else Add loader
 417+ $j( this )
 418+ .after(
 419+ $j('<div />')
 420+ .attr( 'id', 'gadget-form-loader' )
 421+ .loadingSpinner()
 422+ )
 423+ .remove();
 424+ // Load gadgets form:
 425+ mwSubmitgadgetPref( 'mwEmbed' );
 426+ } );
 427+
 428+ // Add the $gadgetBtn before the first heading:
 429+ $j('#firstHeading').before(
 430+ $j('<div />')
 431+ .css({
 432+ 'margin': '5px'
 433+ }).html(
 434+ $gadgetBtn
 435+ )
 436+ );
 437+}
 438+function mwSubmitgadgetPref( gadget_id ){
 439+ $j.get( wgArticlePath.replace('$1', 'Special:Preferences'), function( pageHTML ){
 440+ // get the form
 441+ var form = mwGetFormFromPage ( pageHTML );
 442+ if(!form){
 443+ return false;
 444+ }
 445+ if( mwCheckFormDatagadget( form.data, gadget_id ) ){
 446+ mw.log( gaget_id + ' is already enabled' );
 447+ return false;
 448+ }
 449+
 450+ // add mwEmbed to the formData
 451+ form.data.push( {
 452+ 'name' : 'wpgadgets[]',
 453+ 'value' : gadget_id
 454+ } );
 455+
 456+ // Submit the prefrences
 457+ $j.post( form.url, form.data, function( pageHTML ){
 458+ var form = mwGetFormFromPage ( pageHTML );
 459+ if(!form){
 460+ return false;
 461+ }
 462+ if( mwCheckFormDatagadget(form.data, gadget_id ) ){
 463+ //update the loader
 464+ $j('#gadget-form-loader')
 465+ .text( gM( 'mwe-enable-gadget-done' ) );
 466+ }
 467+ } )
 468+ })
 469+}
 470+function mwGetFormFromPage( pageHTML ){
 471+ var form = {};
 472+ $j( pageHTML ).find('form').each( function( ){
 473+ form.url = $j( this ).attr('action');
 474+ if( form.url.indexOf( 'Special:Preferences') !== -1 ){
 475+ form.data = $j( this ).serializeArray();
 476+ // break out of loop
 477+ return false;
 478+ }
 479+ });
 480+ if( form.data )
 481+ return form;
 482+ mw.log("Error: could not get form data");
 483+ return false;
 484+}
 485+function mwCheckFormDatagadget( formData, gadget_id ){
 486+ for(var i =0; i < formData.length ; i ++ ){
 487+ if( formData[i].name == 'wpgadgets[]' ){
 488+ if( formData[i].value == gadget_id ){
 489+ return true;
 490+ }
 491+ }
 492+ }
 493+ return false;
 494+}
 495+
 496+/**
368497 * Checks an object path to see if its defined
369498 * @param {String} libVar The objectPath to be checked
370499 */

Status & tagging log