Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: multi-locale bot file structure #2164

Merged
merged 56 commits into from
Mar 24, 2020

Conversation

zhixzhan
Copy link
Contributor

@zhixzhan zhixzhan commented Mar 4, 2020

Description

The first stage of supporting multi-locale, reform the bot file structure.

change from current

/ComposerDialogs
  /common
    common.lg
  /Main
    Main.dialog
    Main.lg
    Main.lu
  /DialogFoo
    DialogFoo.dialog
    DialogFoo.lg
    DialogFoo.lu
  /DialogBar
    DialogBar.dialog
    DialogBar.lg
    DialogBar.lu
  /DialogBaz
    DialogBaz.dialog
    DialogBaz.lg
    DialogBaz.lu

to

/coolbot
  coolbot.dialog          
  /language-generation
    /en-us
      common.en-us.lg
      coolbot.en-us.lg
    /fr-fr
      common.fr-fr.lg
      coolbot.fr-fr.lg 
  /language-understanding
    /en-us
      coolbot.en-us.lu 
    /fr-fr
      coolbot.fr-fr.lu 
  /dialogs
    /foo
      foo.dialog
      /language-generation
        /en-us
          foo.en-us.lg
        /fr-fr
          foo.fr-fr.lg
      /language-understanding
        /en-us
          foo.en-us.lu
        /fr-fr
          foo.fr-fr.lu

And for one dialog, the folder abstract is

    /[dialog]
        [dialog].dialog
        /dialogs/[childs]
        /language-generation
            /[locale]
                 [dialog].[locale].lg
        /language-understanding
            /[locale]
                 [dialog].[locale].lu

Task Item

refs #1922
refs #1726
close #2291

Screenshots

@zhixzhan zhixzhan requested a review from luhan2017 as a code owner March 6, 2020 07:59
@zhixzhan
Copy link
Contributor Author

Hi @cwhitten @boydc2014 @luhan2017 , after a lot of test fix, the multi-locale file structure changes is ready for review, please take a look when you guys have time.

@cwhitten
Copy link
Member

@zhixzhan can you please resolve conflicts? at that point we will review and prioritize merging this.

@zhixzhan
Copy link
Contributor Author

@zhixzhan can you please resolve conflicts? at that point we will review and prioritize merging this.

OK, resolved.

@cwhitten cwhitten merged commit 9e1dd65 into microsoft:master Mar 24, 2020
@zhixzhan zhixzhan deleted the multiple-locale branch March 31, 2020 02:24
lei9444 pushed a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
* reform bot file structure

* update

* update

* client add locale

* crud with locale

* update test sample bot

* update

* update emptybot structure

* update crud test

* auto fix lu referrence

* reform sample bot structure

* clean up

* update dialogId & isBot

* update

* update test

* redirect to root dialog

* update

* update test

* update test entry

* update tests

* handle old bot

* update sample

* update refer

* update

* update

* refer lg lu no locale

* import lg no locale

* update

* fix refer

* import resolve with locale

* set test locale

* get refered lu without locale

* Temporary disable SendConversationUpdate in CSharp test case, for sdk locale issue

* update test

* update test

* update test

* update test

* update

* update test

* use file resolver handle locale

* test

* resolve confilct

* reform test samplebot

* clean

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants