Changeset 22516

Timestamp:

11/10/2012 12:37:13 AM (13 years ago)

Author:

koopersmith

Message:

Media: Relocate localization to wp_enqueue_media(). see #22186, #21390.

Location:

trunk/wp-includes

Files:

• media.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/media.php

@@ -1298 +1298 @@
  */
 function wp_enqueue_media() {
+    wp_localize_script( 'media-views', '_wpMediaViewsL10n', array(
+        // Generic
+        'insertMedia' => __( 'Insert Media' ),
+        'search'      => __( 'Search' ),
+        'select'      => __( 'Select' ),
+        'cancel'      => __( 'Cancel' ),
+        'addImages'   => __( 'Add images' ),
+        'selected'    => __( 'selected' ),
+
+        // Upload
+        'uploadFilesTitle'  => __( 'Upload Files' ),
+        'selectFiles'       => __( 'Select files' ),
+        'uploadImagesTitle' => __( 'Upload Images' ),
+
+        // Library
+        'mediaLibraryTitle' => __( 'Media Library' ),
+        'createNewGallery'  => __( 'Create a new gallery' ),
+        'insertIntoPost'    => __( 'Insert into post' ),
+
+        // Embed
+        'embedFromUrlTitle' => __( 'Embed From URL' ),
+
+        // Batch
+        'batchInsert'      => __( 'Batch insert' ),
+        'cancelBatchTitle' => __( '← Cancel Batch' ),
+        'editBatchTitle'   => __( 'Edit Batch' ),
+        'addToBatch'       => __( 'Add to batch' ),
+
+        // Gallery
+        'createGalleryTitle' => __( 'Create Gallery' ),
+        'editGalleryTitle'   => __( 'Edit Gallery' ),
+        'cancelGalleryTitle' => __( '← Cancel Gallery' ),
+        'insertGallery'      => __( 'Insert gallery' ),
+        'updateGallery'      => __( 'Update gallery' ),
+        'continueEditing'    => __( 'Continue editing' ),
+        'addToGallery'       => __( 'Add to gallery' ),
+    ) );
+
     wp_enqueue_script( 'media-upload' );
     wp_enqueue_style( 'media-views' );

trunk/wp-includes/script-loader.php

@@ -325 +325 @@
 
     $scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'media-models', 'wp-plupload' ), false, 1 );
-    did_action( 'init' ) && $scripts->localize( 'media-views', '_wpMediaViewsL10n', array(
-        // Generic
-        'insertMedia' => __( 'Insert Media' ),
-        'search'      => __( 'Search' ),
-        'select'      => __( 'Select' ),
-        'cancel'      => __( 'Cancel' ),
-        'addImages'   => __( 'Add images' ),
-        'selected'    => __( 'selected' ),
-
-        // Upload
-        'uploadFilesTitle'  => __( 'Upload Files' ),
-        'selectFiles'       => __( 'Select files' ),
-        'uploadImagesTitle' => __( 'Upload Images' ),
-
-        // Library
-        'mediaLibraryTitle' => __( 'Media Library' ),
-        'createNewGallery'  => __( 'Create a new gallery' ),
-        'insertIntoPost'    => __( 'Insert into post' ),
-
-        // Embed
-        'embedFromUrlTitle' => __( 'Embed From URL' ),
-
-        // Batch
-        'batchInsert'      => __( 'Batch insert' ),
-        'cancelBatchTitle' => __( '← Cancel Batch' ),
-        'editBatchTitle'   => __( 'Edit Batch' ),
-        'addToBatch'       => __( 'Add to batch' ),
-
-        // Gallery
-        'createGalleryTitle' => __( 'Create Gallery' ),
-        'editGalleryTitle'   => __( 'Edit Gallery' ),
-        'cancelGalleryTitle' => __( '← Cancel Gallery' ),
-        'insertGallery'      => __( 'Insert gallery' ),
-        'updateGallery'      => __( 'Update gallery' ),
-        'continueEditing'    => __( 'Continue editing' ),
-        'addToGallery'       => __( 'Add to gallery' ),
-    ) );
-
     $scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
     $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models' ), false, 1 );