WordPress.org

Make WordPress Core

Changeset 45082


Ignore:
Timestamp:
04/01/2019 12:23:54 PM (3 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/media.php

    r44785 r45082  
    28992899 */
    29002900function multisite_over_quota_message() {
    2901     echo '<p>' . sprintf( __( 'Sorry, you have used all of your storage quota of %s MB.' ), get_space_allowed() ) . '</p>';
     2901    echo '<p>' . sprintf(
     2902        /* translators: %s: allowed space allocation */
     2903        __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
     2904        size_format( get_space_allowed() * MB_IN_BYTES )
     2905    ) . '</p>';
    29022906}
    29032907
  • trunk/src/wp-admin/includes/ms-deprecated.php

    r40922 r45082  
    1717 */
    1818function wpmu_menu() {
    19     _deprecated_function(__FUNCTION__, '3.0.0' );
     19    _deprecated_function( __FUNCTION__, '3.0.0' );
    2020    // Deprecated. See #11763.
    2121}
     
    2828 */
    2929function wpmu_checkAvailableSpace() {
    30     _deprecated_function(__FUNCTION__, '3.0.0', 'is_upload_space_available()' );
     30    _deprecated_function( __FUNCTION__, '3.0.0', 'is_upload_space_available()' );
    3131
    32     if ( !is_upload_space_available() )
    33         wp_die( __('Sorry, you must delete files before you can upload any more.') );
     32    if ( ! is_upload_space_available() ) {
     33        wp_die( sprintf(
     34            /* translators: %s: allowed space allocation */
     35            __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
     36            size_format( get_space_allowed() * MB_IN_BYTES )
     37        ) );
     38    }
    3439}
    3540
     
    4045 */
    4146function mu_options( $options ) {
    42     _deprecated_function(__FUNCTION__, '3.0.0' );
     47    _deprecated_function( __FUNCTION__, '3.0.0' );
    4348    return $options;
    4449}
     
    5156 */
    5257function activate_sitewide_plugin() {
    53     _deprecated_function(__FUNCTION__, '3.0.0', 'activate_plugin()' );
     58    _deprecated_function( __FUNCTION__, '3.0.0', 'activate_plugin()' );
    5459    return false;
    5560}
     
    6267 */
    6368function deactivate_sitewide_plugin( $plugin = false ) {
    64     _deprecated_function(__FUNCTION__, '3.0.0', 'deactivate_plugin()' );
     69    _deprecated_function( __FUNCTION__, '3.0.0', 'deactivate_plugin()' );
    6570}
    6671
     
    7277 */
    7378function is_wpmu_sitewide_plugin( $file ) {
    74     _deprecated_function(__FUNCTION__, '3.0.0', 'is_network_only_plugin()' );
     79    _deprecated_function( __FUNCTION__, '3.0.0', 'is_network_only_plugin()' );
    7580    return is_network_only_plugin( $file );
    7681}
  • trunk/src/wp-admin/includes/ms.php

    r44905 r45082  
    227227    if ( ( $space_allowed - $space_used ) < 0 ) {
    228228        if ( $echo ) {
    229             _e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' );
     229            printf(
     230                /* translators: %s: allowed space allocation */
     231                __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
     232                size_format( $space_allowed * MB_IN_BYTES )
     233            );
    230234        }
    231235        return true;
     
    10031007
    10041008    submit_button( __( 'Confirm Deletion' ), 'primary' );
    1005     ?>
     1009?>
    10061010    </form>
    10071011    <?php
  • trunk/src/wp-includes/class-wp-xmlrpc-server.php

    r44566 r45082  
    62356235
    62366236        if ( is_multisite() && upload_is_user_over_quota( false ) ) {
    6237             $this->error = new IXR_Error( 401, __( 'Sorry, you have used your space allocation.' ) );
     6237            $this->error = new IXR_Error(
     6238                401,
     6239                sprintf(
     6240                    /* translators: %s: allowed space allocation */
     6241                    __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
     6242                    size_format( get_space_allowed() * MB_IN_BYTES )
     6243                )
     6244            );
    62386245            return $this->error;
    62396246        }
Note: See TracChangeset for help on using the changeset viewer.