Changes to "plan"

.github/ISSUE_TEMPLATE/config.yml

@@ -8,4 +8,4 @@ contact_links:
       about: Read the GitLens support documentation
     - name: GitKraken Support
       url: https://gitkraken.com/gitlens-support
-      about: Get email support for issues and questions on paid features or relating to your GitKraken account or subscription
+      about: Get email support for issues and questions on paid features or relating to your GitKraken account or plan

package.json

@@ -3937,7 +3937,7 @@
 					"gitlens.plusFeatures.enabled": {
 						"type": "boolean",
 						"default": true,
-						"markdownDescription": "Specifies whether to hide or show features that require a trial or paid subscription and are not accessible given the opened repositories and current trial or subscription",
+						"markdownDescription": "Specifies whether to hide or show features that require a trial or paid plan and are not accessible given the opened repositories and current trial or plan",
 						"scope": "window",
 						"order": 60
 					},
@@ -14134,12 +14134,12 @@
 			},
 			{
 				"view": "gitlens.views.workspaces",
-				"contents": "[Create Cloud Workspace](command:gitlens.views.workspaces.create)\n\n☁️ Access is based on your subscription, e.g. Free, Pro, etc",
+				"contents": "[Create Cloud Workspace](command:gitlens.views.workspaces.create)\n\n☁️ Access is based on your plan, e.g. Free, Pro, etc",
 				"when": "gitlens:plus"
 			},
 			{
 				"view": "gitlens.views.workspaces",
-				"contents": "[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day Pro trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your subscription, e.g. Free, Pro, etc",
+				"contents": "[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day Pro trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc",
 				"when": "!gitlens:plus"
 			},
 			{
@@ -14159,17 +14159,17 @@
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign in](command:gitlens.plus.loginOrSignUp) to start a full 7-day Pro trial.\n✨ A trial or paid subscription is required to use this on privately hosted repos.",
+				"contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign in](command:gitlens.plus.loginOrSignUp) to start a full 7-day Pro trial.\n✨ A trial or paid plan is required to use this on privately hosted repos.",
 				"when": "gitlens:plus:required && gitlens:plus:state == 0"
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.loginOrSignUp).\n\n[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n✨ A trial or paid subscription is required to use this on privately hosted repos.",
+				"contents": "Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.loginOrSignUp).\n\n[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n✨ A trial or paid plan is required to use this on privately hosted repos.",
 				"when": "gitlens:plus:required && gitlens:plus:state == 2"
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "Your Pro trial has ended, please upgrade to continue to use this on privately hosted repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)\n✨ A paid subscription is required to use this on privately hosted repos.",
+				"contents": "Your Pro trial has ended, please upgrade to continue to use this on privately hosted repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)\n✨ A paid plan is required to use this on privately hosted repos.",
 				"when": "gitlens:plus:required && gitlens:plus:state == 4"
 			}
 		],
@@ -14434,7 +14434,7 @@
 					{
 						"id": "gitlens.welcome.trial",
 						"title": "Trialing GitLens Pro",
-						"description": "During your trial, you have access to ✨ features on privately hosted repos and ☁️ features based on the Pro tier. [Learn more](https://www.gitkraken.com/gitlens/plus-features)\n\n[Upgrade to Pro](command:gitlens.plus.purchase)",
+						"description": "During your trial, you have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. [Learn more](https://www.gitkraken.com/gitlens/plus-features)\n\n[Upgrade to Pro](command:gitlens.plus.purchase)",
 						"media": {
 							"markdown": "walkthroughs/welcome/trial.md"
 						},

src/commands/quickCommand.steps.ts

@@ -2425,9 +2425,9 @@ export async function* ensureAccessStep<
 	} else {
 		if (access.subscription.required == null) return undefined;
 
-		placeholder = '✨ Requires a trial or paid subscription for use on privately hosted repos';
+		placeholder = '✨ Requires a trial or paid plan for use on privately hosted repos';
 		if (isSubscriptionPaidPlan(access.subscription.required) && access.subscription.current.account != null) {
-			placeholder = '✨ Requires a paid subscription for use on privately hosted repos';
+			placeholder = '✨ Requires a paid plan for use on privately hosted repos';
 			directives.push(createDirectiveQuickPickItem(Directive.RequiresPaidSubscription, true));
 		} else if (
 			access.subscription.current.account == null &&

src/errors.ts

@@ -12,9 +12,9 @@ export class AccessDeniedError extends Error {
 		if (subscription.account?.verified === false) {
 			message = 'Email verification required';
 		} else if (required != null && isSubscriptionPaidPlan(required)) {
-			message = 'Paid subscription required';
+			message = 'Paid plan required';
 		} else {
-			message = 'Subscription required';
+			message = 'Plan required';
 		}
 
 		super(message);

src/git/remotes/richRemoteProvider.ts

@@ -509,7 +509,7 @@ export abstract class RichRemoteProvider extends RemoteProvider {
 }
 
 export async function ensurePaidPlan(providerName: string, container: Container): Promise<boolean> {
-	const title = `Connecting to a ${providerName} instance for rich integration features requires a trial or paid subscription.`;
+	const title = `Connecting to a ${providerName} instance for rich integration features requires a trial or paid plan.`;
 
 	while (true) {
 		const subscription = await container.subscription.getSubscription();
@@ -539,7 +539,7 @@ export async function ensurePaidPlan(providerName: string, container: Container)
 			const startTrial = { title: 'Preview Pro' };
 			const cancel = { title: 'Cancel', isCloseAffordance: true };
 			const result = await window.showWarningMessage(
-				`${title}\n\nDo you want to preview Pro features for 3 days?`,
+				`${title}\n\nDo you want to preview ✨ features for 3 days?`,
 				{ modal: true },
 				startTrial,
 				cancel,
@@ -553,7 +553,7 @@ export async function ensurePaidPlan(providerName: string, container: Container)
 			const signIn = { title: 'Start Free Pro Trial' };
 			const cancel = { title: 'Cancel', isCloseAffordance: true };
 			const result = await window.showWarningMessage(
-				`${title}\n\nDo you want to continue to use Pro features on privately hosted repos, free for an additional 7 days?`,
+				`${title}\n\nDo you want to continue to use ✨ features on privately hosted repos, free for an additional 7 days?`,
 				{ modal: true },
 				signIn,
 				cancel,
@@ -568,7 +568,7 @@ export async function ensurePaidPlan(providerName: string, container: Container)
 			const upgrade = { title: 'Upgrade to Pro' };
 			const cancel = { title: 'Cancel', isCloseAffordance: true };
 			const result = await window.showWarningMessage(
-				`${title}\n\nDo you want to continue to use Pro features on privately hosted repos?`,
+				`${title}\n\nDo you want to continue to use ✨ features on privately hosted repos?`,
 				{ modal: true },
 				upgrade,
 				cancel,

src/plus/subscription/subscriptionService.ts

@@ -468,7 +468,7 @@ export class SubscriptionService implements Disposable {
 				const confirm: MessageItem = { title: 'Start Free Pro Trial', isCloseAffordance: true };
 				const cancel: MessageItem = { title: 'Cancel' };
 				const result = await window.showInformationMessage(
-					'Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days.\n\n✨ A trial or paid subscription is required to use Pro features on privately hosted repos.',
+					'Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days.\n\n✨ A trial or paid plan is required to use Pro features on privately hosted repos.',
 					{ modal: true },
 					confirm,
 					cancel,

src/quickpicks/items/directive.ts

@@ -56,7 +56,7 @@ export function createDirectiveQuickPickItem(
 				break;
 			case Directive.RequiresPaidSubscription:
 				label = 'Upgrade to Pro';
-				detail = 'A paid subscription is required to use this on privately hosted repos';
+				detail = 'A paid plan is required to use this on privately hosted repos';
 				break;
 		}
 	}

src/views/nodes/worktreesNode.ts

@@ -58,7 +58,7 @@ export class WorktreesNode extends ViewNode {
 		item.contextValue = ContextValues.Worktrees;
 		item.description = access.allowed
 			? undefined
-			: ` ${GlyphChars.Warning}  Requires a trial or paid subscription for use on privately hosted repos`;
+			: ` ${GlyphChars.Warning}  Requires a trial or paid plan for use on privately hosted repos`;
 		// TODO@eamodio `folder` icon won't work here for some reason
 		item.iconPath = new ThemeIcon('folder-opened');
 		return item;

src/webviews/apps/home/home.html

@@ -307,8 +307,8 @@
 				>
 			</nav>
 			<p class="t-subtle">
-				✨ Requires a trial or paid subscription to use this on privately hosted repos. <br />
-				☁️ Requires an account and access is based on your subscription, e.g. Free, Pro, etc
+				✨ Requires a trial or paid plan to use this on privately hosted repos. <br />
+				☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc
 			</p>
 		</main>
 

src/webviews/apps/plus/account/components/account-content.ts

@@ -185,7 +185,7 @@ export class AccountContent extends LitElement {
 					</button-container>
 					<p>
 						You only have access to ✨ features on local and publicly hosted repos and ☁️ features based on
-						your subscription, e.g. Free, Pro, etc.
+						your plan, e.g. Free, Pro, etc.
 					</p>
 				`;
 
@@ -199,7 +199,7 @@ export class AccountContent extends LitElement {
 						<gk-button full href="command:gitlens.plus.purchase">Upgrade to Pro</gk-button>
 					</button-container>
 					<p>
-						You have access to ✨ features on privately hosted repos and ☁️ features based on the Pro tier
+						You have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan
 						during your trial.
 					</p>
 				`;
@@ -211,10 +211,7 @@ export class AccountContent extends LitElement {
 							>Manage Account</gk-button
 						>
 					</button-container>
-					<p>
-						You have access to ✨ features on privately hosted repos and ☁️ features based on your
-						subscription.
-					</p>
+					<p>You have access to ✨ features on privately hosted repos and ☁️ features based on your plan.</p>
 				`;
 		}
 

src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts

@@ -78,7 +78,7 @@ export class FeatureGatePlusState extends LitElement {
 						Preview Pro for 3 days, or
 						<a href="command:gitlens.plus.loginOrSignUp">sign in</a> to start a full 7-day Pro trial.
 					</p>
-					<p>✨ A trial or paid subscription is required to use this on privately hosted repos.</p>
+					<p>✨ A trial or paid plan is required to use this on privately hosted repos.</p>
 				`;
 
 			case SubscriptionState.FreePreviewTrialExpired:
@@ -90,7 +90,7 @@ export class FeatureGatePlusState extends LitElement {
 					<gk-button appearance="${appearance}" href="command:gitlens.plus.loginOrSignUp"
 						>Start Free Pro Trial</gk-button
 					>
-					<p>✨ A trial or paid subscription is required to use this on privately hosted repos.</p>
+					<p>✨ A trial or paid plan is required to use this on privately hosted repos.</p>
 				`;
 
 			case SubscriptionState.FreePlusTrialExpired:
@@ -99,7 +99,7 @@ export class FeatureGatePlusState extends LitElement {
 					<gk-button appearance="${appearance}" href="command:gitlens.plus.purchase"
 						>Upgrade to Pro</gk-button
 					>
-					<p>✨ A paid subscription is required to use this on privately hosted repos.</p>
+					<p>✨ A paid plan is required to use this on privately hosted repos.</p>
 				`;
 		}
 

src/webviews/apps/settings/partials/commit-graph.html

@@ -1,9 +1,7 @@
 <section id="commit-graph" class="section--settings section--collapsible">
 	<div class="section__header">
 		<h2>
-			Commit Graph&nbsp;<span title="Requires a trial or paid subscription for use on privately hosted repos"
-				>✨</span
-			>
+			Commit Graph&nbsp;<span title="Requires a trial or paid plan for use on privately hosted repos">✨</span>
 			<a
 				class="link__learn-more"
 				title="Learn more"

src/webviews/apps/settings/partials/views.worktrees.html

@@ -1,9 +1,7 @@
 <section id="worktrees-view" class="section--settings section--collapsible">
 	<div class="section__header">
 		<h2>
-			Worktrees view&nbsp;<span title="Requires a trial or paid subscription for use on privately hosted repos"
-				>✨</span
-			>
+			Worktrees view&nbsp;<span title="Requires a trial or paid plan for use on privately hosted repos">✨</span>
 			<a
 				class="link__learn-more"
 				title="Learn more"

src/webviews/apps/shared/components/feature-gate-badge.ts

@@ -118,18 +118,18 @@ export class FeatureGateBadge extends LitElement {
 			case SubscriptionState.Free:
 			case SubscriptionState.FreePreviewTrialExpired:
 				return html`<span class="badge-footnote"
-					>✨ Requires a trial or paid subscription for use on privately hosted repos.</span
+					>✨ Requires a trial or paid plan for use on privately hosted repos.</span
 				>`;
 			case SubscriptionState.FreePlusTrialExpired:
 			case SubscriptionState.FreeInPreviewTrial:
 			case SubscriptionState.FreePlusInTrial:
 				return html`<span class="badge-footnote"
-					>✨ Requires a paid subscription for use on privately hosted repos.</span
+					>✨ Requires a paid plan for use on privately hosted repos.</span
 				>`;
 			case SubscriptionState.Paid:
 				/* prettier-ignore */
 				return html`<span class="badge-footnote"
-					>You have access to ✨ features on privately hosted repos and ☁️ features based on your subscription.</span
+					>You have access to ✨ features on privately hosted repos and ☁️ features based on your plan.</span
 				>`;
 			default:
 				return nothing;

src/webviews/apps/welcome/welcome.html

@@ -62,11 +62,11 @@
 					<p>
 						✨ require a
 						<a class="muted" href="https://www.gitkraken.com/gitlens/pricing" title="Learn more"
-							>trial or paid subscription</a
+							>trial or paid plan</a
 						>
 						for use on privately hosted repos
 						<br />
-						☁️ require an account and access is based on your subscription, e.g. Free, Pro, etc
+						☁️ require an account and access is based on your plan, e.g. Free, Pro, etc
 					</p>
 				</div>
 				<h3 class="checkbox-group">
@@ -542,9 +542,9 @@
 		</main>
 		<footer>
 			<p>
-				✨ Requires a trial or paid subscription for use on privately hosted repos
+				✨ Requires a trial or paid plan for use on privately hosted repos
 				<br />
-				☁️ Requires an account and access is based on your subscription, e.g. Free, Pro, etc
+				☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc
 			</p>
 		</footer>
 		#{endOfBody}