<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2111] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php: Translate: Update routes plugin to use the new rosetta roles WP plugin.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/2111">2111</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/2111","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-22 21:24:33 +0000 (Sun, 22 Nov 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Translate: Update routes plugin to use the new rosetta roles WP plugin.
See <a href="http://meta.trac.wordpress.org/ticket/1352">#1352</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesrouteslocalephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesrouteslocalephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php 2015-11-22 21:20:57 UTC (rev 2110)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php 2015-11-22 21:24:33 UTC (rev 2111)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,13 +38,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Default to the Waiting or WordPress tabs
</span><span class="cx" style="display: block; padding: 0 10px"> $default_project_tab = 'waiting';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = GP::$user->current();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = get_current_user_id();
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! $user->id || // Not logged in
- ! isset( GP::$plugins->wporg_rosetta_roles ) || // Rosetta Roles plugin is not enabled
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! is_user_logged_in() ||
+ ! function_exists( 'wporg_gp_rosetta_roles' ) || // Rosetta Roles plugin is not enabled
</ins><span class="cx" style="display: block; padding: 0 10px"> ! (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- GP::$plugins->wporg_rosetta_roles->is_global_administrator( $user->id ) || // Not a global admin
- GP::$plugins->wporg_rosetta_roles->is_approver_for_locale( $user->id, $locale_slug ) // Doesn't have project-level access either
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wporg_gp_rosetta_roles()->is_global_administrator( $user_id ) || // Not a global admin
+ wporg_gp_rosetta_roles()->is_approver_for_locale( $user_id, $locale_slug ) // Doesn't have project-level access either
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> // Add check to see if there are any waiting translations for this locale?
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $project_ids[] = $project->id;
</span><span class="cx" style="display: block; padding: 0 10px"> $project_ids = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $project_ids,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->get_col( "SELECT id FROM {$wpdb->projects} WHERE parent_project_id IN(" . implode(', ', $project_ids ) . ")" )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->get_col( "SELECT id FROM {$wpdb->gp_projects} WHERE parent_project_id IN(" . implode(', ', $project_ids ) . ")" )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $contributors_count = wp_cache_get( 'contributors-count', 'wporg-translate' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $project_ids = implode( ',', $project_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> $slugs = $wpdb->get_col( $wpdb->prepare( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT DISTINCT slug
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$wpdb->translation_sets}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$wpdb->gp_translation_sets}
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> project_id IN( $project_ids )
</span><span class="cx" style="display: block; padding: 0 10px"> AND locale = %s
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_projects = $project->many( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$wpdb->projects}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$wpdb->gp_projects}
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> parent_project_id = %d AND
</span><span class="cx" style="display: block; padding: 0 10px"> active = 1
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +342,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // e.g. wp/dev/admin/network
</span><span class="cx" style="display: block; padding: 0 10px"> $sub_projects = $project->many( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$wpdb->projects}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$wpdb->gp_projects}
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> parent_project_id = %d AND
</span><span class="cx" style="display: block; padding: 0 10px"> active = 1
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,21 +406,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Special Waiting Project Tab
</span><span class="cx" style="display: block; padding: 0 10px"> // This removes the parent_project_id restriction and replaces it with all-translation-editer-projects
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'waiting' == $project->slug && GP::$user->current()->id && isset( GP::$plugins->wporg_rosetta_roles ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'waiting' == $project->slug && is_user_logged_in() && function_exists( 'wporg_gp_rosetta_roles' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $filter ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $filter = 'strings-waiting-and-fuzzy';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = GP::$user->current()->id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = get_current_user_id();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Global Admin or Locale-specific admin
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $can_approve_for_all = GP::$plugins->wporg_rosetta_roles->is_global_administrator( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $can_approve_for_all = wporg_gp_rosetta_roles()->is_global_administrator( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check to see if they have any special approval permissions
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_projects = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $can_approve_for_all && GP::$plugins->wporg_rosetta_roles->is_approver_for_locale( $user_id, $locale ) ) {
- $allowed_projects = GP::$plugins->wporg_rosetta_roles->get_project_id_access_list( $user_id, $locale, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $can_approve_for_all && wporg_gp_rosetta_roles()->is_approver_for_locale( $user_id, $locale ) ) {
+ $allowed_projects = wporg_gp_rosetta_roles()->get_project_id_access_list( $user_id, $locale, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check to see if they can approve for all projects in this locale.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( 'all', $allowed_projects ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,7 +447,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Limit to only showing base-level projects
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_project_sql .= " AND tp.parent_project_id IN( (SELECT id FROM {$wpdb->projects} WHERE parent_project_id IS NULL AND active = 1) )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_project_sql .= " AND tp.parent_project_id IN( (SELECT id FROM {$wpdb->gp_projects} WHERE parent_project_id IS NULL AND active = 1) )";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,7 +462,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> case 'special':
</span><span class="cx" style="display: block; padding: 0 10px"> // Float favorites to the start, but only if they have untranslated strings
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_fav_projects = array_map( array( $wpdb, 'escape' ), $this->get_user_favorites( $project->slug ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_fav_projects = array_map( 'esc_sql', $this->get_user_favorites( $project->slug ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Float Favorites to the start, float fully translated to the bottom, order the rest by name
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_fav_projects ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,7 +474,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'favorites':
</span><span class="cx" style="display: block; padding: 0 10px"> // Only list favorites
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_fav_projects = array_map( array( $wpdb, 'escape' ), $this->get_user_favorites( $project->slug ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_fav_projects = array_map( 'esc_sql', $this->get_user_favorites( $project->slug ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_fav_projects ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $filter_where = 'AND tp.path IN( "' . implode( '", "', $user_fav_projects ) . '" )';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,7 +512,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $_projects = $project->many( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT SQL_CALC_FOUND_ROWS tp.*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$wpdb->projects} tp
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$wpdb->gp_projects} tp
</ins><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$wpdb->project_translation_status} stats ON stats.project_id = tp.id AND stats.locale = %s AND stats.locale_slug = %s
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> tp.active = 1
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,12 +546,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_user_favorites( $project_slug = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = GP::$user->current();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $user->id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_user_logged_in() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = get_current_user_id();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $project_slug ) {
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> // Fall through to include both Themes and Plugins
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,7 +560,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Theme favorites are stored as theme slugs, these map 1:1 to GlotPress projects
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_favorites = array_map( function( $slug ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return "wp-themes/$slug";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }, (array) $user->get_meta( 'theme_favorites' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }, (array) get_user_meta( $user_id, 'theme_favorites', true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'wp-themes' === $project_slug ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $theme_favorites;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,7 +568,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'wp-plugins':
</span><span class="cx" style="display: block; padding: 0 10px"> // Plugin favorites are stored as topic ID's
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_fav_ids = array_keys( (array)$user->get_meta( PLUGINS_TABLE_PREFIX . 'plugin_favorite' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_fav_ids = array_keys( (array) get_user_meta( $user_id, PLUGINS_TABLE_PREFIX . 'plugin_favorite', true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_fav_slugs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugin_fav_ids ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_fav_ids = implode( ',', array_map( 'intval', $plugin_fav_ids ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,7 +598,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return GP::$project->many( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$wpdb->projects}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$wpdb->gp_projects}
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> parent_project_id IS NULL
</span><span class="cx" style="display: block; padding: 0 10px"> AND active = 1
</span></span></pre>
</div>
</div>
</body>
</html>