From 50806febcfde35d7ca9d1cf0594d709e62591a0a Mon Sep 17 00:00:00 2001
From: Ryan Lengel Isgrig <43043272+ryanlengel@users.noreply.github.com>
Date: Thu, 11 Apr 2019 19:09:21 -0700
Subject: [PATCH] [VA] Resolve card localization bug that defaults to English
(#1095)
* Add local solutions ref
* Moved cards to card directory.
Renamed zh-cn to zh ref for EscalateStrings
* Updated italian/chinese responses and embedded resource refs for main dialog responses
* Updated projects to latest solutions nuget ref
* Update VirtualAssistant.sln
* Update VirtualAssistant.sln
* Update VirtualAssistant.csproj
---
...ngs.zh-cn.resx => EscalateStrings.zh.resx} | 0
.../{ => Cards}/NewUserGreeting.json | 0
.../{ => Cards}/ReturningUserGreeting.json | 0
.../Resources/MainDialogResponses.it.json | Bin 3922 -> 3918 bytes
.../Resources/MainDialogResponses.zh.json | 12 +++----
.../csharp/assistant/VirtualAssistant.csproj | 32 +++---------------
.../skills/newsskill/NewsSkill.csproj | 2 +-
.../RestaurantBooking.csproj | 2 +-
.../automotiveskill/AutomotiveSkill.csproj | 2 +-
.../AutomotiveSkillTest.csproj | 2 +-
.../calendarskill/CalendarSkill.csproj | 2 +-
.../CalendarSkillTest.csproj | 2 +-
.../emailskill/emailskill/EmailSkill.csproj | 2 +-
.../emailskilltest/EmailSkillTest.csproj | 2 +-
.../PointOfInterestSkill.csproj | 2 +-
.../PointOfInterestSkillTests.csproj | 2 +-
.../todoskill/todoskill/ToDoSkill.csproj | 2 +-
.../todoskilltest/ToDoSkillTest.csproj | 2 +-
.../Experimental.Skills.Tests.csproj | 2 +-
.../VirtualAssistant.Tests.csproj | 2 +-
20 files changed, 25 insertions(+), 47 deletions(-)
rename solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Escalate/Resources/{EscalateStrings.zh-cn.resx => EscalateStrings.zh.resx} (100%)
rename solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/{ => Cards}/NewUserGreeting.json (100%)
rename solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/{ => Cards}/ReturningUserGreeting.json (100%)
diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Escalate/Resources/EscalateStrings.zh-cn.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Escalate/Resources/EscalateStrings.zh.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Escalate/Resources/EscalateStrings.zh-cn.resx
rename to solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Escalate/Resources/EscalateStrings.zh.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/NewUserGreeting.json b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Cards/NewUserGreeting.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/NewUserGreeting.json
rename to solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Cards/NewUserGreeting.json
diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/ReturningUserGreeting.json b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Cards/ReturningUserGreeting.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/ReturningUserGreeting.json
rename to solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Cards/ReturningUserGreeting.json
diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainDialogResponses.it.json b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainDialogResponses.it.json
index 897a0efaebb997fe1ff998c599839bec6b76ae18..c942a193e849b4856c9e016bc1d60d203379efc3 100644
GIT binary patch
delta 7
Ocmca4cTR4DA3p#MvI6P=
delta 12
TcmX>ncS&x8A3qB(0~Z4T9GC+I
diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainDialogResponses.zh.json b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainDialogResponses.zh.json
index 7b0007406d..7883c8ee8c 100644
--- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainDialogResponses.zh.json
+++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainDialogResponses.zh.json
@@ -11,12 +11,12 @@
"HaveNameMessage": {
"replies": [
{
- "text": "嗨, {Name}!",
- "speak": "嗨, {Name}!"
+ "text": "嗨{Name}!",
+ "speak": "嗨{Name}!"
},
{
- "text": "很高兴见到你, {Name}!",
- "speak": "很高兴见到你, {Name}!"
+ "text": "很高兴见到你{Name}!",
+ "speak": "很高兴见到你{Name}!"
}
],
"inputHint": "acceptingInput"
@@ -51,8 +51,8 @@
"ReturningUserGreetingTitle": {
"replies": [
{
- "text": "欢迎回来 {Name}",
- "speak": "欢迎回来 {Name}!"
+ "text": "欢迎回来{Name}",
+ "speak": "欢迎回来{Name}!"
},
{
"text": "你好{Name}",
diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/VirtualAssistant.csproj b/solutions/Virtual-Assistant/src/csharp/assistant/VirtualAssistant.csproj
index 688b6033de..8ba50fc4fa 100644
--- a/solutions/Virtual-Assistant/src/csharp/assistant/VirtualAssistant.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/assistant/VirtualAssistant.csproj
@@ -12,19 +12,14 @@
-
-
-
-
-
+
+
-
-
@@ -49,7 +44,7 @@
-
+
@@ -63,26 +58,16 @@
-
- EscalateStrings.resx
- True
- True
-
-
+
True
True
- EscalateStrings.resx
+ MainDialogResponses.tt
True
True
EscalateStrings.resx
-
- True
- True
- MainDialogResponses.tt
-
True
True
@@ -116,13 +101,6 @@
-
-
-
-
-
-
-
Always
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/NewsSkill.csproj b/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/NewsSkill.csproj
index 36364389e9..c6768fcfe4 100644
--- a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/NewsSkill.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/NewsSkill.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/RestaurantBooking.csproj b/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/RestaurantBooking.csproj
index 5ed1cf4433..8c683bbef7 100644
--- a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/RestaurantBooking.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/RestaurantBooking.csproj
@@ -45,7 +45,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/AutomotiveSkill.csproj b/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/AutomotiveSkill.csproj
index 3b10a411ba..e4482b892a 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/AutomotiveSkill.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/AutomotiveSkill.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj b/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj
index f60e8059bb..2df1f3e0d5 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/CalendarSkill.csproj b/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/CalendarSkill.csproj
index a850e313aa..94be4862db 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/CalendarSkill.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/CalendarSkill.csproj
@@ -24,7 +24,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/CalendarSkillTest.csproj b/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/CalendarSkillTest.csproj
index a843ce0313..ec3c144cb8 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/CalendarSkillTest.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/CalendarSkillTest.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/EmailSkill.csproj b/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/EmailSkill.csproj
index 4ced28783d..2e5ca1cbad 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/EmailSkill.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/EmailSkill.csproj
@@ -22,7 +22,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/EmailSkillTest.csproj b/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/EmailSkillTest.csproj
index cbbd7a98a0..62b45f9053 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/EmailSkillTest.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/EmailSkillTest.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj b/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj
index 6dcb59dab2..330eb36db6 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj
@@ -24,7 +24,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj b/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj
index 1ec7024ecd..eda878002f 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/ToDoSkill.csproj b/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/ToDoSkill.csproj
index 570f63b98a..85eba8ee0a 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/ToDoSkill.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/ToDoSkill.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/ToDoSkillTest.csproj b/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/ToDoSkillTest.csproj
index a3ba00aaa2..0245756047 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/ToDoSkillTest.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/ToDoSkillTest.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/tests/experimental.skills.tests/Experimental.Skills.Tests.csproj b/solutions/Virtual-Assistant/src/csharp/tests/experimental.skills.tests/Experimental.Skills.Tests.csproj
index 389ede3eff..4af63b5d08 100644
--- a/solutions/Virtual-Assistant/src/csharp/tests/experimental.skills.tests/Experimental.Skills.Tests.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/tests/experimental.skills.tests/Experimental.Skills.Tests.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/solutions/Virtual-Assistant/src/csharp/tests/virtualassistant.tests/VirtualAssistant.Tests.csproj b/solutions/Virtual-Assistant/src/csharp/tests/virtualassistant.tests/VirtualAssistant.Tests.csproj
index 196dafdb4d..67cd4e14ae 100644
--- a/solutions/Virtual-Assistant/src/csharp/tests/virtualassistant.tests/VirtualAssistant.Tests.csproj
+++ b/solutions/Virtual-Assistant/src/csharp/tests/virtualassistant.tests/VirtualAssistant.Tests.csproj
@@ -8,7 +8,7 @@
-
+