[POI] fix localization issue (#2115)

microsoft · Aug 19, 2019 · 747fec4 · 747fec4
1 parent 496b139
commit 747fec4
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/...ointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.1.0.json b/...ointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.1.0.json
@@ -26,7 +26,7 @@
                           "size": "Large",
                           "weight": "Bolder",
                           "color": "Default",
-                          "text": "Location services"
+                          "text": "{CardTitle}"
                         }
                       ],
                       "width": "stretch"

diff --git a/...rp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.json b/...rp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.json
@@ -40,7 +40,7 @@
                           "size": "Large",
                           "weight": "Bolder",
                           "color": "Light",
-                          "text": "Location services"
+                          "text": "{CardTitle}"
                         }
                       ],
                       "width": "stretch"

diff --git a/...ointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_route_fromxtoy.lu b/...ointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_route_fromxtoy.lu
@@ -491,7 +491,7 @@
 -  {KEYWORD=约克斯明斯特} 在 {ADDRESS=1827}   {ADDRESS=哈钦森法院}   {ADDRESS=布恩县}   {ADDRESS=Md} 
 -  {ADDRESS=z blvd。} 和 {ADDRESS=bnd 972} 在那里引导我
 -  {KEYWORD=齐翁国家公园} 在 {ADDRESS=第47街} 和 {ADDRESS=哥伦布的地方} 邮政编码
--  {KEYWORD=祖普!} 在 {ADDRESS=1497年}   {ADDRESS=希尔堡的地方}   {ADDRESS=哈莱姆市}   {ADDRESS=罗德岛} 在 {地址 = 帕普亚新几内亚}
+-  {KEYWORD=祖普!} 在 {ADDRESS=1497年}   {ADDRESS=希尔堡的地方}   {ADDRESS=哈莱姆市}   {ADDRESS=罗德岛} 在 {ADDRESS=帕普亚新几内亚}
 - 查找路线
 - 哪里是 {KEYWORD=papa john's}
 - 我在哪里可以找到{KEYWORD=papa john's}

diff --git a/...src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs b/...src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs
@@ -469,7 +469,6 @@ protected async Task<List<Card>> GetPointOfInterestLocationCards(DialogContext s
             {
                 for (var i = 0; i < pointOfInterestList.Count; i++)
                 {
-                    pointOfInterestList[i].CardTitle = PointOfInterestSharedStrings.CARD_TITLE;
                     pointOfInterestList[i] = await service.GetPointOfInterestDetailsAsync(pointOfInterestList[i]);
 
                     // Increase by one to avoid zero based options to the user which are confusing
@@ -656,7 +655,8 @@ protected async Task<List<Card>> GetRouteDirectionsViewCards(DialogContext sc, R
                         TravelTimeSpeak = GetFormattedTravelTimeSpanString(travelTimeSpan),
                         TravelDelaySpeak = GetFormattedTrafficDelayString(trafficTimeSpan),
                         ProviderDisplayText = string.Format($"{PointOfInterestSharedStrings.POWERED_BY} **{{0}}**", destination.Provider.Aggregate((j, k) => j + " & " + k).ToString()),
-                        Speak = GetFormattedTravelTimeSpanString(travelTimeSpan)
+                        Speak = GetFormattedTravelTimeSpanString(travelTimeSpan),
+                        CardTitle = PointOfInterestSharedStrings.CARD_TITLE
                     };
 
                     cardData.Add(routeDirectionsModel);

diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/PointofInterestModel.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/PointofInterestModel.cs
@@ -6,6 +6,7 @@
 using System.Text;
 using Microsoft.Bot.Builder.Solutions.Responses;
 using PointOfInterestSkill.Models.Foursquare;
+using PointOfInterestSkill.Responses.Shared;
 
 namespace PointOfInterestSkill.Models
 {
@@ -49,6 +50,7 @@ public PointOfInterestModel(SearchResult azureMapsPoi)
             Category = (azureMapsPoi.Poi?.Classifications != null)
             ? CultureInfo.CurrentCulture.TextInfo.ToTitleCase(azureMapsPoi.Poi.Classifications.FirstOrDefault().Names.FirstOrDefault().NameProperty)
             : Category;
+            CardTitle = PointOfInterestSharedStrings.CARD_TITLE;
 
             if (Provider == null)
             {
@@ -98,6 +100,7 @@ public PointOfInterestModel(Venue foursquarePoi)
             Category = (foursquarePoi.Categories != null)
                 ? foursquarePoi.Categories.First().ShortName
                 : Category;
+            CardTitle = PointOfInterestSharedStrings.CARD_TITLE;
 
             if (Provider == null)
             {

diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Dialogs/MainDialog.cs b/templates/Skill-Template/csharp/Sample/SkillSample/Dialogs/MainDialog.cs
@@ -55,7 +55,6 @@ public MainDialog(
 
         protected override async Task OnStartAsync(DialogContext dc, CancellationToken cancellationToken = default(CancellationToken))
         {
-            var locale = CultureInfo.CurrentUICulture;
             await dc.Context.SendActivityAsync(_responseManager.GetResponse(MainResponses.WelcomeMessage));
         }
 

diff --git a/templates/Skill-Template/csharp/Template/Skill/Dialogs/MainDialog.cs b/templates/Skill-Template/csharp/Template/Skill/Dialogs/MainDialog.cs
@@ -55,7 +55,6 @@ public MainDialog(
 
         protected override async Task OnStartAsync(DialogContext dc, CancellationToken cancellationToken = default(CancellationToken))
         {
-            var locale = CultureInfo.CurrentUICulture;
             await dc.Context.SendActivityAsync(_responseManager.GetResponse(MainResponses.WelcomeMessage));
         }