From e02a937789202e4489550dc8f6aa8c052284e749 Mon Sep 17 00:00:00 2001 From: supkasar <157565053+supkasar@users.noreply.github.com> Date: Tue, 7 May 2024 12:57:50 +0530 Subject: [PATCH 1/4] docs: Update package.nls.json --- packages/fx-core/resource/package.nls.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/fx-core/resource/package.nls.json b/packages/fx-core/resource/package.nls.json index a0d608a50e..65146fe60a 100644 --- a/packages/fx-core/resource/package.nls.json +++ b/packages/fx-core/resource/package.nls.json @@ -774,25 +774,25 @@ "error.teamsApp.validate.apiFailed": "Teams app package validation failed due to %s", "error.teamsApp.validate.apiFailed.display": "Teams app pacakge validation failed. Check [Output panel](command:fx-extension.showOutputChannel) for details.", "error.teamsApp.validate.details": "File path: %s, title: %s", - "error.teamsApp.AppIdNotExistError": "Teams app with ID %s does not exist in Teams Developer Portal.", + "error.teamsApp.AppIdNotExistError": "Teams app with ID %s doesn't exist in Teams Developer Portal.", "error.teamsApp.InvalidAppIdError": "Teams app ID %s is invalid, must be a GUID.", "error.teamsApp.createAppPackage.invalidFile": "%s is invalid, it should be in the same directory as manifest.json or a subdirectory of it.", "driver.botFramework.description": "creates or updates the bot registration on dev.botframework.com", - "driver.botFramework.summary.create": "The bot registration has been created successfully (%s).", - "driver.botFramework.summary.update": "The bot registration has been updated successfully (%s).", + "driver.botFramework.summary.create": "Bot registration created successfully (%s).", + "driver.botFramework.summary.update": "Bot registration updated successfully (%s).", "driver.botFramework.progressBar.createOrUpdateBot": "Creating or updating bot registration.", "driver.botFramework.error.InvalidBotId": "Bot ID %s is invalid. It must be a GUID.", - "error.yaml.InvalidYamlSchemaError": "Unable to parse yaml file: %s. Please open the yaml file for detailed errors.", - "error.yaml.InvalidYamlSchemaErrorWithReason": "Unable to parse yaml file: %s. Reason: %s Please review the yaml file or upgrade to the latest Teams Toolkit.", + "error.yaml.InvalidYamlSchemaError": "Unable to parse yaml file: %s. Open the yaml file for detailed errors.", + "error.yaml.InvalidYamlSchemaErrorWithReason": "Unable to parse yaml file: %s. Reason: %s Review the yaml file or upgrade to the latest Teams Toolkit.", "error.yaml.VersionNotSupported": "version %s is not supported. Supported versions: %s.", "error.yaml.YamlFieldTypeError": "Field '%s' should have %s type, yaml file: %s", "error.yaml.YamlFieldMissingError": "Field '%s' is missing, yaml file: %s", "error.yaml.InvalidYmlActionNameError": "Action '%s' not found, yaml file: %s", "error.yaml.LifeCycleUndefinedError": "Lifecycle '%s' is undefined, yaml file: %s", - "error.yaml.InvalidActionInputError": "The '%s' action cannot be completed as the following parameter(s): %s, are either missing or have an invalid value in the provided yaml file: %s. Ensure that the required parameters are provided and have valid values and try again.", - "error.common.InstallSoftwareError": "Unable to install %s. You can install it manually and restart Visual Studio Code if you are using the Toolkit in Visual Studio Code.", - "error.common.VersionError": "Unable to find a version satisfying the version range %s.", - "error.common.MissingEnvironmentVariablesError": "The program cannot proceed as the following environment variables are missing: '%s', which are required for file: %s. Make sure the required variables are set either by editing the .env file '%s' with the correct names and values , or by setting the system environment variables with the correct names and values. If you are developing with a new project created with Teams Toolkit, running provision or debug will register correct values for these environment variables.", + "error.yaml.InvalidActionInputError": "The '%s' action can't be completed as the following parameter(s): %s are either missing or have an invalid value in the provided yaml file: %s. Make sure the required parameters are provided and have valid values and try again.", + "error.common.InstallSoftwareError": "Unable to install %s. Install it manually and restart Visual Studio Code if you are using the Toolkit in Visual Studio Code.", + "error.common.VersionError": "Unable to find a suitable version within the version range %s.", + "error.common.MissingEnvironmentVariablesError": "The program can't proceed as the following environment variables are missing: '%s', which are required for file: %s. Make sure the required variables are set either by editing the .env file '%s' with the correct names and values , or by setting the system environment variables with the correct names and values. If you are developing with a new project created with Teams Toolkit, running provision or debug will register correct values for these environment variables.", "error.common.InvalidProjectError": "This command only works for project created by Teams Toolkit.", "error.common.FileNotFoundError": "The file or directory is not found: '%s'. Check if it exists and you have permission to access it.", "error.common.JSONSyntaxError": "JSON syntax error: %s. Check the JSON syntax to ensure it is properly formatted.", From 722a8572a407a727ac2b3e56aeab3973663efb97 Mon Sep 17 00:00:00 2001 From: supkasar <157565053+supkasar@users.noreply.github.com> Date: Tue, 7 May 2024 13:47:31 +0530 Subject: [PATCH 2/4] Update parser.test.ts --- packages/fx-core/tests/component/configManager/parser.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fx-core/tests/component/configManager/parser.test.ts b/packages/fx-core/tests/component/configManager/parser.test.ts index e3c68271d4..b752c594f1 100644 --- a/packages/fx-core/tests/component/configManager/parser.test.ts +++ b/packages/fx-core/tests/component/configManager/parser.test.ts @@ -253,7 +253,7 @@ describe("v3 yaml parser", () => { chai .expect(errorMsg) .includes(`Unable to parse yaml file`) - .and.includes(`Please open the yaml file`); + .and.includes(`Open the yaml file for detailed errors`); result = await parser.parse( path.resolve(__dirname, "testing_data", "invalid_write_to_environment_file_number.yml"), From a74cd3bb1553ae8a04c251ce6d380639ea876c14 Mon Sep 17 00:00:00 2001 From: supkasar <157565053+supkasar@users.noreply.github.com> Date: Tue, 7 May 2024 13:49:44 +0530 Subject: [PATCH 3/4] Update create.test.ts --- packages/fx-core/tests/component/driver/aad/create.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fx-core/tests/component/driver/aad/create.test.ts b/packages/fx-core/tests/component/driver/aad/create.test.ts index 68db635b0b..b2c7bc8978 100644 --- a/packages/fx-core/tests/component/driver/aad/create.test.ts +++ b/packages/fx-core/tests/component/driver/aad/create.test.ts @@ -711,6 +711,6 @@ describe("aadAppCreate", async () => { expect(result.result._unsafeUnwrapErr()) .is.instanceOf(UserError) .and.has.property("message") - .and.contains("action cannot be completed as the following parameter(s):"); + .and.contains("action can't be completed as the following parameter(s):"); }); }); From bdaa684314513bcca538a3e2acc28bfd586deec4 Mon Sep 17 00:00:00 2001 From: supkasar <157565053+supkasar@users.noreply.github.com> Date: Tue, 7 May 2024 13:50:58 +0530 Subject: [PATCH 4/4] Update FxCore.test.ts --- packages/fx-core/tests/core/FxCore.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fx-core/tests/core/FxCore.test.ts b/packages/fx-core/tests/core/FxCore.test.ts index 3af56b76d6..52304d0bd0 100644 --- a/packages/fx-core/tests/core/FxCore.test.ts +++ b/packages/fx-core/tests/core/FxCore.test.ts @@ -431,7 +431,7 @@ describe("Core basic APIs", () => { // Cannot assert the full message because the mocked code can't get correct env file path assert.include( res.error.message, - "The program cannot proceed as the following environment variables are missing: 'AAD_APP_OBJECT_ID', which are required for file: fake path. Make sure the required variables are set either by editing the .env file" + "The program can't proceed as the following environment variables are missing: 'AAD_APP_OBJECT_ID', which are required for file: fake path. Make sure the required variables are set either by editing the .env file" ); assert.include( res.error.message,