summaryrefslogtreecommitdiff
path: root/Postman/Postman-Email-Log/PostmanEmailLogController.php
diff options
context:
space:
mode:
authorNiels de Blaauw <niels@level-level.com>2019-03-13 09:42:41 +0100
committerNiels de Blaauw <niels@level-level.com>2019-03-13 09:42:41 +0100
commitfd70868a4b7c569ff5eeddfa36b71709c24b3555 (patch)
tree92a5412dcea553a72a2ab90971ec42bba8331481 /Postman/Postman-Email-Log/PostmanEmailLogController.php
parentc88e7ad0b42cefd8fb7b509c8c2e355f567d9434 (diff)
downloadPost-SMTP-fd70868a4b7c569ff5eeddfa36b71709c24b3555.zip
Fixes #1, deprecates and replaces variable text domain usage
This should be removed as it breaks compatibility with translate.wordpress.org
Diffstat (limited to 'Postman/Postman-Email-Log/PostmanEmailLogController.php')
-rw-r--r--Postman/Postman-Email-Log/PostmanEmailLogController.php58
1 files changed, 29 insertions, 29 deletions
diff --git a/Postman/Postman-Email-Log/PostmanEmailLogController.php b/Postman/Postman-Email-Log/PostmanEmailLogController.php
index be08232..ef1f7c5 100644
--- a/Postman/Postman-Email-Log/PostmanEmailLogController.php
+++ b/Postman/Postman-Email-Log/PostmanEmailLogController.php
@@ -97,7 +97,7 @@ class PostmanEmailLogController {
if ( $success ) {
$this->logger->debug( 'Email was successfully re-sent' );
// the message was sent successfully, generate an appropriate message for the user
- $statusMessage = sprintf( __( 'Your message was delivered (%d ms) to the SMTP server! Congratulations :)', Postman::TEXT_DOMAIN ), $result ['time'] );
+ $statusMessage = sprintf( __( 'Your message was delivered (%d ms) to the SMTP server! Congratulations :)', 'post-smtp' ), $result ['time'] );
// compose the JSON response for the caller
$response = array(
@@ -163,7 +163,7 @@ class PostmanEmailLogController {
$purger->verifyLogItemExistsAndRemove( $postid );
}
$mh = new PostmanMessageHandler();
- $mh->addMessage( __( 'Mail Log Entries were deleted.', Postman::TEXT_DOMAIN ) );
+ $mh->addMessage( __( 'Mail Log Entries were deleted.', 'post-smtp' ) );
} else {
$this->logger->warn( sprintf( 'action "%s" not recognized', $_REQUEST ['action'] ) );
}
@@ -186,7 +186,7 @@ class PostmanEmailLogController {
$purger = new PostmanEmailLogPurger();
$purger->verifyLogItemExistsAndRemove( $postid );
$mh = new PostmanMessageHandler();
- $mh->addMessage( __( 'Mail Log Entry was deleted.', Postman::TEXT_DOMAIN ) );
+ $mh->addMessage( __( 'Mail Log Entry was deleted.', 'post-smtp' ) );
} else {
$this->logger->warn( sprintf( 'nonce "%s" failed validation', $_REQUEST ['_wpnonce'] ) );
}
@@ -211,29 +211,29 @@ class PostmanEmailLogController {
}</style></head><body>';
print '<table>';
if ( ! empty( $meta_values ['from_header'] [0] ) ) {
- printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'From', 'Who is this message From?', Postman::TEXT_DOMAIN ), esc_html( $meta_values ['from_header'] [0] ) );
+ printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'From', 'Who is this message From?', 'post-smtp' ), esc_html( $meta_values ['from_header'] [0] ) );
}
// show the To header (it's optional)
if ( ! empty( $meta_values ['to_header'] [0] ) ) {
- printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'To', 'Who is this message To?', Postman::TEXT_DOMAIN ), esc_html( $meta_values ['to_header'] [0] ) );
+ printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'To', 'Who is this message To?', 'post-smtp' ), esc_html( $meta_values ['to_header'] [0] ) );
}
// show the Cc header (it's optional)
if ( ! empty( $meta_values ['cc_header'] [0] ) ) {
- printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'Cc', 'Who is this message Cc\'d to?', Postman::TEXT_DOMAIN ), esc_html( $meta_values ['cc_header'] [0] ) );
+ printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'Cc', 'Who is this message Cc\'d to?', 'post-smtp' ), esc_html( $meta_values ['cc_header'] [0] ) );
}
// show the Bcc header (it's optional)
if ( ! empty( $meta_values ['bcc_header'] [0] ) ) {
- printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'Bcc', 'Who is this message Bcc\'d to?', Postman::TEXT_DOMAIN ), esc_html( $meta_values ['bcc_header'] [0] ) );
+ printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'Bcc', 'Who is this message Bcc\'d to?', 'post-smtp' ), esc_html( $meta_values ['bcc_header'] [0] ) );
}
// show the Reply-To header (it's optional)
if ( ! empty( $meta_values ['reply_to_header'] [0] ) ) {
- printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', __( 'Reply-To', Postman::TEXT_DOMAIN ), esc_html( $meta_values ['reply_to_header'] [0] ) );
+ printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', __( 'Reply-To', 'post-smtp' ), esc_html( $meta_values ['reply_to_header'] [0] ) );
}
- printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'Date', 'What is the date today?', Postman::TEXT_DOMAIN ), $post->post_date );
- printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'Subject', 'What is the subject of this message?', Postman::TEXT_DOMAIN ), esc_html( $post->post_title ) );
+ printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'Date', 'What is the date today?', 'post-smtp' ), $post->post_date );
+ printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'Subject', 'What is the subject of this message?', 'post-smtp' ), esc_html( $post->post_title ) );
// The Transport UI is always there, in more recent versions that is
if ( ! empty( $meta_values ['transport_uri'] [0] ) ) {
- printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'Delivery-URI', 'What is the unique URI of the configuration?', Postman::TEXT_DOMAIN ), esc_html( $meta_values ['transport_uri'] [0] ) );
+ printf( '<tr><th style="text-align:right">%s:</th><td>%s</td></tr>', _x( 'Delivery-URI', 'What is the unique URI of the configuration?', 'post-smtp' ), esc_html( $meta_values ['transport_uri'] [0] ) );
}
print '</table>';
print '<hr/>';
@@ -267,14 +267,14 @@ class PostmanEmailLogController {
border-bottom: 1px dashed #ccc;
background: #bbb;
}</style></head><body>';
- printf( '<p>%s</p>', __( 'This is the conversation between Postman and the mail server. It can be useful for diagnosing problems. <b>DO NOT</b> post it on-line, it may contain your account password.', Postman::TEXT_DOMAIN ) );
+ printf( '<p>%s</p>', __( 'This is the conversation between Postman and the mail server. It can be useful for diagnosing problems. <b>DO NOT</b> post it on-line, it may contain your account password.', 'post-smtp' ) );
print '<hr/>';
print '<pre>';
if ( ! empty( $meta_values ['session_transcript'] [0] ) ) {
print esc_html( $meta_values ['session_transcript'] [0] );
} else {
/* Translators: Meaning "Not Applicable" */
- print __( 'n/a', Postman::TEXT_DOMAIN );
+ print __( 'n/a', 'post-smtp' );
}
print '</pre>';
print '</body></html>';
@@ -299,8 +299,8 @@ class PostmanEmailLogController {
$this->logger->trace( 'created PostmanEmailLog admin menu item' );
/*
Translators where (%s) is the name of the plugin */
- $pageTitle = sprintf( __( '%s Email Log', Postman::TEXT_DOMAIN ), __( 'Post SMTP', Postman::TEXT_DOMAIN ) );
- $pluginName = _x( 'Email Log', 'The log of Emails that have been delivered', Postman::TEXT_DOMAIN );
+ $pageTitle = sprintf( __( '%s Email Log', 'post-smtp' ), __( 'Post SMTP', 'post-smtp' ) );
+ $pluginName = _x( 'Email Log', 'The log of Emails that have been delivered', 'post-smtp' );
$page = add_submenu_page( PostmanViewController::POSTMAN_MENU_SLUG, $pageTitle, $pluginName, Postman::MANAGE_POSTMAN_CAPABILITY_LOGS, 'postman_email_log', array( $this, 'postman_render_email_page' ) );
@@ -317,10 +317,10 @@ class PostmanEmailLogController {
wp_enqueue_style( 'postman_email_log' );
wp_enqueue_script( 'postman_resend_email_script' );
wp_enqueue_script( 'sprintf' );
- wp_localize_script( 'postman_resend_email_script', 'postman_js_email_was_resent', __( 'Email was successfully resent (but without attachments)', Postman::TEXT_DOMAIN ) );
+ wp_localize_script( 'postman_resend_email_script', 'postman_js_email_was_resent', __( 'Email was successfully resent (but without attachments)', 'post-smtp' ) );
/* Translators: Where %s is an error message */
- wp_localize_script( 'postman_resend_email_script', 'postman_js_email_not_resent', __( 'Email could not be resent. Error: %s', Postman::TEXT_DOMAIN ) );
- wp_localize_script( 'postman_resend_email_script', 'postman_js_resend_label', __( 'Resend', Postman::TEXT_DOMAIN ) );
+ wp_localize_script( 'postman_resend_email_script', 'postman_js_email_not_resent', __( 'Email could not be resent. Error: %s', 'post-smtp' ) );
+ wp_localize_script( 'postman_resend_email_script', 'postman_js_resend_label', __( 'Resend', 'post-smtp' ) );
}
/**
@@ -349,13 +349,13 @@ class PostmanEmailLogController {
</div>
<h2><?php
/* Translators where (%s) is the name of the plugin */
- echo sprintf( __( '%s Email Log', Postman::TEXT_DOMAIN ), __( 'Post SMTP', Postman::TEXT_DOMAIN ) )?></h2>
+ echo sprintf( __( '%s Email Log', 'post-smtp' ), __( 'Post SMTP', 'post-smtp' ) )?></h2>
<div
style="background: #ECECEC; border: 1px solid #CCC; padding: 0 10px; margin-top: 5px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px;">
<p><?php
- echo __( 'This is a record of deliveries made to the mail server. It does not neccessarily indicate sucessful delivery to the recipient.', Postman::TEXT_DOMAIN )?></p>
+ echo __( 'This is a record of deliveries made to the mail server. It does not neccessarily indicate sucessful delivery to the recipient.', 'post-smtp' )?></p>
</div>
<?php
@@ -369,19 +369,19 @@ class PostmanEmailLogController {
<form id="postman-email-log-filter" method="post">
<div id="email-log-filter" class="postman-log-row">
<div class="form-control">
- <label for="from_date"><?php _e( 'From Date', Postman::TEXT_DOMAIN ); ?></label>
- <input id="from_date" class="email-log-date" value="<?php echo $from_date; ?>" type="text" name="from_date" placeholder="<?php _e( 'From Date', Postman::TEXT_DOMAIN ); ?>">
+ <label for="from_date"><?php _e( 'From Date', 'post-smtp' ); ?></label>
+ <input id="from_date" class="email-log-date" value="<?php echo $from_date; ?>" type="text" name="from_date" placeholder="<?php _e( 'From Date', 'post-smtp' ); ?>">
</div>
<div class="form-control">
- <label for="to_date"><?php _e( 'To Date', Postman::TEXT_DOMAIN ); ?></label>
- <input id="to_date" class="email-log-date" value="<?php echo $to_date; ?>" type="text" name="to_date" placeholder="<?php _e( 'To Date', Postman::TEXT_DOMAIN ); ?>">
+ <label for="to_date"><?php _e( 'To Date', 'post-smtp' ); ?></label>
+ <input id="to_date" class="email-log-date" value="<?php echo $to_date; ?>" type="text" name="to_date" placeholder="<?php _e( 'To Date', 'post-smtp' ); ?>">
</div>
<div class="form-control">
- <label for="search"><?php _e( 'Search', Postman::TEXT_DOMAIN ); ?></label>
- <input id="search" type="text" name="search" value="<?php echo $search; ?>" placeholder="<?php _e( 'Search', Postman::TEXT_DOMAIN ); ?>">
+ <label for="search"><?php _e( 'Search', 'post-smtp' ); ?></label>
+ <input id="search" type="text" name="search" value="<?php echo $search; ?>" placeholder="<?php _e( 'Search', 'post-smtp' ); ?>">
</div>
<div class="form-control">
- <label id="postman_page_records"><?php _e( 'Records per page', Postman::TEXT_DOMAIN ); ?></label>
+ <label id="postman_page_records"><?php _e( 'Records per page', 'post-smtp' ); ?></label>
<select id="postman_page_records" name="postman_page_records">
<?php
foreach ( $page_records as $value ) {
@@ -392,10 +392,10 @@ class PostmanEmailLogController {
</select>
</div>
<div class="form-control" style="padding: 0 5px 0 5px;">
- <button type="submit" name="filter" class="button button-primary"><?php _e( 'Filter/Search', Postman::TEXT_DOMAIN ); ?></button>
+ <button type="submit" name="filter" class="button button-primary"><?php _e( 'Filter/Search', 'post-smtp' ); ?></button>
</div>
<div class="form-control">
- <button type="submit" id="postman_trash_all" name="postman_trash_all" class="button button-primary"><?php _e( 'Trash All', Postman::TEXT_DOMAIN ); ?></button>
+ <button type="submit" id="postman_trash_all" name="postman_trash_all" class="button button-primary"><?php _e( 'Trash All', 'post-smtp' ); ?></button>
</div>
</div>
<div class="error">Please notice: when you select a date for example 11/20/2017, behind the scene the query select <b>11/20/2017 00:00:00</b>.<br>So if you searching for an email arrived that day at any hour you need to select 11/20/2017 as the <b>From Date</b> and 11/21/2017 as the <b>To Date</b>.</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 15:54:30 +0000