Skip to content

Commit 9f4f6ef

Browse files
nCastle1nCastle1
authored
Localization fixes (#937)
1 parent 1b26d1e commit 9f4f6ef

File tree

10 files changed

+45
-35
lines changed

10 files changed

+45
-35
lines changed

‎src/Android/Xamarin.Android/Samples/GraphicsOverlay/Animate3DGraphic/Animate3DGraphic.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
using ArcGISRuntime.Samples.Managers;
2626
using Debug = System.Diagnostics.Debug;
2727
using Surface = Esri.ArcGISRuntime.Mapping.Surface;
28+
using System.Globalization;
2829

2930
namespace ArcGISRuntime.Samples.Animate3DGraphic
3031
{
@@ -473,12 +474,12 @@ private MissionFrame(string missionLine)
473474
}
474475

475476
// Populate the object's properties from the array of parameters
476-
Longitude = Convert.ToDouble(missionFrameParameters[0]);
477-
Latitude = Convert.ToDouble(missionFrameParameters[1]);
478-
Elevation = Convert.ToDouble(missionFrameParameters[2]);
479-
Heading = Convert.ToDouble(missionFrameParameters[3]);
480-
Pitch = Convert.ToDouble(missionFrameParameters[4]);
481-
Roll = Convert.ToDouble(missionFrameParameters[5]);
477+
Longitude = Convert.ToDouble(missionFrameParameters[0], CultureInfo.InvariantCulture);
478+
Latitude = Convert.ToDouble(missionFrameParameters[1], CultureInfo.InvariantCulture);
479+
Elevation = Convert.ToDouble(missionFrameParameters[2], CultureInfo.InvariantCulture);
480+
Heading = Convert.ToDouble(missionFrameParameters[3], CultureInfo.InvariantCulture);
481+
Pitch = Convert.ToDouble(missionFrameParameters[4], CultureInfo.InvariantCulture);
482+
Roll = Convert.ToDouble(missionFrameParameters[5], CultureInfo.InvariantCulture);
482483
}
483484

484485
/// <summary>

‎src/Android/Xamarin.Android/Samples/GraphicsOverlay/DictionaryRendererGraphicsOverlay/DictionaryRendererGraphicsOverlay.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using Esri.ArcGISRuntime.UI.Controls;
1919
using System;
2020
using System.Collections.Generic;
21+
using System.Globalization;
2122
using System.Linq;
2223
using System.Xml.Linq;
2324

@@ -122,7 +123,7 @@ private Graphic GraphicFromAttributes(List<XElement> graphicAttributes)
122123
foreach (string pointString in pointStrings)
123124
{
124125
var coords = pointString.Split(',');
125-
graphicPoints.Add(Convert.ToDouble(coords[0]), Convert.ToDouble(coords[1]));
126+
graphicPoints.Add(Convert.ToDouble(coords[0], CultureInfo.InvariantCulture), Convert.ToDouble(coords[1], CultureInfo.InvariantCulture));
126127
}
127128

128129
// Create a multipoint from the point collection.

‎src/Forms/Shared/Samples/GraphicsOverlay/Animate3DGraphic/Animate3DGraphic.xaml.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System;
1111
using System.Collections.Generic;
1212
using System.Diagnostics;
13+
using System.Globalization;
1314
using System.IO;
1415
using System.Linq;
1516
using System.Threading.Tasks;
@@ -390,12 +391,12 @@ private MissionFrame(string missionLine)
390391
}
391392

392393
// Populate the object's properties from the array of parameters
393-
Longitude = Convert.ToDouble(missionFrameParameters[0]);
394-
Latitude = Convert.ToDouble(missionFrameParameters[1]);
395-
Elevation = Convert.ToDouble(missionFrameParameters[2]);
396-
Heading = Convert.ToDouble(missionFrameParameters[3]);
397-
Pitch = Convert.ToDouble(missionFrameParameters[4]);
398-
Roll = Convert.ToDouble(missionFrameParameters[5]);
394+
Longitude = Convert.ToDouble(missionFrameParameters[0], CultureInfo.InvariantCulture);
395+
Latitude = Convert.ToDouble(missionFrameParameters[1], CultureInfo.InvariantCulture);
396+
Elevation = Convert.ToDouble(missionFrameParameters[2], CultureInfo.InvariantCulture);
397+
Heading = Convert.ToDouble(missionFrameParameters[3], CultureInfo.InvariantCulture);
398+
Pitch = Convert.ToDouble(missionFrameParameters[4], CultureInfo.InvariantCulture);
399+
Roll = Convert.ToDouble(missionFrameParameters[5], CultureInfo.InvariantCulture);
399400
}
400401

401402
/// <summary>

‎src/Forms/Shared/Samples/GraphicsOverlay/DictionaryRendererGraphicsOverlay/DictionaryRendererGraphicsOverlay.xaml.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using Esri.ArcGISRuntime.UI;
1515
using System;
1616
using System.Collections.Generic;
17+
using System.Globalization;
1718
using System.Linq;
1819
using System.Xml.Linq;
1920
using Xamarin.Forms;
@@ -111,7 +112,7 @@ private Graphic GraphicFromAttributes(List<XElement> graphicAttributes)
111112
foreach (string pointString in pointStrings)
112113
{
113114
var coords = pointString.Split(',');
114-
graphicPoints.Add(Convert.ToDouble(coords[0]), Convert.ToDouble(coords[1]));
115+
graphicPoints.Add(Convert.ToDouble(coords[0], CultureInfo.InvariantCulture), Convert.ToDouble(coords[1], CultureInfo.InvariantCulture));
115116
}
116117

117118
// Create a multipoint from the point collection.

‎src/UWP/ArcGISRuntime.UWP.Viewer/Samples/GraphicsOverlay/Animate3DGraphic/Animate3DGraphic.xaml.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using System;
1616
using System.Collections.Generic;
1717
using System.Diagnostics;
18+
using System.Globalization;
1819
using System.IO;
1920
using System.Linq;
2021
using System.Threading.Tasks;
@@ -418,12 +419,12 @@ private MissionFrame(string missionLine)
418419
}
419420

420421
// Populate the object's properties from the array of parameters
421-
Longitude = Convert.ToDouble(missionFrameParameters[0]);
422-
Latitude = Convert.ToDouble(missionFrameParameters[1]);
423-
Elevation = Convert.ToDouble(missionFrameParameters[2]);
424-
Heading = Convert.ToDouble(missionFrameParameters[3]);
425-
Pitch = Convert.ToDouble(missionFrameParameters[4]);
426-
Roll = Convert.ToDouble(missionFrameParameters[5]);
422+
Longitude = Convert.ToDouble(missionFrameParameters[0], CultureInfo.InvariantCulture);
423+
Latitude = Convert.ToDouble(missionFrameParameters[1], CultureInfo.InvariantCulture);
424+
Elevation = Convert.ToDouble(missionFrameParameters[2], CultureInfo.InvariantCulture);
425+
Heading = Convert.ToDouble(missionFrameParameters[3], CultureInfo.InvariantCulture);
426+
Pitch = Convert.ToDouble(missionFrameParameters[4], CultureInfo.InvariantCulture);
427+
Roll = Convert.ToDouble(missionFrameParameters[5], CultureInfo.InvariantCulture);
427428
}
428429

429430
/// <summary>

‎src/UWP/ArcGISRuntime.UWP.Viewer/Samples/GraphicsOverlay/DictionaryRendererGraphicsOverlay/DictionaryRendererGraphicsOverlay.xaml.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using Esri.ArcGISRuntime.UI;
1515
using System;
1616
using System.Collections.Generic;
17+
using System.Globalization;
1718
using System.Linq;
1819
using System.Xml.Linq;
1920
using Windows.UI.Popups;
@@ -111,7 +112,7 @@ private Graphic GraphicFromAttributes(List<XElement> graphicAttributes)
111112
foreach (string pointString in pointStrings)
112113
{
113114
var coords = pointString.Split(',');
114-
graphicPoints.Add(Convert.ToDouble(coords[0]), Convert.ToDouble(coords[1]));
115+
graphicPoints.Add(Convert.ToDouble(coords[0], CultureInfo.InvariantCulture), Convert.ToDouble(coords[1], CultureInfo.InvariantCulture));
115116
}
116117

117118
// Create a multipoint from the point collection.

‎src/WPF/ArcGISRuntime.WPF.Viewer/Samples/GraphicsOverlay/Animate3DGraphic/Animate3DGraphic.xaml.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
using System.Drawing;
2525
using PointCollection = Esri.ArcGISRuntime.Geometry.PointCollection;
2626
using Viewpoint = Esri.ArcGISRuntime.Mapping.Viewpoint;
27+
using System.Globalization;
2728

2829
namespace ArcGISRuntime.WPF.Samples.Animate3DGraphic
2930
{
@@ -421,12 +422,12 @@ private MissionFrame(string missionLine)
421422
}
422423

423424
// Populate the object's properties from the array of parameters
424-
Longitude = Convert.ToDouble(missionFrameParameters[0]);
425-
Latitude = Convert.ToDouble(missionFrameParameters[1]);
426-
Elevation = Convert.ToDouble(missionFrameParameters[2]);
427-
Heading = Convert.ToDouble(missionFrameParameters[3]);
428-
Pitch = Convert.ToDouble(missionFrameParameters[4]);
429-
Roll = Convert.ToDouble(missionFrameParameters[5]);
425+
Longitude = Convert.ToDouble(missionFrameParameters[0], CultureInfo.InvariantCulture);
426+
Latitude = Convert.ToDouble(missionFrameParameters[1], CultureInfo.InvariantCulture);
427+
Elevation = Convert.ToDouble(missionFrameParameters[2], CultureInfo.InvariantCulture);
428+
Heading = Convert.ToDouble(missionFrameParameters[3], CultureInfo.InvariantCulture);
429+
Pitch = Convert.ToDouble(missionFrameParameters[4], CultureInfo.InvariantCulture);
430+
Roll = Convert.ToDouble(missionFrameParameters[5], CultureInfo.InvariantCulture);
430431
}
431432

432433
/// <summary>

‎src/WPF/ArcGISRuntime.WPF.Viewer/Samples/GraphicsOverlay/DictionaryRendererGraphicsOverlay/DictionaryRendererGraphicsOverlay.xaml.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using Esri.ArcGISRuntime.UI;
1515
using System;
1616
using System.Collections.Generic;
17+
using System.Globalization;
1718
using System.Linq;
1819
using System.Windows;
1920
using System.Xml.Linq;
@@ -112,7 +113,7 @@ private Graphic GraphicFromAttributes(List<XElement> graphicAttributes)
112113
foreach (string pointString in pointStrings)
113114
{
114115
var coords = pointString.Split(',');
115-
graphicPoints.Add(Convert.ToDouble(coords[0]), Convert.ToDouble(coords[1]));
116+
graphicPoints.Add(Convert.ToDouble(coords[0], CultureInfo.InvariantCulture), Convert.ToDouble(coords[1], CultureInfo.InvariantCulture));
116117
}
117118

118119
// Create a multipoint from the point collection.

‎src/iOS/Xamarin.iOS/Samples/GraphicsOverlay/Animate3DGraphic/Animate3DGraphic.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using System.Collections.Generic;
1919
using System.Diagnostics;
2020
using System.Drawing;
21+
using System.Globalization;
2122
using System.IO;
2223
using System.Linq;
2324
using System.Timers;
@@ -494,12 +495,12 @@ public MissionFrame(string missionLine)
494495
}
495496

496497
// Populate the object's properties from the array of parameters.
497-
Longitude = Convert.ToDouble(missionFrameParameters[0]);
498-
Latitude = Convert.ToDouble(missionFrameParameters[1]);
499-
Elevation = Convert.ToDouble(missionFrameParameters[2]);
500-
Heading = Convert.ToDouble(missionFrameParameters[3]);
501-
Pitch = Convert.ToDouble(missionFrameParameters[4]);
502-
Roll = Convert.ToDouble(missionFrameParameters[5]);
498+
Longitude = Convert.ToDouble(missionFrameParameters[0], CultureInfo.InvariantCulture);
499+
Latitude = Convert.ToDouble(missionFrameParameters[1], CultureInfo.InvariantCulture);
500+
Elevation = Convert.ToDouble(missionFrameParameters[2], CultureInfo.InvariantCulture);
501+
Heading = Convert.ToDouble(missionFrameParameters[3], CultureInfo.InvariantCulture);
502+
Pitch = Convert.ToDouble(missionFrameParameters[4], CultureInfo.InvariantCulture);
503+
Roll = Convert.ToDouble(missionFrameParameters[5], CultureInfo.InvariantCulture);
503504
}
504505

505506
/// <summary>

‎src/iOS/Xamarin.iOS/Samples/GraphicsOverlay/DictionaryRendererGraphicsOverlay/DictionaryRendererGraphicsOverlay.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using Foundation;
1818
using System;
1919
using System.Collections.Generic;
20+
using System.Globalization;
2021
using System.Linq;
2122
using System.Xml.Linq;
2223
using UIKit;
@@ -117,7 +118,7 @@ private Graphic GraphicFromAttributes(List<XElement> graphicAttributes)
117118
foreach (string pointString in pointStrings)
118119
{
119120
var coords = pointString.Split(',');
120-
graphicPoints.Add(Convert.ToDouble(coords[0]), Convert.ToDouble(coords[1]));
121+
graphicPoints.Add(Convert.ToDouble(coords[0], CultureInfo.InvariantCulture), Convert.ToDouble(coords[1], CultureInfo.InvariantCulture));
121122
}
122123

123124
// Create a multipoint from the point collection.

0 commit comments

Comments
 (0)