Merge pull request #387 from phaumer/polish-incorrect-profile-message

Update incorrect profile message

i18n/sample/src/DatasetTree.i18n.json

@@ -3,8 +3,8 @@
     "initializeFavorites.log.debug": "initializing favorites",
     "initializeFavorites.error.profile1": "Error: You have Zowe Data Set favorites that refer to a non-existent CLI profile named: ",
     "intializeFavorites.error.profile2": ". To resolve this, you can create a profile with this name, ",
-    "initializeFavorites.error.profile3": "or remove the favorites with this profile name from the Zowe-DS-Persistent setting, ",
-    "initializeFavorites.error.profile4": "which can be found in your VS Code user settings.",
+    "initializeFavorites.error.profile3": "or remove the favorites with this profile name from the Zowe-DS-Persistent setting, which can be found in your ",
+    "initializeFavorites.error.profile4": " user settings.",
     "loadNamedProfile.error.profileName": "Initialization Error: Could not find profile named: ",
     "loadNamedProfile.error.period": ".",
     "initializeFavorites.fileCorrupted": "Favorites file corrupted: ",

i18n/sample/src/USSTree.i18n.json

@@ -9,6 +9,6 @@
     "initializeUSSFavorites.lines.title": "Open",
     "initializeUSSFavorites.error.profile1": "Error: You have Zowe USS favorites that refer to a non-existent CLI profile named: ",
     "intializeUSSFavorites.error.profile2": ". To resolve this, you can create a profile with this name, ",
-    "initializeUSSFavorites.error.profile3": "or remove the favorites with this profile name from the Zowe-USS-Persistent setting, ",
-    "initializeUSSFavorites.error.profile4": "which can be found in your VS Code user settings."
+    "initializeUSSFavorites.error.profile3": "or remove the favorites with this profile name from the Zowe-USS-Persistent setting, which can be found in your ",
+    "initializeUSSFavorites.error.profile4": " user settings."
 }

i18n/sample/src/ZosJobsProvider.i18n.json

@@ -5,8 +5,8 @@
     "initializeFavorites.log.debug": "initializing favorites",
     "initializeJobsFavorites.error.profile1": "Error: You have Jobs favorites that refer to a non-existent CLI profile named: ",
     "initializeJobsFavorites.error.profile2": ". To resolve this, you can create a profile with this name, ",
-    "initializeJobsFavorites.error.profile3": "or remove the favorites with this profile name from the Zowe-Jobs-Persistent setting, ",
-    "initializeJobsFavorites.error.profile4": "which can be found in your VS Code user settings.",
+    "initializeJobsFavorites.error.profile3": "or remove the favorites with this profile name from the Zowe-Jobs-Persistent setting, which can be found in your ",
+    "initializeJobsFavorites.error.profile4": " user settings.",
     "searchHistory.options.prompt": "Select a filter",
     "enterPattern.pattern": "No selection made.",
     "jobsFilterPrompt.option.prompt.owner": "Enter the Job Owner. Default is *.",

src/DatasetTree.ts

@@ -17,7 +17,7 @@ import * as nls from "vscode-nls";
 import * as extension from "../src/extension";
 import { PersistentFilters } from "./PersistentFilters";
 import { Profiles } from "./Profiles";
-import { sortTreeItems, applyIcons, FilterDescriptor, FilterItem, resolveQuickPickHelper } from "./utils";
+import { sortTreeItems, applyIcons, FilterDescriptor, FilterItem, getAppName, resolveQuickPickHelper } from "./utils";
 import { IZoweTree } from "./ZoweTree";
 import { ZoweNode } from "./ZoweNode";
 const localize = nls.config({ messageFormat: nls.MessageFormat.file })();
@@ -104,8 +104,8 @@ export class DatasetTree implements IZoweTree<ZoweNode> {
                         localize("intializeFavorites.error.profile2",
                         ". To resolve this, you can create a profile with this name, ") +
                         localize("initializeFavorites.error.profile3",
-                        "or remove the favorites with this profile name from the Zowe-DS-Persistent setting, ") +
-                        localize("initializeFavorites.error.profile4", "which can be found in your VS Code user settings."));
+                        "or remove the favorites with this profile name from the Zowe-DS-Persistent setting, which can be found in your ") +
+                        getAppName(extension.ISTHEIA) + localize("initializeFavorites.error.profile4", " user settings."));
                     continue;
                 }
             } else if (favoriteSearchPattern.test(line)) {

src/USSTree.ts

@@ -12,7 +12,7 @@
 import * as zowe from "@brightside/core";
 // tslint:disable-next-line: no-implicit-dependencies
 import { IProfileLoaded, Logger } from "@brightside/imperative";
-import { applyIcons, FilterItem, FilterDescriptor, resolveQuickPickHelper, sortTreeItems } from "./utils";
+import { applyIcons, FilterItem, FilterDescriptor, getAppName, resolveQuickPickHelper, sortTreeItems } from "./utils";
 import * as vscode from "vscode";
 import { IZoweTree } from "./ZoweTree";
 import { ZoweUSSNode } from "./ZoweUSSNode";
@@ -466,8 +466,8 @@ export class USSTree implements IZoweTree<ZoweUSSNode> {
                     localize("intializeUSSFavorites.error.profile2",
                     ". To resolve this, you can create a profile with this name, ") +
                     localize("initializeUSSFavorites.error.profile3",
-                    "or remove the favorites with this profile name from the Zowe-USS-Persistent setting, ") +
-                    localize("initializeUSSFavorites.error.profile4", "which can be found in your VS Code user settings."));
+                    "or remove the favorites with this profile name from the Zowe-USS-Persistent setting, which can be found in your ") +
+                    getAppName(extension.ISTHEIA) + localize("initializeUSSFavorites.error.profile4", " user settings."));
                 return;
             }
         });

src/ZosJobsProvider.ts

@@ -16,8 +16,17 @@ import { IProfileLoaded, Logger } from "@brightside/imperative";
 import { Profiles } from "./Profiles";
 import { PersistentFilters } from "./PersistentFilters";
 import { Job } from "./ZoweJobNode";
+import {
+    OwnerFilterDescriptor,
+    JobIdFilterDescriptor,
+    applyIcons,
+    FilterItem,
+    FilterDescriptor,
+    getAppName,
+    resolveQuickPickHelper,
+    sortTreeItems
+} from "./utils";
 import { IZoweTree } from "./ZoweTree";
-import { OwnerFilterDescriptor, JobIdFilterDescriptor, applyIcons, FilterItem, FilterDescriptor, resolveQuickPickHelper, sortTreeItems } from "./utils";
 import * as extension from "../src/extension";
 import * as nls from "vscode-nls";
 const localize = nls.config({ messageFormat: nls.MessageFormat.file })();
@@ -258,8 +267,8 @@ export class ZosJobsProvider implements IZoweTree<Job> {
                 localize("initializeJobsFavorites.error.profile2",
                 ". To resolve this, you can create a profile with this name, ") +
                 localize("initializeJobsFavorites.error.profile3",
-                "or remove the favorites with this profile name from the Zowe-Jobs-Persistent setting, ") +
-                localize("initializeJobsFavorites.error.profile4", "which can be found in your VS Code user settings."));
+                "or remove the favorites with this profile name from the Zowe-Jobs-Persistent setting, which can be found in your ") +
+                getAppName(extension.ISTHEIA) + localize("initializeJobsFavorites.error.profile4", " user settings."));
             return;
         }
         });

src/utils.ts

@@ -172,3 +172,10 @@ export function concatChildNodes(nodes: ZoweNode[]) {
 
     return allNodes;
 }
+
+/*************************************************************************************************************
+ * Determine IDE name to display based on app environment
+ *************************************************************************************************************/
+export function getAppName(isTheia: boolean) {
+    return isTheia? "Theia" : "VS Code";
+}