Merge pull request #25 from NielsdeBlaauw/1-fix-variable-text-domain

Fixes #1, deprecates and replaces variable text domain usage

1 files changed, 35 insertions, 35 deletions

diff --git a/Postman/Postman-Controller/PostmanWelcomeController.php b/Postman/Postman-Controller/PostmanWelcomeController.php
index b43e969..869848a 100644
--- a/Postman/Postman-Controller/PostmanWelcomeController.php
+++ b/Postman/Postman-Controller/PostmanWelcomeController.php
@@ -19,8 +19,8 @@ class PostmanWelcomeController {
 
 			// About
 			add_dashboard_page(
-				__( 'Welcome',  Postman::TEXT_DOMAIN ),
-				__( 'Welcome',  Postman::TEXT_DOMAIN ),
+				__( 'Welcome',  'post-smtp' ),
+				__( 'Welcome',  'post-smtp' ),
 				'manage_options',
 				'post-about',
 				array( $this, 'about_screen' )
@@ -28,8 +28,8 @@ class PostmanWelcomeController {
 
 			// Credits
 			add_dashboard_page(
-				__( 'Credits',  Postman::TEXT_DOMAIN ),
-				__( 'Credits',  Postman::TEXT_DOMAIN ),
+				__( 'Credits',  'post-smtp' ),
+				__( 'Credits',  'post-smtp' ),
 				'manage_options',
 				'post-credits',
 				array( $this, 'credits_screen' )
@@ -72,36 +72,36 @@ class PostmanWelcomeController {
 			}
 		</style>
 		<div class="wrap about-wrap">
-			<h1><?php printf( esc_html__( 'Welcome to Post SMTP %s', Postman::TEXT_DOMAIN ), $this->version ); ?></h1>
-			<div class="about-text"><?php printf( esc_html__( 'Thank you for updating! Post SMTP %s is bundled up and ready to take your SMTP needs to the next level!', Postman::TEXT_DOMAIN ), $this->version ); ?><br>
+			<h1><?php printf( esc_html__( 'Welcome to Post SMTP %s', 'post-smtp' ), $this->version ); ?></h1>
+			<div class="about-text"><?php printf( esc_html__( 'Thank you for updating! Post SMTP %s is bundled up and ready to take your SMTP needs to the next level!', 'post-smtp' ), $this->version ); ?><br>
 				<?php printf( '<strong>%s</strong>','Post SMTP support every SMTP service: Gmail/G-suite, SendGrid, Mandrill, Office365, and more...' ); ?>
 			</div>
-			<div class="post-badge"><?php printf( esc_html__( 'Version %s', Postman::TEXT_DOMAIN ), $this->version ); ?></div>
+			<div class="post-badge"><?php printf( esc_html__( 'Version %s', 'post-smtp' ), $this->version ); ?></div>
 
 			<h2 class="nav-tab-wrapper">
 				<a class="nav-tab nav-tab-active" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'post-about' ), 'index.php' ) ) ); ?>">
-					<?php esc_html_e( 'What&#8217;s New', Postman::TEXT_DOMAIN ); ?>
+					<?php esc_html_e( 'What&#8217;s New', 'post-smtp' ); ?>
 				</a><a class="nav-tab" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'post-credits' ), 'index.php' ) ) ); ?>">
-					<?php esc_html_e( 'Credits', Postman::TEXT_DOMAIN ); ?>
+					<?php esc_html_e( 'Credits', 'post-smtp' ); ?>
 				</a>
 			</h2>
 
 			<div class="changelog">
-				<h3><?php esc_html_e( 'Email Log', Postman::TEXT_DOMAIN ); ?></h3>
+				<h3><?php esc_html_e( 'Email Log', 'post-smtp' ); ?></h3>
 
 				<div class="feature-section col two-col">
 					<div class="last-feature">
-						<h4><?php esc_html_e( 'Email log filter', Postman::TEXT_DOMAIN ); ?></h4>
+						<h4><?php esc_html_e( 'Email log filter', 'post-smtp' ); ?></h4>
 						<p>
-							<?php esc_html_e( 'You can easily filter by dates and search in your log.', Postman::TEXT_DOMAIN ); ?>
+							<?php esc_html_e( 'You can easily filter by dates and search in your log.', 'post-smtp' ); ?>
 							<img src="<?php echo $this->pluginUrl; ?>/images/filter-preview.gif">	
 						</p>
 					</div>
 
 					<div>
-						<h4><?php esc_html_e( 'Multiple emails resend', Postman::TEXT_DOMAIN ); ?></h4>
+						<h4><?php esc_html_e( 'Multiple emails resend', 'post-smtp' ); ?></h4>
 						<p>
-							<?php esc_html_e( 'Resend any email to the original recipient or any other emails you choose.', Postman::TEXT_DOMAIN ); ?>
+							<?php esc_html_e( 'Resend any email to the original recipient or any other emails you choose.', 'post-smtp' ); ?>
 							<img src="<?php echo $this->pluginUrl; ?>/images/resend-preview.gif">	
 						</p>
 					</div>
@@ -109,7 +109,7 @@ class PostmanWelcomeController {
 			</div>
 
 			<div class="changelog">
-				<h3><?php esc_html_e( 'The best delivery experience', Postman::TEXT_DOMAIN ); ?></h3>
+				<h3><?php esc_html_e( 'The best delivery experience', 'post-smtp' ); ?></h3>
 
 				<div class="feature-section col one-col">
 					<div class="last-feature">
@@ -120,30 +120,30 @@ class PostmanWelcomeController {
 						Supports forced recipients (cc, bcc, to) and custom email headers,
 						SASL Support: Plain/Login/CRAM-MD5/XOAUTH2 authentication,
 						Security Support: SMTPS and STARTTLS (SSL/TLS),
-						Copy configuration to other instances of Post.', Postman::TEXT_DOMAIN ); ?></p>
+						Copy configuration to other instances of Post.', 'post-smtp' ); ?></p>
 					</div>
 				</div>
 
 				<div class="feature-section col three-col">
 					<div>
-						<h4><?php esc_html_e( 'Email log HTML preview', Postman::TEXT_DOMAIN ); ?></h4>
-						<p><?php esc_html_e( 'You can now see sent emails as HTML.', Postman::TEXT_DOMAIN ); ?></p>
+						<h4><?php esc_html_e( 'Email log HTML preview', 'post-smtp' ); ?></h4>
+						<p><?php esc_html_e( 'You can now see sent emails as HTML.', 'post-smtp' ); ?></p>
 					</div>
 
 					<div>
-						<h4><?php esc_html_e( 'Continues email delivery', Postman::TEXT_DOMAIN ); ?></h4>
-						<p><?php esc_html_e( 'if email fail to sent you will get notified using the local mail system.', Postman::TEXT_DOMAIN ); ?></p>
+						<h4><?php esc_html_e( 'Continues email delivery', 'post-smtp' ); ?></h4>
+						<p><?php esc_html_e( 'if email fail to sent you will get notified using the local mail system.', 'post-smtp' ); ?></p>
 					</div>
 
 					<div class="last-feature">
-						<h4><?php esc_html_e( 'The best debugging tools.', Postman::TEXT_DOMAIN ); ?></h4>
-						<p><?php esc_html_e( 'Full Transcripts, Connectivity Test, Diagnostic Test.', Postman::TEXT_DOMAIN ); ?></p>
+						<h4><?php esc_html_e( 'The best debugging tools.', 'post-smtp' ); ?></h4>
+						<p><?php esc_html_e( 'Full Transcripts, Connectivity Test, Diagnostic Test.', 'post-smtp' ); ?></p>
 					</div>
 				</div>
 			</div>
 
 			<div class="return-to-dashboard">
-				<a href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'postman' ), 'admin.php' ) ) ); ?>"><?php esc_html_e( 'Go to Post SMTP Settings', Postman::TEXT_DOMAIN ); ?></a>
+				<a href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'postman' ), 'admin.php' ) ) ); ?>"><?php esc_html_e( 'Go to Post SMTP Settings', 'post-smtp' ); ?></a>
 			</div>
 
 		</div>
@@ -170,36 +170,36 @@ class PostmanWelcomeController {
 			}			
 		</style>
 		<div class="wrap about-wrap">
-			<h1><?php printf( esc_html__( 'Welcome to Post SMTP %s', Postman::TEXT_DOMAIN ), $this->version ); ?></h1>
-			<div class="about-text"><?php printf( esc_html__( 'Thank you for updating! bbPress %s is waxed, polished, and ready for you to take it for a lap or two around the block!', Postman::TEXT_DOMAIN ), $this->version ); ?></div>
-			<div class="post-badge"><?php printf( esc_html__( 'Version %s', Postman::TEXT_DOMAIN ), $this->version ); ?></div>
+			<h1><?php printf( esc_html__( 'Welcome to Post SMTP %s', 'post-smtp' ), $this->version ); ?></h1>
+			<div class="about-text"><?php printf( esc_html__( 'Thank you for updating! bbPress %s is waxed, polished, and ready for you to take it for a lap or two around the block!', 'post-smtp' ), $this->version ); ?></div>
+			<div class="post-badge"><?php printf( esc_html__( 'Version %s', 'post-smtp' ), $this->version ); ?></div>
 
 			<h2 class="nav-tab-wrapper">
 				<a href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'post-about' ), 'index.php' ) ) ); ?>" class="nav-tab">
-					<?php esc_html_e( 'What&#8217;s New', Postman::TEXT_DOMAIN ); ?>
+					<?php esc_html_e( 'What&#8217;s New', 'post-smtp' ); ?>
 				</a><a href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'post-credits' ), 'index.php' ) ) ); ?>" class="nav-tab nav-tab-active">
-					<?php esc_html_e( 'Credits', Postman::TEXT_DOMAIN ); ?>
+					<?php esc_html_e( 'Credits', 'post-smtp' ); ?>
 				</a>
 			</h2>
 
-			<p class="about-description"><?php esc_html_e( 'Post SMTP started by Jason Hendriks, Jason left the project and Yehuda Hassine (me) continue his work.', Postman::TEXT_DOMAIN ); ?></p>
+			<p class="about-description"><?php esc_html_e( 'Post SMTP started by Jason Hendriks, Jason left the project and Yehuda Hassine (me) continue his work.', 'post-smtp' ); ?></p>
 
-			<h4 class="wp-people-group"><?php esc_html_e( 'Project Leaders', Postman::TEXT_DOMAIN ); ?></h4>
+			<h4 class="wp-people-group"><?php esc_html_e( 'Project Leaders', 'post-smtp' ); ?></h4>
 			<ul class="wp-people-group " id="wp-people-group-project-leaders">
 				<li class="wp-person" id="wp-person-jasonhendriks">
 					<a href="https://profiles.wordpress.org/jasonhendriks"><img src="https://secure.gravatar.com/avatar/8692c7b6084517a592f6cad107f7bcb0?s=60&d=mm&r=g" class="gravatar" alt="Jason Hendriks " /></a>
 					<a class="web" href="http://profiles.wordpress.org/matt">Jason Hendriks</a>
-					<span class="title"><?php esc_html_e( 'Founding Developer (abandoned)', Postman::TEXT_DOMAIN ); ?></span>
+					<span class="title"><?php esc_html_e( 'Founding Developer (abandoned)', 'post-smtp' ); ?></span>
 				</li>
 				<li class="wp-person" id="wp-person-yehudah">
 					<a href="http://profiles.wordpress.org/yehudah"><img src="https://secure.gravatar.com/avatar/c561638d04ea8fef351f974dbb9ece39?s=60&d=mm&r=g" class="gravatar" alt="Yehuda Hassine" /></a>
 					<a class="web" href="http://profiles.wordpress.org/yehudah">Yehuda Hassine</a>
-					<span class="title"><?php esc_html_e( 'Lead Developer', Postman::TEXT_DOMAIN ); ?></span>
+					<span class="title"><?php esc_html_e( 'Lead Developer', 'post-smtp' ); ?></span>
 				</li>
 			</ul>
 
-			<h4 class="wp-people-group"><?php esc_html_e( 'Top Community Members', Postman::TEXT_DOMAIN ); ?></h4>
-			<h5><?php esc_html_e( 'Here I will list top users that help Post SMTP grow (bugs, features, etc...)', Postman::TEXT_DOMAIN ); ?>
+			<h4 class="wp-people-group"><?php esc_html_e( 'Top Community Members', 'post-smtp' ); ?></h4>
+			<h5><?php esc_html_e( 'Here I will list top users that help Post SMTP grow (bugs, features, etc...)', 'post-smtp' ); ?>
 			<p class="wp-credits-list">
 				<a href="http://profiles.wordpress.org/diegocanal">diegocanal</a>,
 				<a href="http://profiles.wordpress.org/jyourstone">Johan Yourstone</a>,
@@ -209,7 +209,7 @@ class PostmanWelcomeController {
 			</p>
 
 			<div class="return-to-dashboard">
-				<a href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'postman' ), 'admin.php' ) ) ); ?>"><?php esc_html_e( 'Go to Post SMTP Settings', Postman::TEXT_DOMAIN ); ?></a>
+				<a href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'postman' ), 'admin.php' ) ) ); ?>"><?php esc_html_e( 'Go to Post SMTP Settings', 'post-smtp' ); ?></a>
 			</div>
 
 		</div>