From 92343be1f445b83ac2ecce5aa7021c059f2b8f4d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 23 Aug 2016 01:19:39 +0000
Subject: [PATCH] I18N: Allow for WordPress Plugin/Theme Directory URLs to be
localized.
Props ramiy.
Fixes #37501.
Built from https://develop.svn.wordpress.org/trunk@38325
git-svn-id: http://core.svn.wordpress.org/trunk@38266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-admin/freedoms.php | 4 ++--
wp-admin/includes/plugin-install.php | 2 +-
wp-admin/plugin-install.php | 2 +-
wp-admin/plugins.php | 2 +-
wp-admin/themes.php | 2 +-
wp-includes/version.php | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php
index b47465d73a..811777b07b 100644
--- a/wp-admin/freedoms.php
+++ b/wp-admin/freedoms.php
@@ -42,8 +42,8 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<p><?php
-$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : 'https://wordpress.org/plugins/';
-$themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : 'https://wordpress.org/themes/';
+$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
+$themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
printf( __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it’s GPL</a> first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); ?></p>
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index 4d558cf0ee..7c5df8447f 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -210,7 +210,7 @@ function install_popular_tags( $args = array() ) {
*/
function install_dashboard() {
?>
- <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format by clicking the button at the top of this page.' ), 'https://wordpress.org/plugins/' ); ?></p>
+ <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format by clicking the button at the top of this page.' ), __( 'https://wordpress.org/plugins/' ) ); ?></p>
<?php display_plugins_table(); ?>
diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php
index 3ea89e4aa0..47ab6812e8 100644
--- a/wp-admin/plugin-install.php
+++ b/wp-admin/plugin-install.php
@@ -79,7 +79,7 @@ get_current_screen()->add_help_tab( array(
'id' => 'overview',
'title' => __('Overview'),
'content' =>
- '<p>' . sprintf( __('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s" target="_blank">WordPress Plugin Directory</a> are compatible with the license WordPress uses.' ), 'https://wordpress.org/plugins/' ) . '</p>' .
+ '<p>' . sprintf( __('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s" target="_blank">WordPress Plugin Directory</a> are compatible with the license WordPress uses.' ), __( 'https://wordpress.org/plugins/' ) ) . '</p>' .
'<p>' . __( 'You can find new plugins to install by searching or browsing the directory right here in your own Plugins section.' ) . ' <span id="live-search-desc" class="hide-if-no-js">' . __( 'The search results will be updated as you type.' ) . '</span></p>'
) );
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 1d46238193..0e59ed93a1 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -375,7 +375,7 @@ get_current_screen()->add_help_tab( array(
'<p>' . sprintf(
/* translators: %s: WordPress Plugin Directory URL */
__( 'If you would like to see more plugins to choose from, click on the “Add New” button and you will be able to browse or search for additional plugins from the <a href="%s" target="_blank">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ),
- 'https://wordpress.org/plugins/'
+ __( 'https://wordpress.org/plugins/' )
) . '</p>'
) );
get_current_screen()->add_help_tab( array(
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index c601cd555d..d480ce672b 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -89,7 +89,7 @@ if ( current_user_can( 'install_themes' ) ) {
if ( is_multisite() ) {
$help_install = '<p>' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '</p>';
} else {
- $help_install = '<p>' . sprintf( __('If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the <a href="%s" target="_blank">WordPress Theme Directory</a>. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!'), 'https://wordpress.org/themes/' ) . '</p>';
+ $help_install = '<p>' . sprintf( __('If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the <a href="%s" target="_blank">WordPress Theme Directory</a>. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!'), __( 'https://wordpress.org/themes/' ) ) . '</p>';
}
get_current_screen()->add_help_tab( array(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f802572c42..5a77562a36 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
-$wp_version = '4.7-alpha-38324';
+$wp_version = '4.7-alpha-38325';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.