From e6fa3e034645855fdcfb1bc54021def5a1f446b2 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 9 Nov 2023 01:06:17 -0500 Subject: [PATCH] Aligns language on GK account --- README.md | 4 ++-- package.json | 4 ++-- src/plus/focus/focusService.ts | 2 +- src/plus/webviews/patchDetails/patchDetailsWebview.ts | 4 ++-- src/uris/deepLinks/deepLinkService.ts | 2 +- src/webviews/apps/home/home.html | 10 +++++----- .../apps/plus/patchDetails/components/gl-patch-create.ts | 2 +- src/webviews/apps/welcome/welcome.html | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index e54748d..c64855a 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Use `Switch to Pre-Release Version` on the extension banner to live on the edge All features are free to use on all repos, **except** for features, - marked with a ✨ require a [trial or paid plan](https://www.gitkraken.com/gitlens/pricing) for use on privately hosted repos -- marked with a ☁️ require a GitKraken Account, with access level based on your [plan](https://www.gitkraken.com/gitlens/pricing), e.g. Free, Pro, etc +- marked with a ☁️ require a GitKraken account, with access level based on your [plan](https://www.gitkraken.com/gitlens/pricing), e.g. Free, Pro, etc See the [FAQ](#is-gitlens-free-to-use 'Jump to FAQ') for more details. @@ -272,7 +272,7 @@ Yes. All features are free to use on all repos, **except** for features, - marked with a ✨ require a [trial or paid plan](https://www.gitkraken.com/gitlens/pricing) for use on privately hosted repos - marked with a ☁️ require a GitKraken Account, with access level based on your [plan](https://www.gitkraken.com/gitlens/pricing), e.g. Free, Pro, etc -While GitLens offers a remarkable set of free features, a subset of features tailored for professional developers and teams, marked with a ✨, require a trial or paid plan for use on privately hosted repos — use on local or publicly hosted repos is free for everyone. Additionally some features marked with a ☁️, rely on GitKraken Dev Services which requires an account and access is based on your plan, e.g. Free, Pro, etc. +While GitLens offers a remarkable set of free features, a subset of features tailored for professional developers and teams, marked with a ✨, require a trial or paid plan for use on privately hosted repos — use on local or publicly hosted repos is free for everyone. Additionally some features marked with a ☁️, rely on GitKraken Dev Services which requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc. Preview ✨ features instantly for free for 3 days without an account, or start a free GitKraken trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens. diff --git a/package.json b/package.json index 286b4d7..654a899 100644 --- a/package.json +++ b/package.json @@ -15316,7 +15316,7 @@ }, { "view": "gitlens.views.drafts", - "contents": "[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day Pro trial to use Cloud Patches, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc", + "contents": "[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day Pro trial to use Cloud Patches, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc", "when": "!gitlens:plus" }, { @@ -15330,7 +15330,7 @@ }, { "view": "gitlens.views.workspaces", - "contents": "[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day GitKraken 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", + "contents": "[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day GitKraken trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc", "when": "!gitlens:plus" }, { diff --git a/src/plus/focus/focusService.ts b/src/plus/focus/focusService.ts index 502b5d6..6b1ef2b 100644 --- a/src/plus/focus/focusService.ts +++ b/src/plus/focus/focusService.ts @@ -107,7 +107,7 @@ export class FocusService implements Disposable { const scope = getLogScope(); try { - if (!(await ensureAccount('Pinning requires an account', this.container))) { + if (!(await ensureAccount('Pinning requires a GitKraken account.', this.container))) { throw new Error('Unable to pin item: account required'); } diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index fba6110..18c301d 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -311,7 +311,7 @@ export class PatchDetailsWebviewProvider return; } - if (!(await ensureAccount('A GitKraken account is required to apply cloud patches.', this.container))) return; + if (!(await ensureAccount('Cloud Patches require a GitKraken account.', this.container))) return; const changeset = this._context.draft.changesets?.[0]; if (changeset == null) return; @@ -350,7 +350,7 @@ export class PatchDetailsWebviewProvider } private async createDraft({ title, changesets, description }: CreatePatchParams): Promise { - if (!(await ensureAccount('A GitKraken account is required to create cloud patches.', this.container))) return; + if (!(await ensureAccount('Cloud patches require a GitKraken account.', this.container))) return; const createChanges: CreateDraftChange[] = []; diff --git a/src/uris/deepLinks/deepLinkService.ts b/src/uris/deepLinks/deepLinkService.ts index 0e0fc12..6133961 100644 --- a/src/uris/deepLinks/deepLinkService.ts +++ b/src/uris/deepLinks/deepLinkService.ts @@ -440,7 +440,7 @@ export class DeepLinkService implements Disposable { if ( !(await ensureAccount( - `A GitKraken account is required to open ${deepLinkTypeToString(targetType)} links.`, + `Opening ${deepLinkTypeToString(targetType)} links requires a GitKraken account.`, this.container, )) ) { diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index af67b48..04cca12 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -225,8 +225,8 @@ >Cloud Patches☁️ @@ -240,8 +240,8 @@ >GitKraken Workspaces☁️ @@ -385,7 +385,7 @@

✨ Requires a trial or paid plan to use this on privately hosted repos.
- ☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc + ☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc

diff --git a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts index 39e0dfc..470c7b4 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts @@ -132,7 +132,7 @@ export class GlPatchCreate extends GlTreeBase { Create Cloud Patch

- `; diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index bf904ef..d1ad0fb 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -603,7 +603,7 @@

✨ Requires a trial or paid plan for use on privately hosted repos
- ☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc + ☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc

#{endOfBody}