From 75950218369f0ddea1708142dac766a1032b7f58 Mon Sep 17 00:00:00 2001 From: Ben Yackley <61990921+beyackle@users.noreply.github.com> Date: Mon, 5 Oct 2020 11:40:04 -0700 Subject: [PATCH 1/3] Update en-US.json --- .../packages/server/src/locales/en-US.json | 55 +++++++++++++++++-- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json index 5c8444ead3..2dc509090a 100644 --- a/Composer/packages/server/src/locales/en-US.json +++ b/Composer/packages/server/src/locales/en-US.json @@ -221,6 +221,9 @@ "are_you_sure_you_want_to_stop_current_runtime_and__a5f883b2": { "message": "Are you sure you want to stop current runtime and replace them?" }, + "are_you_sure_you_want_to_uninstall_these_extension_cf6265e8": { + "message": "Are you sure you want to uninstall these extensions?" + }, "array_643947ee": { "message": "Array" }, @@ -758,6 +761,12 @@ "duplicated_intents_recognized_d3908424": { "message": "Duplicated intents recognized" }, + "each_page_of_pagesizestring_in_propstring_a7e23b00": { + "message": "Each page of { pageSizeString } in { propString }" + }, + "each_value_in_ae285cd9": { + "message": "Each value in" + }, "early_adopters_e8db7999": { "message": "Early adopters" }, @@ -872,6 +881,9 @@ "error_processing_schema_2c707cf3": { "message": "Error Processing Schema" }, + "event_48c2be6e": { + "message": " (Event)" + }, "event_activity_2067a94b": { "message": "Event activity" }, @@ -923,9 +935,6 @@ "expression_to_evaluate_ce4095b1": { "message": "Expression to evaluate." }, - "extension_name_e21a5e25": { - "message": "Extension name" - }, "extensions_7250a0bb": { "message": "Extensions" }, @@ -1034,6 +1043,9 @@ "home_351838cd": { "message": "Home" }, + "host_ef9acfae": { + "message": "Host " + }, "http_request_79847109": { "message": "HTTP Request" }, @@ -1445,12 +1457,18 @@ "no_editor_for_type_8b5593c5": { "message": "No Editor for { type }" }, + "no_extensions_installed_4b925277": { + "message": "No extensions installed" + }, "no_lu_file_with_name_id_fb21315d": { "message": "NO LU FILE WITH NAME { id }" }, "no_lu_or_qna_file_with_name_id_21cfe9dc": { "message": "NO LU OR QNA FILE WITH NAME { id }" }, + "no_search_results_1ba50423": { + "message": "No search results" + }, "no_updates_available_cecd904d": { "message": "No updates available" }, @@ -1778,6 +1796,15 @@ "restart_bot_34e36428": { "message": "Restart Bot" }, + "result_b1f14e91": { + "message": " = Result" + }, + "result_property_100ef34f": { + "message": " = Result property" + }, + "return_value_b386d1b": { + "message": "= Return value" + }, "review_and_generate_63dec712": { "message": "Review and generate" }, @@ -1820,8 +1847,8 @@ "search_280d00bd": { "message": "Search" }, - "search_for_extensions_a27c4772": { - "message": "Search for extensions" + "search_for_extensions_on_npm_c5ca65d9": { + "message": "Search for extensions on npm" }, "see_log_4b833bf7": { "message": "See Log" @@ -2024,6 +2051,9 @@ "text_7f4593da": { "message": "Text" }, + "the_api_messages_endpoint_for_the_skill_f318dc63": { + "message": "The /api/messages endpoint for the skill." + }, "the_callback_url_for_the_skill_host_e20e1012": { "message": "The callback url for the skill host." }, @@ -2051,6 +2081,9 @@ "the_return_type_does_not_match_2ae72548": { "message": "the return type does not match" }, + "the_root_bot_is_not_a_bot_project_d1495cf6": { + "message": "The root bot is not a bot project" + }, "the_welcome_message_is_triggered_by_the_i_conversa_a3ff58f8": { "message": "The welcome message is triggered by the ConversationUpdate event. To add a new ConversationUpdate trigger:" }, @@ -2147,6 +2180,12 @@ "to_which_language_will_you_be_translating_your_bot_77219d69": { "message": "To which language will you be translating your bot?" }, + "toggle_extension_e41de2d2": { + "message": "Toggle extension" + }, + "token_property_e53a19d9": { + "message": " = Token Property" + }, "toolbar_bafd4228": { "message": "toolbar" }, @@ -2195,6 +2234,9 @@ "undo_is_not_supported_ecd6f9fc": { "message": "Undo is not supported" }, + "uninstall_8730233": { + "message": "Uninstall" + }, "unknown_intent_44b962ba": { "message": "Unknown intent" }, @@ -2288,6 +2330,9 @@ "view_kb_c382e495": { "message": "View KB" }, + "view_on_npm_2051324d": { + "message": "View on npm" + }, "vishwac_sena_45910bf0": { "message": "Vishwac Sena" }, From fce798088e9d0266d429bbdcb285207af061472b Mon Sep 17 00:00:00 2001 From: Ben Yackley <61990921+beyackle@users.noreply.github.com> Date: Fri, 16 Oct 2020 11:24:02 -0700 Subject: [PATCH 2/3] update l10n files --- .../server/schemas/sdk.en-US.uischema | 94 ++++++------ .../packages/server/src/locales/en-US.json | 144 ++++++++++++++---- 2 files changed, 162 insertions(+), 76 deletions(-) diff --git a/Composer/packages/server/schemas/sdk.en-US.uischema b/Composer/packages/server/schemas/sdk.en-US.uischema index 817509983b..1e197b386c 100644 --- a/Composer/packages/server/schemas/sdk.en-US.uischema +++ b/Composer/packages/server/schemas/sdk.en-US.uischema @@ -11,48 +11,6 @@ } } }, - "Microsoft.AttachmentInput": { - "form": { - "label": "Prompt for a file or an attachment", - "subtitle": "Attachment Input" - } - }, - "Microsoft.ChoiceInput": { - "form": { - "label": "Prompt with multi-choice", - "subtitle": "Choice Input" - } - }, - "Microsoft.ConfirmInput": { - "form": { - "label": "Prompt for confirmation", - "subtitle": "Confirm Input" - } - }, - "Microsoft.DateTimeInput": { - "form": { - "label": "Prompt for a date or a time", - "subtitle": "Date Time Input" - } - }, - "Microsoft.NumberInput": { - "form": { - "label": "Prompt for a number", - "subtitle": "Number Input" - } - }, - "Microsoft.OAuthInput": { - "form": { - "label": "OAuth login", - "subtitle": "OAuth Input" - } - }, - "Microsoft.TextInput": { - "form": { - "label": "Prompt for text", - "subtitle": "Text Input" - } - }, "Microsoft.BeginDialog": { "form": { "label": "Begin a new dialog", @@ -100,11 +58,6 @@ "subtitle": "Delete Property" } }, - "Microsoft.DeleteActivity": { - "form": { - "label": "Delete activity" - } - }, "Microsoft.EditActions": { "form": { "label": "Modify active dialog", @@ -213,9 +166,46 @@ "subtitle": "Trace Activity" } }, - "Microsoft.UpdateActivity": { + "Microsoft.AttachmentInput": { + "form": { + "label": "Prompt for a file or an attachment", + "subtitle": "Attachment Input" + } + }, + "Microsoft.ChoiceInput": { + "form": { + "label": "Prompt with multi-choice", + "subtitle": "Choice Input" + } + }, + "Microsoft.ConfirmInput": { "form": { - "label": "Update an activity" + "label": "Prompt for confirmation", + "subtitle": "Confirm Input" + } + }, + "Microsoft.DateTimeInput": { + "form": { + "label": "Prompt for a date or a time", + "subtitle": "Date Time Input" + } + }, + "Microsoft.NumberInput": { + "form": { + "label": "Prompt for a number", + "subtitle": "Number Input" + } + }, + "Microsoft.OAuthInput": { + "form": { + "label": "OAuth login", + "subtitle": "OAuth Input" + } + }, + "Microsoft.TextInput": { + "form": { + "label": "Prompt for text", + "subtitle": "Text Input" } }, "Microsoft.OnActivity": { @@ -279,6 +269,12 @@ "subtitle": "Handoff activity" } }, + "Microsoft.OnInstallationUpdateActivity": { + "form": { + "label": "Installation updated", + "subtitle": "Installation updated activity" + } + }, "Microsoft.OnIntent": { "form": { "label": "Intent recognized", diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json index 023fa89be9..b0eb0d86bb 100644 --- a/Composer/packages/server/src/locales/en-US.json +++ b/Composer/packages/server/src/locales/en-US.json @@ -125,8 +125,8 @@ "add_additional_url_bdfac25d": { "message": "Add additional URL" }, - "add_alternative_phrasing_47234f77": { - "message": "add alternative phrasing" + "add_alternative_phrasing_17e0304c": { + "message": "+ Add alternative phrasing" }, "add_an_intent_trigger_a9acc149": { "message": "Add an intent trigger" @@ -140,6 +140,9 @@ "add_multiple_comma_separated_synonyms_2639283f": { "message": "Add multiple comma-separated synonyms" }, + "add_new_answer_9de3808e": { + "message": "Add new answer" + }, "add_new_dialog_25f12c9": { "message": "Add new dialog" }, @@ -155,6 +158,9 @@ "add_new_propertyname_bedf7dc6": { "message": "Add new { propertyName }" }, + "add_new_question_85612b7f": { + "message": "Add new question" + }, "add_new_trigger_on_displayname_2aaf6e4c": { "message": "Add new trigger on { displayName }" }, @@ -164,8 +170,8 @@ "add_property_d381eba3": { "message": "Add Property" }, - "add_qna_pair_bcb1624": { - "message": "Add QnA Pair" + "add_qna_pair_16c228f0": { + "message": "+ Add QnA Pair" }, "add_some_example_phrases_to_trigger_this_intent_pl_568eaf51": { "message": "> add some example phrases to trigger this intent:\n> - please tell me the weather\n> - what is the weather like in '{'city=Seattle'}'\n\n> entity definitions:\n> @ ml city" @@ -203,8 +209,11 @@ "answer_4620913f": { "message": "Answer" }, - "answer_is_answer_799483f0": { - "message": "Answer is { answer }" + "answer_is_content_c6af84ad": { + "message": "Answer is { content }" + }, + "answer_is_required_da652c05": { + "message": "Answer is required" }, "any_constant_or_expression_to_evaluate_ba2017b1": { "message": "Any constant or expression to evaluate." @@ -269,6 +278,9 @@ "ask_a_question_92ef7e0c": { "message": "Ask a question" }, + "at_least_one_question_is_required_6f287e04": { + "message": "At least one question is required" + }, "attachment_input_e0ece49c": { "message": "Attachment Input" }, @@ -617,6 +629,9 @@ "create_a_dialog_9f6c8618": { "message": "Create a dialog" }, + "create_a_knowledge_base_from_scratch_or_import_kno_2eb38ac0": { + "message": "Create a knowledge base from scratch or import knowledge from a URL or PDF files" + }, "create_a_name_for_the_project_which_will_be_used_t_57e9b690": { "message": "Create a name for the project which will be used to name the application: (projectname-environment-LUfilename)" }, @@ -659,6 +674,15 @@ "create_from_template_87e12c94": { "message": "Create from template" }, + "create_kb_e78571ba": { + "message": "Create KB" + }, + "create_kb_from_scratch_eddd037a": { + "message": "Create KB from scratch" + }, + "create_kb_from_url_or_file_49ad6671": { + "message": "Create KB from URL or file" + }, "create_knowledge_base_db6d66c4": { "message": "Create knowledge base" }, @@ -671,9 +695,18 @@ "create_new_folder_19d3faa4": { "message": "Create new folder" }, + "create_new_kb_1c4f86a0": { + "message": "Create new KB" + }, + "create_new_knowledge_base_d15d6873": { + "message": "Create new knowledge base" + }, "create_new_knowledge_base_e14d07a5": { "message": "Create New Knowledge Base" }, + "create_new_knowledge_base_from_scratch_638c4fd2": { + "message": "Create new knowledge base from scratch" + }, "create_or_edit_skill_manifest_8ad98da9": { "message": "Create or edit skill manifest" }, @@ -767,6 +800,9 @@ "delete_form_dialog_schema_892df4e8": { "message": "Delete form dialog schema" }, + "delete_knowledge_base_66e3a7f1": { + "message": "Delete knowledge base" + }, "delete_language_1527609d": { "message": "Delete language" }, @@ -875,6 +911,12 @@ "duplicated_intents_recognized_d3908424": { "message": "Duplicated intents recognized" }, + "each_page_of_pagesizestring_in_propstring_a7e23b00": { + "message": "Each page of { pageSizeString } in { propString }" + }, + "each_value_in_ae285cd9": { + "message": "Each value in" + }, "early_adopters_e8db7999": { "message": "Early adopters" }, @@ -902,12 +944,15 @@ "edit_in_json_75d0d754": { "message": "Edit in JSON" }, - "edit_mode_7e07cfdf": { - "message": "Edit mode" + "edit_kb_name_5e2d8c5b": { + "message": "Edit KB name" }, "edit_property_dd6a1172": { "message": "Edit Property" }, + "edit_source_45af68b4": { + "message": "Edit source" + }, "ejecting_runtime_f6c90614": { "message": "Ejecting runtime..." }, @@ -923,12 +968,18 @@ "emit_event_32aa6583": { "message": "Emit Event" }, + "empty_qna_icon_34c180c6": { + "message": "Empty QnA Icon" + }, "enable_6f5d1328": { "message": "Enable" }, "enable_line_numbers_to_refer_to_code_lines_by_numb_e5ba66ea": { "message": "Enable line numbers to refer to code lines by number." }, + "enable_multi_turn_extraction_8a168892": { + "message": "Enable multi-turn extraction" + }, "enabled_ba7cab66": { "message": "Enabled" }, @@ -959,11 +1010,8 @@ "enter_a_min_value_c3030813": { "message": "Enter a min value" }, - "enter_a_question_74f2e045": { - "message": "Enter a question" - }, - "enter_an_answer_84152a83": { - "message": "Enter an answer" + "enter_a_url_or_browse_to_upload_a_file_88a783fa": { + "message": "Enter a URL or browse to upload a file " }, "enterprise_assistant_434df551": { "message": "Enterprise Assistant" @@ -1004,6 +1052,9 @@ "error_processing_schema_2c707cf3": { "message": "Error Processing Schema" }, + "event_48c2be6e": { + "message": " (Event)" + }, "event_activity_2067a94b": { "message": "Event activity" }, @@ -1046,9 +1097,6 @@ "export_de71cd8e": { "message": "Export" }, - "export_json_2e2981f5": { - "message": "Export JSON" - }, "expression_7f906a13": { "message": "Expression" }, @@ -1070,8 +1118,8 @@ "extract_question_and_answer_pairs_from_an_online_f_c1e12724": { "message": "Extract question-and-answer pairs from an online FAQ, product manuals, or other files. Supported formats are .tsv, .pdf, .doc, .docx, .xlsx, containing questions and answers in sequence. " }, - "extracting_qna_pairs_from_urls_eaed1b1c": { - "message": "Extracting QNA pairs from { urls }" + "extracting_qna_pairs_from_url_b0331bba": { + "message": "Extracting QNA pairs from { url }" }, "fallback_text_e5ff1cb7": { "message": "Fallback Text" @@ -1196,6 +1244,9 @@ "hospitality_assistant_c330e403": { "message": "Hospitality Assistant" }, + "host_ef9acfae": { + "message": "Host " + }, "hosts_your_bot_application_9dd01ffc": { "message": "Hosts your Bot application." }, @@ -1220,9 +1271,6 @@ "id_already_exists_please_enter_a_unique_file_name_174913a3": { "message": "{ id } already exists. Please enter a unique file name." }, - "id_is_id_c0fc7a7d": { - "message": "id is { id }" - }, "if_condition_56c9be4a": { "message": "If Condition" }, @@ -1235,9 +1283,6 @@ "if_you_already_have_a_qna_account_provide_the_info_466d6a4b": { "message": "If you already have a QNA account, provide the information below. If you do not have an account yet, create a (free) account first." }, - "import_qna_from_url_26a99161": { - "message": "Import QnA From Url" - }, "import_schema_75659c5f": { "message": "Import schema" }, @@ -1328,6 +1373,9 @@ "kb_d9c53902": { "message": "KB" }, + "kb_name_cannot_contain_speacial_characters_6588abda": { + "message": "KB name cannot contain speacial characters." + }, "key_cannot_be_blank_dccc1b46": { "message": "Key cannot be blank" }, @@ -1337,6 +1385,12 @@ "keys_must_be_unique_2028cef3": { "message": "Keys must be unique" }, + "knowledge_base_name_7d83bbe4": { + "message": "Knowledge base name" + }, + "knowledge_source_dd66f38f": { + "message": "Knowledge source" + }, "l_startline_startcharacter_l_endline_endcharacter_72bc2e5d": { "message": "L{ startLine }:{ startCharacter } - L{ endLine }:{ endCharacter } " }, @@ -1451,6 +1505,9 @@ "lu_editor_d09fb2b0": { "message": "LU editor" }, + "lu_file_already_exist_7f118089": { + "message": "lu file already exist" + }, "lu_file_id_not_found_8732d33e": { "message": "LU file { id } not found" }, @@ -1487,6 +1544,9 @@ "manifest_version_1edc004a": { "message": "Manifest Version" }, + "manually_add_question_and_answer_pairs_to_create_a_f1318c4e": { + "message": "Manually add question and answer pairs to create a KB" + }, "maximum_f0e8e5e4": { "message": "Maximum" }, @@ -1496,6 +1556,9 @@ "mb_8f9f9e84": { "message": "MB" }, + "menu_items_2d66492c": { + "message": "Menu items" + }, "message_5c38209d": { "message": "Message" }, @@ -1916,9 +1979,6 @@ "property_name_help_text_421a5f7f": { "message": "Property name help text" }, - "property_required_help_text_57f027ad": { - "message": "Property required help text" - }, "property_title_f2b443b7": { "message": "Property title" }, @@ -1997,6 +2057,12 @@ "question_9121487": { "message": "Question" }, + "question_is_content_3952e657": { + "message": "Question is { content }" + }, + "question_is_empty_now_f0b5733e": { + "message": "Question is empty now" + }, "randomselector_4a5274f1": { "message": "RandomSelector" }, @@ -2028,6 +2094,9 @@ "message": "RegEx { intent } is already defined" }, "regular_expression_855557bf": { + "message": "Regular Expression" + }, + "regular_expression_recognizer_44664557": { "message": "Regular expression recognizer" }, "release_1af20f26": { @@ -2075,6 +2144,15 @@ "restart_bot_34e36428": { "message": "Restart Bot" }, + "result_b1f14e91": { + "message": " = Result" + }, + "result_property_100ef34f": { + "message": " = Result property" + }, + "return_value_b386d1b": { + "message": "= Return value" + }, "review_and_generate_63dec712": { "message": "Review and generate" }, @@ -2498,6 +2576,12 @@ "toggle_extension_e41de2d2": { "message": "Toggle extension" }, + "toggle_show_all_61f19d77": { + "message": "Toggle show all" + }, + "token_property_e53a19d9": { + "message": " = Token Property" + }, "toolbar_bafd4228": { "message": "toolbar" }, @@ -2525,6 +2609,9 @@ "try_again_ad656c3c": { "message": "Try again" }, + "type_a_name_that_describes_this_content_d1a910b6": { + "message": "Type a name that describes this content" + }, "type_and_press_enter_33a2905d": { "message": "Type and press enter" }, @@ -2753,6 +2840,9 @@ "yes_dde87d5": { "message": "Yes" }, + "you_already_have_a_kb_with_that_name_choose_anothe_fc2f7156": { + "message": "You already have a KB with that name.Choose another name and try again." + }, "you_are_about_to_publish_your_bot_to_the_profile_b_79a6a226": { "message": "You are about to publish your bot to the profile below. Do you want to proceed?" }, From ab5c7b369f9738416e179f5dd4d67abbd76c24ce Mon Sep 17 00:00:00 2001 From: Ben Yackley <61990921+beyackle@users.noreply.github.com> Date: Fri, 16 Oct 2020 11:26:06 -0700 Subject: [PATCH 3/3] fix typos --- Composer/packages/client/src/components/QnA/constants.ts | 4 ++-- Composer/packages/server/src/locales/en-US.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Composer/packages/client/src/components/QnA/constants.ts b/Composer/packages/client/src/components/QnA/constants.ts index a8049e66d0..e2b004fb2a 100644 --- a/Composer/packages/client/src/components/QnA/constants.ts +++ b/Composer/packages/client/src/components/QnA/constants.ts @@ -47,12 +47,12 @@ export const validateName = (sources: QnAFile[]): FieldValidator => { let currentError = ''; if (name) { if (!FileNameRegex.test(name)) { - currentError = formatMessage('KB name cannot contain speacial characters.'); + currentError = formatMessage('KB name cannot contain special characters.'); } const duplicatedItemIndex = sources.findIndex((item) => item.id.toLowerCase() === `${name.toLowerCase()}.source`); if (duplicatedItemIndex > -1) { - currentError = formatMessage('You already have a KB with that name.Choose another name and try again.'); + currentError = formatMessage('You already have a KB with that name. Choose another name and try again.'); } } return currentError; diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json index b0eb0d86bb..573900f6dd 100644 --- a/Composer/packages/server/src/locales/en-US.json +++ b/Composer/packages/server/src/locales/en-US.json @@ -1373,8 +1373,8 @@ "kb_d9c53902": { "message": "KB" }, - "kb_name_cannot_contain_speacial_characters_6588abda": { - "message": "KB name cannot contain speacial characters." + "kb_name_cannot_contain_special_characters_616d7939": { + "message": "KB name cannot contain special characters." }, "key_cannot_be_blank_dccc1b46": { "message": "Key cannot be blank" @@ -2840,8 +2840,8 @@ "yes_dde87d5": { "message": "Yes" }, - "you_already_have_a_kb_with_that_name_choose_anothe_fc2f7156": { - "message": "You already have a KB with that name.Choose another name and try again." + "you_already_have_a_kb_with_that_name_choose_anothe_b7f7c517": { + "message": "You already have a KB with that name. Choose another name and try again." }, "you_are_about_to_publish_your_bot_to_the_profile_b_79a6a226": { "message": "You are about to publish your bot to the profile below. Do you want to proceed?"