Ticket #24795: 24795.diff

wp-includes/pluggable.php

@@ -1746 +1746 @@
 }
 endif;
 
+/**
+ * Determines if the User Operating System is Mac OS X or not
+ *
+ * Uses User Agent sniffing
+ * @since  3.6
+ * @return  boolean Returns true if the operating system is a Mac and false otherwise
+ */
+if( !function_exists( 'is_osx' ) ) :
+function is_osx() {
+        if( strpos( $_SERVER['HTTP_USER_AGENT'], 'Macintosh; Intel Mac OS X' ) !== false )
+                return true;
+        
+        return false;
+}
+endif;

wp-admin/options-permalink.php

@@ -271 +271 @@
         <?php endif; ?>
 <?php else :
         if ( $permalink_structure && ! $usingpi && ! $writable ) : ?>
-<p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
+<p><?php _e( sprintf( 'If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>%s + A</kbd> to select all.', is_osx() ? 'Command (⌘)' : 'CTRL' ) ) ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
         <p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea></p>