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

Fixes #1, deprecates and replaces variable text domain usage

1 files changed, 33 insertions, 33 deletions

diff --git a/Postman/PostmanConfigTextHelper.php b/Postman/PostmanConfigTextHelper.php
index bcae7f5..6bc23fe 100644
--- a/Postman/PostmanConfigTextHelper.php
+++ b/Postman/PostmanConfigTextHelper.php
@@ -28,8 +28,8 @@ if ( ! class_exists( 'PostmanAbstractConfigTextHelper' ) ) {
 	 */
 	abstract class PostmanAbstractConfigTextHelper implements PostmanConfigTextHelper {
 		public function getOAuthHelp() {
-			$attention = __( 'Attention', Postman::TEXT_DOMAIN );
-			$errorMessage = sprintf( __('Check this article how to configure Gmail/Gsuite OAuth:<a href="%1$s" target="_blank">Read Here</a>', Postman::TEXT_DOMAIN ), 'https://postmansmtp.com/how-to-configure-post-smtp-with-gmailgsuite-using-oauth/' );
+			$attention = __( 'Attention', 'post-smtp' );
+			$errorMessage = sprintf( __('Check this article how to configure Gmail/Gsuite OAuth:<a href="%1$s" target="_blank">Read Here</a>', 'post-smtp' ), 'https://postmansmtp.com/how-to-configure-post-smtp-with-gmailgsuite-using-oauth/' );
 			$text = sprintf( '<b style="color:red">%s!</b> %s', $attention, $errorMessage );
 			
 			return $text;
@@ -48,7 +48,7 @@ if ( ! class_exists( 'PostmanAbstractConfigTextHelper' ) ) {
 		}
 		public function getRequestPermissionLinkText() {
 			/* translators: where %s is the Email Service Owner (e.g. Google, Microsoft or Yahoo) */
-			return sprintf( _x( 'Grant permission with %s', 'Command to initiate OAuth authentication', Postman::TEXT_DOMAIN ), $this->getOwnerName() );
+			return sprintf( _x( 'Grant permission with %s', 'Command to initiate OAuth authentication', 'post-smtp' ), $this->getOwnerName() );
 		}
 	}
 }
@@ -74,35 +74,35 @@ if ( ! class_exists( 'PostmanGoogleOAuthScribe' ) ) {
 		}
 		public function getClientIdLabel() {
 			/* Translators: This description is specific to Google */
-			return _x( 'Client ID', 'Name of the OAuth 2.0 Client ID', Postman::TEXT_DOMAIN );
+			return _x( 'Client ID', 'Name of the OAuth 2.0 Client ID', 'post-smtp' );
 		}
 		public function getClientSecretLabel() {
 			/* Translators: This description is specific to Google */
-			return _x( 'Client Secret', 'Name of the OAuth 2.0 Client Secret', Postman::TEXT_DOMAIN );
+			return _x( 'Client Secret', 'Name of the OAuth 2.0 Client Secret', 'post-smtp' );
 		}
 		public function getCallbackUrlLabel() {
 			/* Translators: This description is specific to Google */
-			return _x( 'Authorized redirect URI', 'Name of the Application Callback URI', Postman::TEXT_DOMAIN );
+			return _x( 'Authorized redirect URI', 'Name of the Application Callback URI', 'post-smtp' );
 		}
 		public function getCallbackDomainLabel() {
 			/* Translators: This description is specific to Google */
-			return _x( 'Authorized JavaScript origins', 'Name of the Application Callback Domain', Postman::TEXT_DOMAIN );
+			return _x( 'Authorized JavaScript origins', 'Name of the Application Callback Domain', 'post-smtp' );
 		}
 		public function getOwnerName() {
 			/* Translators: This description is specific to Google */
-			return _x( 'Google', 'Name of the email service owner', Postman::TEXT_DOMAIN );
+			return _x( 'Google', 'Name of the email service owner', 'post-smtp' );
 		}
 		public function getServiceName() {
 			/* Translators: This description is specific to Google */
-			return _x( 'Gmail', 'Name of the email service', Postman::TEXT_DOMAIN );
+			return _x( 'Gmail', 'Name of the email service', 'post-smtp' );
 		}
 		public function getApplicationDescription() {
 			/* Translators: This description is specific to Google */
-			return _x( 'a Client ID for web application', 'Description of the email service OAuth 2.0 Application', Postman::TEXT_DOMAIN );
+			return _x( 'a Client ID for web application', 'Description of the email service OAuth 2.0 Application', 'post-smtp' );
 		}
 		public function getApplicationPortalName() {
 			/* Translators: This description is specific to Google */
-			return _x( 'Google Developers Console Gmail Wizard', 'Name of the email service portal', Postman::TEXT_DOMAIN );
+			return _x( 'Google Developers Console Gmail Wizard', 'Name of the email service portal', 'post-smtp' );
 		}
 		public function getApplicationPortalUrl() {
 			return 'https://www.google.com/accounts/Logout?continue=https://console.developers.google.com/start/api?id=gmail';
@@ -136,35 +136,35 @@ if ( ! class_exists( 'PostmanMicrosoftOAuthScribe' ) ) {
 		}
 		public function getClientIdLabel() {
 			/* Translators: This description is specific to Microsoft */
-			return _x( 'Client ID', 'Name of the OAuth 2.0 Client ID', Postman::TEXT_DOMAIN );
+			return _x( 'Client ID', 'Name of the OAuth 2.0 Client ID', 'post-smtp' );
 		}
 		public function getClientSecretLabel() {
 			/* Translators: This description is specific to Microsoft */
-			return _x( 'Client Secret', 'Name of the OAuth 2.0 Client Secret', Postman::TEXT_DOMAIN );
+			return _x( 'Client Secret', 'Name of the OAuth 2.0 Client Secret', 'post-smtp' );
 		}
 		public function getCallbackUrlLabel() {
 			/* Translators: This description is specific to Microsoft */
-			return _x( 'Redirect URL', 'Name of the Application Callback URI', Postman::TEXT_DOMAIN );
+			return _x( 'Redirect URL', 'Name of the Application Callback URI', 'post-smtp' );
 		}
 		public function getCallbackDomainLabel() {
 			/* Translators: This description is specific to Microsoft */
-			return _x( 'Root Domain', 'Name of the Application Callback Domain', Postman::TEXT_DOMAIN );
+			return _x( 'Root Domain', 'Name of the Application Callback Domain', 'post-smtp' );
 		}
 		public function getOwnerName() {
 			/* Translators: This description is specific to Microsoft */
-			return _x( 'Microsoft', 'Name of the email service owner', Postman::TEXT_DOMAIN );
+			return _x( 'Microsoft', 'Name of the email service owner', 'post-smtp' );
 		}
 		public function getServiceName() {
 			/* Translators: This description is specific to Microsoft */
-			return _x( 'Outlook.com', 'Name of the email service', Postman::TEXT_DOMAIN );
+			return _x( 'Outlook.com', 'Name of the email service', 'post-smtp' );
 		}
 		public function getApplicationDescription() {
 			/* Translators: This description is specific to Microsoft */
-			return _x( 'an Application', 'Description of the email service OAuth 2.0 Application', Postman::TEXT_DOMAIN );
+			return _x( 'an Application', 'Description of the email service OAuth 2.0 Application', 'post-smtp' );
 		}
 		public function getApplicationPortalName() {
 			/* Translators: This description is specific to Microsoft */
-			return _x( 'Microsoft Developer Center', 'Name of the email service portal', Postman::TEXT_DOMAIN );
+			return _x( 'Microsoft Developer Center', 'Name of the email service portal', 'post-smtp' );
 		}
 		public function getApplicationPortalUrl() {
 			return 'https://account.live.com/developers/applications/index';
@@ -198,35 +198,35 @@ if ( ! class_exists( 'PostmanYahooOAuthScribe' ) ) {
 		}
 		public function getClientIdLabel() {
 			/* Translators: This description is specific to Yahoo */
-			return _x( 'Client ID', 'Name of the OAuth 2.0 Client ID', Postman::TEXT_DOMAIN );
+			return _x( 'Client ID', 'Name of the OAuth 2.0 Client ID', 'post-smtp' );
 		}
 		public function getClientSecretLabel() {
 			/* Translators: This description is specific to Yahoo */
-			return _x( 'Client Secret', 'Name of the OAuth 2.0 Client Secret', Postman::TEXT_DOMAIN );
+			return _x( 'Client Secret', 'Name of the OAuth 2.0 Client Secret', 'post-smtp' );
 		}
 		public function getCallbackUrlLabel() {
 			/* Translators: This description is specific to Yahoo */
-			return _x( 'Home Page URL', 'Name of the Application Callback URI', Postman::TEXT_DOMAIN );
+			return _x( 'Home Page URL', 'Name of the Application Callback URI', 'post-smtp' );
 		}
 		public function getCallbackDomainLabel() {
 			/* Translators: This description is specific to Yahoo */
-			return _x( 'Callback Domain', 'Name of the Application Callback Domain', Postman::TEXT_DOMAIN );
+			return _x( 'Callback Domain', 'Name of the Application Callback Domain', 'post-smtp' );
 		}
 		public function getOwnerName() {
 			/* Translators: This description is specific to Yahoo */
-			return _x( 'Yahoo', 'Name of the email service owner', Postman::TEXT_DOMAIN );
+			return _x( 'Yahoo', 'Name of the email service owner', 'post-smtp' );
 		}
 		public function getServiceName() {
 			/* Translators: This description is specific to Yahoo */
-			return _x( 'Yahoo Mail', 'Name of the email service', Postman::TEXT_DOMAIN );
+			return _x( 'Yahoo Mail', 'Name of the email service', 'post-smtp' );
 		}
 		public function getApplicationDescription() {
 			/* Translators: This description is specific to Yahoo */
-			return _x( 'an Application', 'Description of the email service OAuth 2.0 Application', Postman::TEXT_DOMAIN );
+			return _x( 'an Application', 'Description of the email service OAuth 2.0 Application', 'post-smtp' );
 		}
 		public function getApplicationPortalName() {
 			/* Translators: This description is specific to Yahoo */
-			return _x( 'Yahoo Developer Network', 'Name of the email service portal', Postman::TEXT_DOMAIN );
+			return _x( 'Yahoo Developer Network', 'Name of the email service portal', 'post-smtp' );
 		}
 		public function getApplicationPortalUrl() {
 			return 'https://developer.yahoo.com/apps/';
@@ -255,7 +255,7 @@ if ( ! class_exists( 'PostmanNonOAuthScribe' ) ) {
 			return PostmanUtils::endsWith( $this->hostname, 'yahoo.com' );
 		}
 		public function getOAuthHelp() {
-			$text = __( 'Enter an Outgoing Mail Server with OAuth2 capabilities.', Postman::TEXT_DOMAIN );
+			$text = __( 'Enter an Outgoing Mail Server with OAuth2 capabilities.', 'post-smtp' );
 			return sprintf( '<span style="color:red" class="normal">%s</span>', $text );
 		}
 		public function getCallbackUrl() {
@@ -265,16 +265,16 @@ if ( ! class_exists( 'PostmanNonOAuthScribe' ) ) {
 			return '';
 		}
 		public function getClientIdLabel() {
-			return _x( 'Client ID', 'Name of the OAuth 2.0 Client ID', Postman::TEXT_DOMAIN );
+			return _x( 'Client ID', 'Name of the OAuth 2.0 Client ID', 'post-smtp' );
 		}
 		public function getClientSecretLabel() {
-			return _x( 'Client Secret', 'Name of the OAuth 2.0 Client Secret', Postman::TEXT_DOMAIN );
+			return _x( 'Client Secret', 'Name of the OAuth 2.0 Client Secret', 'post-smtp' );
 		}
 		public function getCallbackUrlLabel() {
-			return _x( 'Redirect URI', 'Name of the Application Callback URI', Postman::TEXT_DOMAIN );
+			return _x( 'Redirect URI', 'Name of the Application Callback URI', 'post-smtp' );
 		}
 		public function getCallbackDomainLabel() {
-			return _x( 'Website Domain', 'Name of the Application Callback Domain', Postman::TEXT_DOMAIN );
+			return _x( 'Website Domain', 'Name of the Application Callback Domain', 'post-smtp' );
 		}
 		public function getOwnerName() {
 			return '';
@@ -298,7 +298,7 @@ if ( ! class_exists( 'PostmanNonOAuthScribe' ) ) {
 			return '';
 		}
 		public function getRequestPermissionLinkText() {
-			return __( 'Grant OAuth 2.0 Permission', Postman::TEXT_DOMAIN );
+			return __( 'Grant OAuth 2.0 Permission', 'post-smtp' );
 		}
 	}
 }