Changeset 45082

Timestamp:

04/01/2019 12:23:54 PM (8 years ago)

Author:

SergeyBiryukov

Message:

I18N: Merge similar strings about allowed space allocation in Multisite.

Props ramiy, Jonathandejong, pento.
Fixes #42223.

Location:

trunk/src

Files:

• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/includes/ms-deprecated.php (modified) (6 diffs)
• wp-admin/includes/ms.php (modified) (2 diffs)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)

trunk/src/wp-admin/includes/media.php

@@ -2899 +2899 @@
  */
 function multisite_over_quota_message() {
-        echo '<p>' . sprintf( __( 'Sorry, you have used all of your storage quota of %s MB.' ), get_space_allowed() ) . '</p>';
+        echo '<p>' . sprintf(
+                /* translators: %s: allowed space allocation */
+                __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
+                size_format( get_space_allowed() * MB_IN_BYTES )
+        ) . '</p>';
 }
 

trunk/src/wp-admin/includes/ms-deprecated.php

@@ -17 +17 @@
  */
 function wpmu_menu() {
-        _deprecated_function(__FUNCTION__, '3.0.0' );
+        _deprecated_function( __FUNCTION__, '3.0.0' );
         // Deprecated. See #11763.
 }
@@ -28 +28 @@
  */
 function wpmu_checkAvailableSpace() {
-        _deprecated_function(__FUNCTION__, '3.0.0', 'is_upload_space_available()' );
+        _deprecated_function( __FUNCTION__, '3.0.0', 'is_upload_space_available()' );
 
-        if ( !is_upload_space_available() )
-                wp_die( __('Sorry, you must delete files before you can upload any more.') );
+        if ( ! is_upload_space_available() ) {
+                wp_die( sprintf(
+                        /* translators: %s: allowed space allocation */
+                        __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
+                        size_format( get_space_allowed() * MB_IN_BYTES )
+                ) );
+        }
 }
 
@@ -40 +45 @@
  */
 function mu_options( $options ) {
-        _deprecated_function(__FUNCTION__, '3.0.0' );
+        _deprecated_function( __FUNCTION__, '3.0.0' );
         return $options;
 }
@@ -51 +56 @@
  */
 function activate_sitewide_plugin() {
-        _deprecated_function(__FUNCTION__, '3.0.0', 'activate_plugin()' );
+        _deprecated_function( __FUNCTION__, '3.0.0', 'activate_plugin()' );
         return false;
 }
@@ -62 +67 @@
  */
 function deactivate_sitewide_plugin( $plugin = false ) {
-        _deprecated_function(__FUNCTION__, '3.0.0', 'deactivate_plugin()' );
+        _deprecated_function( __FUNCTION__, '3.0.0', 'deactivate_plugin()' );
 }
 
@@ -72 +77 @@
  */
 function is_wpmu_sitewide_plugin( $file ) {
-        _deprecated_function(__FUNCTION__, '3.0.0', 'is_network_only_plugin()' );
+        _deprecated_function( __FUNCTION__, '3.0.0', 'is_network_only_plugin()' );
         return is_network_only_plugin( $file );
 }

trunk/src/wp-admin/includes/ms.php

@@ -227 +227 @@
         if ( ( $space_allowed - $space_used ) < 0 ) {
                 if ( $echo ) {
-                        _e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' );
+                        printf(
+                                /* translators: %s: allowed space allocation */
+                                __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
+                                size_format( $space_allowed * MB_IN_BYTES )
+                        );
                 }
                 return true;
@@ -1003 +1007 @@
 
         submit_button( __( 'Confirm Deletion' ), 'primary' );
-        ?>
+?>
         </form>
         <?php

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -6235 +6235 @@
 
                 if ( is_multisite() && upload_is_user_over_quota( false ) ) {
-                        $this->error = new IXR_Error( 401, __( 'Sorry, you have used your space allocation.' ) );
+                        $this->error = new IXR_Error(
+                                401,
+                                sprintf(
+                                        /* translators: %s: allowed space allocation */
+                                        __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
+                                        size_format( get_space_allowed() * MB_IN_BYTES )
+                                )
+                        );
                         return $this->error;
                 }