WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

I18n: Add more context to the overall use of `none` in translatable strings. 

Because `none` doesn't convey the same meaning all the time.

Props tobifjellner, audrasjb, SergeyBiryukov, shailu25.
Fixes #50087.



Built from https://develop.svn.wordpress.org/trunk@58284


git-svn-id: http://core.svn.wordpress.org/trunk@57744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
audrasjb 2024-06-02 21:07:13 +00:00
parent 21978f3c31
commit d4ce786b2e
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/meta-boxes.php
View File

@ -1354,7 +1354,7 @@ function link_xfn_meta_box( $link ) {
<input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check( 'friendship', 'friend' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'friend' ); ?> <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check( 'friendship', 'friend' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'friend' ); ?>
</label> </label>
<label for="friendship"> <label for="friendship">
<input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check( 'friendship' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'none' ); ?> <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check( 'friendship' ); ?> />&nbsp;<?php /* translators: xfn (friendship relation): http://gmpg.org/xfn/ */ _x( 'none', 'Type of relation' ); ?>
</label> </label>
</fieldset></td> </fieldset></td>
</tr> </tr>
@ -1405,7 +1405,7 @@ function link_xfn_meta_box( $link ) {
<input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check( 'geographical', 'neighbor' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'neighbor' ); ?> <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check( 'geographical', 'neighbor' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'neighbor' ); ?>
</label> </label>
<label for="geographical"> <label for="geographical">
<input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check( 'geographical' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'none' ); ?> <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check( 'geographical' ); ?> />&nbsp;<?php /* translators: xfn (geographical relation): http://gmpg.org/xfn/ */ _x( 'none', 'Type of relation' ); ?>
</label> </label>
</fieldset></td> </fieldset></td>
</tr> </tr>
@ -1434,7 +1434,7 @@ function link_xfn_meta_box( $link ) {
<input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check( 'family', 'spouse' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'spouse' ); ?> <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check( 'family', 'spouse' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'spouse' ); ?>
</label> </label>
<label for="family"> <label for="family">
<input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check( 'family' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'none' ); ?> <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check( 'family' ); ?> />&nbsp;<?php /* translators: xfn (family relation): http://gmpg.org/xfn/ */ _x( 'none', 'Type of relation' ); ?>
</label> </label>
</fieldset></td> </fieldset></td>
</tr> </tr>

2
wp-includes/deprecated.php
View File

@ -705,7 +705,7 @@ function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = '
$show_option_none = ''; $show_option_none = '';
if ( $optionnone ) if ( $optionnone )
$show_option_none = __('None'); $show_option_none = _x( 'None', 'Categories dropdown (show_option_none parameter)' );
$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order', $vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
'show_last_update', 'show_count', 'hide_empty', 'selected', 'exclude'); 'show_last_update', 'show_count', 'hide_empty', 'selected', 'exclude');

18
wp-includes/media-template.php
View File

@ -840,7 +840,7 @@ function wp_print_media_templates() {
<?php esc_html_e( 'Right' ); ?> <?php esc_html_e( 'Right' ); ?>
</option> </option>
<option value="none" selected> <option value="none" selected>
<?php esc_html_e( 'None' ); ?> <?php esc_html_x( 'None', 'Alignment' ); ?>
</option> </option>
</select> </select>
</span> </span>
@ -867,7 +867,7 @@ function wp_print_media_templates() {
<option value="file"> <option value="file">
<# } else { #> <# } else { #>
<option value="none" selected> <option value="none" selected>
<?php esc_html_e( 'None' ); ?> <?php esc_html_x( 'None', 'Embedded player type' ); ?>
</option> </option>
<option value="file"> <option value="file">
<# } #> <# } #>
@ -952,7 +952,7 @@ function wp_print_media_templates() {
<?php esc_html_e( 'Media File' ); ?> <?php esc_html_e( 'Media File' ); ?>
</option> </option>
<option value="none" <# if ( 'none' === wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>> <option value="none" <# if ( 'none' === wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
<?php esc_html_e( 'None' ); ?> <?php esc_html_x( 'None', 'Media link target' ); ?>
</option> </option>
</select> </select>
</span> </span>
@ -1096,7 +1096,7 @@ function wp_print_media_templates() {
<?php esc_html_e( 'Right' ); ?> <?php esc_html_e( 'Right' ); ?>
</button> </button>
<button class="button active" value="none"> <button class="button active" value="none">
<?php esc_html_e( 'None' ); ?> <?php esc_html_x( 'None', 'Alignment' ); ?>
</button> </button>
</span> </span>
</span> </span>
@ -1113,7 +1113,7 @@ function wp_print_media_templates() {
<?php esc_html_e( 'Custom URL' ); ?> <?php esc_html_e( 'Custom URL' ); ?>
</button> </button>
<button class="button active" value="none"> <button class="button active" value="none">
<?php esc_html_e( 'None' ); ?> <?php esc_html_x( 'None', 'Media URL' ); ?>
</button> </button>
</span> </span>
</span> </span>
@ -1160,7 +1160,7 @@ function wp_print_media_templates() {
<?php esc_html_e( 'Right' ); ?> <?php esc_html_e( 'Right' ); ?>
</button> </button>
<button class="button active" value="none"> <button class="button active" value="none">
<?php esc_html_e( 'None' ); ?> <?php esc_html_x( 'None', 'Alignment' ); ?>
</button> </button>
</span> </span>
</span> </span>
@ -1236,7 +1236,7 @@ function wp_print_media_templates() {
<?php esc_html_e( 'Custom URL' ); ?> <?php esc_html_e( 'Custom URL' ); ?>
</option> </option>
<option value="none"> <option value="none">
<?php esc_html_e( 'None' ); ?> <?php esc_html_x( 'None', 'Media URL' ); ?>
</option> </option>
</select> </select>
</span> </span>
@ -1356,7 +1356,7 @@ function wp_print_media_templates() {
<span class="button-group button-large" data-setting="preload"> <span class="button-group button-large" data-setting="preload">
<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button> <button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button> <button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
<button class="button active" value="none"><?php _e( 'None' ); ?></button> <button class="button active" value="none"><?php _x( 'None', 'Preload type' ); ?></button>
</span> </span>
</span> </span>
</fieldset> </fieldset>
@ -1455,7 +1455,7 @@ function wp_print_media_templates() {
<span class="button-group button-large" data-setting="preload"> <span class="button-group button-large" data-setting="preload">
<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button> <button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button> <button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
<button class="button active" value="none"><?php _e( 'None' ); ?></button> <button class="button active" value="none"><?php _x( 'None', 'Preload type' ); ?></button>
</span> </span>
</span> </span>
</fieldset> </fieldset>

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.6-alpha-58283'; $wp_version = '6.6-alpha-58284';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.