Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ export function CreateOptions(props: CreateOptionsProps) {
const dialogWrapperProps = DialogCreationCopy.CREATE_OPTIONS;

const options: IChoiceGroupOption[] = [
{ key: 'Create', text: formatMessage('Create a new bot') },
{ key: 'Connect', text: formatMessage('Connect to an existing bot') },
{ key: 'Create', text: formatMessage('Use Azure Bot to create a new conversation') },
{ key: 'Connect', text: formatMessage('Apply my Azure Bot resources for an existing bot') },
];

const handleChange = (e, option) => {
Expand Down Expand Up @@ -112,7 +112,7 @@ export function CreateOptions(props: CreateOptionsProps) {
>
<ChoiceGroup required defaultSelectedKey="B" options={options} onChange={handleChange} />
<DialogFooter>
<PrimaryButton data-testid="NextStepButton" text={formatMessage('Open')} onClick={handleJumpToNext} />
<PrimaryButton data-testid="NextStepButton" text={formatMessage('Next')} onClick={handleJumpToNext} />
<DefaultButton text={formatMessage('Cancel')} onClick={onDismiss} />
</DialogFooter>
</DialogWrapper>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ export function CreateOptionsV2(props: CreateOptionsProps) {
};

const options: IChoiceGroupOption[] = [
{ key: 'Create', text: formatMessage('Create a new bot') },
{ key: 'Connect', text: formatMessage('Connect to an existing bot') },
{ key: 'Create', text: formatMessage('Use Azure Bot to create a new conversation') },
{ key: 'Connect', text: formatMessage('Apply my Azure Bot resources for an existing bot') },
];

const handleChange = (e, option) => {
Expand Down Expand Up @@ -133,7 +133,7 @@ export function CreateOptionsV2(props: CreateOptionsProps) {
>
<ChoiceGroup required defaultSelectedKey="Create" options={options} onChange={handleChange} />
<DialogFooter>
<PrimaryButton data-testid="NextStepButton" text={formatMessage('Open')} onClick={handleJumpToNext} />
<PrimaryButton data-testid="NextStepButton" text={formatMessage('Next')} onClick={handleJumpToNext} />
<DefaultButton text={formatMessage('Cancel')} onClick={onDismiss} />
</DialogFooter>
</DialogWrapper>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ export const ManageService = (props: ManageServiceProps) => {
<div css={dialogBodyStyles}>
<p css={{ marginTop: 0 }}>
{formatMessage(
'Select your Azure directory, then choose the subscription where your existing {service} resource is located. ',
'Select your Azure directory, then choose the subscription where your existing {service} resource is located.',
{ service: props.serviceName }
)}
{props.learnMore ? (
Expand Down Expand Up @@ -775,7 +775,7 @@ export const ManageService = (props: ManageServiceProps) => {
<div css={dialogBodyStyles}>
<p css={{ marginTop: 0 }}>
{formatMessage(
'Select your Azure directory, then choose the subscription where you’d like your new {service} resource. ',
'Select your Azure directory, then choose the subscription where you’d like your new {service} resource.',
{ service: props.serviceName }
)}
{props.learnMore ? (
Expand Down
6 changes: 4 additions & 2 deletions Composer/packages/client/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,10 @@ export const BotStatusesCopy = {
export const DialogCreationCopy = {
get CREATE_OPTIONS() {
return {
title: formatMessage('Open your Azure Bot resource'),
subText: formatMessage('Do you want to create a new bot, or connect your Azure Bot resource to an existing bot?'),
title: formatMessage('Your new Azure Bot is available in Composer'),
subText: formatMessage(
'The Azure Bot created in Azure Bot Services contains bot resources that can be used as the basis for a new bot, or to add or replace resources of an existing bot.'
),
};
},
get CREATE_NEW_BOT() {
Expand Down
21 changes: 12 additions & 9 deletions Composer/packages/server/src/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,9 @@
"application_updates_bdf5f8b6": {
"message": "Application Updates"
},
"apply_my_azure_bot_resources_for_an_existing_bot_4979e343": {
"message": "Apply my Azure Bot resources for an existing bot"
},
"are_you_sure_you_want_to_delete_your_bot_this_acti_214a9e11": {
"message": "Are you sure you want to delete your bot? This action cannot be undone and your bot and all related files in the bot project folder will be permanently deleted. Your Azure resources will remain unchanged."
},
Expand Down Expand Up @@ -830,9 +833,6 @@
"connect_to_a_skill_53c9dff0": {
"message": "Connect to a skill"
},
"connect_to_an_existing_bot_7f42990b": {
"message": "Connect to an existing bot"
},
"connect_to_qna_knowledgebase_4b324132": {
"message": "Connect to QnA Knowledgebase"
},
Expand Down Expand Up @@ -1232,9 +1232,6 @@
"display_text_used_by_the_channel_to_render_visuall_4e4ab704": {
"message": "Display text used by the channel to render visually."
},
"do_you_want_to_create_a_new_bot_or_connect_your_az_f5c9dee": {
"message": "Do you want to create a new bot, or connect your Azure Bot resource to an existing bot?"
},
"do_you_want_to_proceed_cd35aa38": {
"message": "Do you want to proceed?"
},
Expand Down Expand Up @@ -2657,9 +2654,6 @@
"open_web_chat_23601990": {
"message": "Open Web Chat"
},
"open_your_azure_bot_resource_9165e3d1": {
"message": "Open your Azure Bot resource"
},
"optional_221bcc9d": {
"message": "Optional"
},
Expand Down Expand Up @@ -3656,6 +3650,9 @@
"the_app_id_of_your_application_registration_16fba1a9": {
"message": "The app id of your application registration"
},
"the_azure_bot_created_in_azure_bot_services_contai_e1514f26": {
"message": "The Azure Bot created in Azure Bot Services contains bot resources that can be used as the basis for a new bot, or to add or replace resources of an existing bot. Learn more."
},
"the_bot_responses_page_is_where_the_language_gener_31a6666b": {
"message": "The Bot Responses page is where the Language Generation (LG) editor locates. From here users can view all the LG templates and edit them."
},
Expand Down Expand Up @@ -4034,6 +4031,9 @@
"url_should_start_with_http_or_https_c34632bb": {
"message": "URL should start with http:// or https://"
},
"use_azure_bot_to_create_a_new_conversation_1a116a65": {
"message": "Use Azure Bot to create a new conversation"
},
"use_azure_qna_maker_to_create_a_simple_question_an_a38d6770": {
"message": "Use Azure QnA Maker to create a simple question-and-answer bot from a website FAQ."
},
Expand Down Expand Up @@ -4292,6 +4292,9 @@
"your_knowledge_base_is_ready_6ecc1871": {
"message": "Your knowledge base is ready!"
},
"your_new_azure_bot_is_available_in_composer_2756367a": {
"message": "Your new Azure Bot is available in Composer"
},
"your_new_bot_is_almost_ready_1bb596e": {
"message": "Your new bot is almost ready!"
},
Expand Down