Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 06:57:35 +01:00
Code Issues Projects Releases Wiki Activity

Adds "select all" shortcut for Mac on permalinks page when .htaccess is not writable.

Browse Source 
This change improves the description of the "select all" shortcut for Mac users in Permalink Settings screen.

Props Valer1e, ajoah, audrasjb, SergeyBiryukov.
Fixes #54633.

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


git-svn-id: http://core.svn.wordpress.org/trunk@52636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
audrasjb 2022-04-01 11:09:07 +00:00
parent f9c1c14c76
commit 5c6a8e9826
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-admin/options-permalink.php
View File

@ -367,11 +367,12 @@ printf( __( 'If you like, you may enter custom structures for your category and
<p id="iis-description-a"> <p id="iis-description-a">
<?php <?php
printf( printf(
/* translators: 1: web.config, 2: Documentation URL, 3: Ctrl + A, 4: Element code. */ /* translators: 1: web.config, 2: Documentation URL, 3: Ctrl + A, 4: ⌘ + A, 5: Element code. */
__( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it is not so this is the url rewrite rule you should have in your %1$s file. Click in the field and press %3$s to select all. Then insert this rule inside of the %4$s element in %1$s file.' ), __( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it is not so this is the url rewrite rule you should have in your %1$s file. Click in the field and press %3$s (or %4$s on Mac) to select all. Then insert this rule inside of the %5$s element in %1$s file.' ),
'<code>web.config</code>', '<code>web.config</code>',
__( 'https://wordpress.org/support/article/changing-file-permissions/' ), __( 'https://wordpress.org/support/article/changing-file-permissions/' ),
'<kbd>Ctrl + A</kbd>', '<kbd>Ctrl + A</kbd>',
'<kbd>⌘ + A</kbd>',
'<code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code>' '<code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code>'
); );
?> ?>
@ -393,11 +394,12 @@ printf( __( 'If you like, you may enter custom structures for your category and
<p id="iis-description-b"> <p id="iis-description-b">
<?php <?php
printf( printf(
/* translators: 1: Documentation URL, 2: web.config, 3: Ctrl + A */ /* translators: 1: Documentation URL, 2: web.config, 3: Ctrl + A, 4: ⌘ + A */
__( 'If the root directory of your site was <a href="%1$s">writable</a>, we could do this automatically, but it is not so this is the url rewrite rule you should have in your %2$s file. Create a new file, called %2$s in the root directory of your site. Click in the field and press %3$s to select all. Then insert this code into the %2$s file.' ), __( 'If the root directory of your site was <a href="%1$s">writable</a>, we could do this automatically, but it is not so this is the url rewrite rule you should have in your %2$s file. Create a new file, called %2$s in the root directory of your site. Click in the field and press %3$s (or %4$s on Mac) to select all. Then insert this code into the %2$s file.' ),
__( 'https://wordpress.org/support/article/changing-file-permissions/' ), __( 'https://wordpress.org/support/article/changing-file-permissions/' ),
'<code>web.config</code>', '<code>web.config</code>',
'<kbd>Ctrl + A</kbd>' '<kbd>Ctrl + A</kbd>',
'<kbd>⌘ + A</kbd>'
); );
?> ?>
</p> </p>
@ -423,11 +425,12 @@ else :
<p id="htaccess-description"> <p id="htaccess-description">
<?php <?php
printf( printf(
/* translators: 1: .htaccess, 2: Documentation URL, 3: Ctrl + A */ /* translators: 1: .htaccess, 2: Documentation URL, 3: Ctrl + A, 4: ⌘ + A */
__( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it is not so these are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s to select all.' ), __( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it is not so these are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s (or %4$s on Mac) to select all.' ),
'<code>.htaccess</code>', '<code>.htaccess</code>',
__( 'https://wordpress.org/support/article/changing-file-permissions/' ), __( 'https://wordpress.org/support/article/changing-file-permissions/' ),
'<kbd>Ctrl + A</kbd>' '<kbd>Ctrl + A</kbd>',
'<kbd>⌘ + A</kbd>'
); );
?> ?>
</p> </p>

2
wp-includes/js/tinymce/plugins/wordpress/plugin.js
View File

@ -253,7 +253,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
editor.addCommand( 'WP_Help', function() { editor.addCommand( 'WP_Help', function() {
var access = tinymce.Env.mac ? __( 'Ctrl + Alt + letter:' ) : __( 'Shift + Alt + letter:' ), var access = tinymce.Env.mac ? __( 'Ctrl + Alt + letter:' ) : __( 'Shift + Alt + letter:' ),
meta = tinymce.Env.mac ? __( 'Cmd + letter:' ) : __( 'Ctrl + letter:' ), meta = tinymce.Env.mac ? __( '⌘ + letter:' ) : __( 'Ctrl + letter:' ),
table1 = [], table1 = [],
table2 = [], table2 = [],
row1 = {}, row1 = {},

2
wp-includes/js/tinymce/plugins/wordpress/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/js/tinymce/wp-tinymce.js
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.0-alpha-53046'; $wp_version = '6.0-alpha-53047';
/** /**
* 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.