Changeset 3139318

Timestamp:

08/21/2024 10:48:35 PM (15 months ago)

Author:

mdawaffe

Message:

I18n improvements

• Use the post type label translations
• Don't concatenate multiple translated strings
• Use numbered placeholders
• Add context and comments where necessary

Props yoavf

File:

• email-post-changes/trunk/class.email-post-changes.php (modified) (4 diffs)

email-post-changes/trunk/class.email-post-changes.php

@@ -136 +136 @@
         $the_author = get_the_author_meta( 'display_name', get_current_user_id() ); // The revision
         $the_title = get_the_title( $this->right_post->ID ); // New title (may be same as old title)
-        $the_date = gmdate( 'j F, Y \a\t G:i \U\T\C', strtotime( $this->right_post->post_modified_gmt . '+0000' ) ); // Modified time
+        $the_date = gmdate( _x( 'j F, Y \a\t G:i \U\T\C', 'time format for when a post was modified' ), strtotime( $this->right_post->post_modified_gmt . '+0000' ) ); // Modified time
         $the_permalink = esc_url( get_permalink( $this->right_post->ID ) );
         $the_edit_link = esc_url( get_edit_post_link( $this->right_post->ID ) );
@@ -172 +172 @@
 
             $left_title = __( 'Revision' );
-            $right_title = sprintf( __( 'Current %s' ), $post_type = ucfirst( $this->right_post->post_type ) );
-
-            $head_sprintf = __( '%s made the following changes to the %s %s on %s' );
-
+            $post_type = get_post_type_object( $this->right_post->post_type );
+            $post_type_label = $post_type->labels->singular_name;
+
+            /* i18n for a post type can be tricky, let's have presets for the default post types */
+            if ( $this->right_post->post_type == 'post' ) {
+                $right_title = __( 'Current post' );
+            } else if ( $this->right_post->post_type == 'page' ) {
+                $right_title = __( 'Current page' );
+            } else {
+                $right_title = sprintf( _x( 'Current %s', 'post type' ), $post_type_label );
+            }
+
+            /* translators: 1=username, 2=post type, 3=post title, 4=edit link, 4=post type, 5=date */
+            $head_sprintf = __( '%1$s made the following changes to the “%2$s” %3$s %4$s on %5$s' );
 
             // HTML
-            $html_diff_head  = '<h2>' . sprintf( __( '%s changed' ), $post_type ) . "</h2>\n";
+            $html_diff_head  = '<h2>' . sprintf( __( '%s changed' ), $post_type_label ) . "</h2>\n";
             $html_diff_head .= '<p>' . sprintf( $head_sprintf,
                 esc_html( $the_author ),
-                sprintf( _x( '&#8220;%s&#8221; [%s]', '1 = link, 2 = "edit"' ),
                     "<a href='$the_permalink'>" . esc_html( $the_title ) . '</a>',
-                    "<a href='$the_edit_link'>" . __( 'edit' ) . '</a>'
-                ),
-                $this->right_post->post_type,
+                "<a href='$the_edit_link'>" . __( '[edit]' ) . '</a>',
+                $post_type_label,
                 $the_date
             ) . "</p>\n\n";
 
             $html_diff_head .= "<table style='width: 100%; border-collapse: collapse; border: none;'><tr>\n";
-            $html_diff_head .= "<td style='width: 50%; padding: 0; margin: 0;'>" . esc_html( $left_title ) . ' @ ' . esc_html( $this->left_post->post_date_gmt ) . "</td>\n";
-            $html_diff_head .= "<td style='width: 50%; padding: 0; margin: 0;'>" . esc_html( $right_title ) . ' @ ' . esc_html( $this->right_post->post_modified_gmt ) . "</td>\n";
+            $html_diff_head .= "<td style='width: 50%; padding: 0; margin: 0;'>" . esc_html( sprintf( _x( '%1$s @ %2$s', 'post title @ date and time'), $left_title, $this->left_post->post_date_gmt ) ) . "</td>\n";
+            $html_diff_head .= "<td style='width: 50%; padding: 0; margin: 0;'>" . esc_html( sprintf( _x( '%1$s @ %2$s', 'post title @ date and time'), $right_title, $this->right_post->post_date_gmt ) ) . "</td>\n";
             $html_diff_head .= "</tr></table>\n\n";
 
@@ -222 +230 @@
 
             // TEXT
-            $text_diff  = sprintf( $head_sprintf, $the_author, '"' . $the_title . '"', $this->right_post->post_type, $the_date ) . "\n";
-            $text_diff .= "URL:  $the_permalink\n";
-            $text_diff .= "Edit: $the_edit_link\n\n";
+            $text_diff  = sprintf( $head_sprintf, $the_author, $the_title, '', $post_type_label, $the_date ) . "\n";
+            $text_diff .= sprintf( __( "URL: %s" ),  $the_permalink) . "\n";
+            $text_diff .= sprintf( __( "Edit: %s" ), $the_edit_link ) . "\n";
 
             foreach ( $text_diffs as $field_title => $diff ) {
@@ -238 +246 @@
             wp_mail(
                 $email,
-                sprintf( __( '[%s] %s changed: %s' ), $blogname, $post_type, $title ),
+                /* translators: 1=blogname, 2=post type, 3=post title */
+                sprintf( __( '[%1$s] %2$s changed: %3$s' ), $blogname, $post_type_label, $title ),
                 $html_diff
             );