Changeset 1942

Timestamp:

10/06/2015 03:05:07 PM (11 years ago)

Author:

ocean90

Message:

Rosetta: Allow to make users a Translation Editor even if they aren't a member of the site yet.

If a user isn't a member of the site add them as a subscriber.

Fixes #1237.

Location:

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles

Files:

• rosetta-roles.php (modified) (2 diffs)
• views/translation-editors.php (modified) (1 diff)

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/rosetta-roles.php

@@ -315 +315 @@
 
                                         if ( ! is_user_member_of_blog( $user_details->ID ) ) {
-                                                wp_redirect( add_query_arg( array( 'error' => 'not-a-member' ), $redirect ) );
-                                                exit;
+                                                $added = add_existing_user_to_blog( array( 'user_id' => $user_details->ID, 'role' => 'subscriber' ) );
+                                                if ( ! $added || is_wp_error( $added ) ) {
+                                                        wp_redirect( add_query_arg( array( 'error' => 'not-added-to-site' ), $redirect ) );
+                                                        exit;
+                                                }
+
+                                                // Refresh user data
+                                                $user_details = get_user_by( 'id', $user_details->ID );
                                         }
 
@@ -525 +531 @@
 
                         'error' => array(
-                                'no-user-found' => __( 'The user couldn’t be found.', 'rosetta' ),
-                                'not-a-member'  => __( 'The user is not a member of this site.', 'rosetta' ),
-                                'user-cannot'   => __( 'The user is not a translation editor.', 'rosetta' ),
-                                'user-exists'   => __( 'The user is already a translation editor.', 'rosetta' ),
+                                'no-user-found'     => __( 'The user couldn’t be found.', 'rosetta' ),
+                                'not-a-member'      => __( 'The user is not a member of this site.', 'rosetta' ),
+                                'not-added-to-site' => __( 'The user couldn’t be added to this site.', 'rosetta' ),
+                                'user-cannot'       => __( 'The user is not a translation editor.', 'rosetta' ),
+                                'user-exists'       => __( 'The user is already a translation editor.', 'rosetta' ),
                         ),
                 );

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/views/translation-editors.php

@@ -23 +23 @@
         <?php if ( current_user_can( 'promote_users' ) ) : ?>
                 <h3><?php _e( 'Add Translation Editor', 'rosetta' ); ?></h3>
-                <p><?php _e( 'Enter the email address or username of an existing user on this site.', 'rosetta' ); ?></p>
+                <p><?php _e( 'Enter the email address or username of an existing user on wordpress.org.', 'rosetta' ); ?></p>
                 <form action="" method="post">
                         <table class="form-table">