Fix localization for Spanish Civil 3D (#9876)

angelowang · QilongTang · commit ddbf7e3e201f · 2019-08-05T11:35:18.000-04:00
* Fix tooltip for Spanish Civil 3D

In AutoCAD/Civil3D, `CurrentUICulture.ToString()` will return traditional `es-ES_tradnl`,
instead of plain `es-ES`. This will fail the finding of xml document later.

This change uses `CurrentUICulture.Name` instead.
From MS DOC for `CultureInfo.Name`:
&gt; Gets the culture name in the format languagecode2-country/regioncode2.

* More fix for samples and gallery
diff --git a/src/DynamoCore/Configuration/PathManager.cs b/src/DynamoCore/Configuration/PathManager.cs
@@ -543,7 +543,7 @@ private static string GetSamplesFolder(string dataRootDirectory)
                 dataRootDirectory = Directory.GetParent(versionedDirectory).FullName;
             }
 
-            var uiCulture = CultureInfo.CurrentUICulture.ToString();
+            var uiCulture = CultureInfo.CurrentUICulture.Name;
             var sampleDirectory = Path.Combine(dataRootDirectory, SamplesDirectoryName, uiCulture);
 
             // If the localized samples directory does not exist then fall back 
@@ -582,7 +582,7 @@ private static string GetGalleryDirectory(string commonDataDir)
                 commonDataDir = Directory.GetParent(versionedDirectory).FullName;
             }
 
-            var uiCulture = CultureInfo.CurrentUICulture.ToString();
+            var uiCulture = CultureInfo.CurrentUICulture.Name;
             var galleryDirectory = Path.Combine(commonDataDir, GalleryDirectoryName, uiCulture);
 
             // If the localized gallery directory does not exist then fall back 
diff --git a/src/DynamoCore/Library/DocumentationServices.cs b/src/DynamoCore/Library/DocumentationServices.cs
@@ -67,7 +67,7 @@ private static bool ResolveForAssembly(string assemblyLocation,
                 baseDir = Path.GetDirectoryName(Path.GetFullPath(assemblyLocation));
             }
 
-            var language = System.Threading.Thread.CurrentThread.CurrentUICulture.ToString();
+            var language = System.Threading.Thread.CurrentThread.CurrentUICulture.Name;
             //try with the system culture
             var localizedDocPath = Path.Combine(baseDir, language);
 
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -1373,7 +1373,7 @@ private void ShowOpenDialogAndOpenResult(object parameter)
             {
                 Assembly dynamoAssembly = Assembly.GetExecutingAssembly();
                 string location = Path.GetDirectoryName(dynamoAssembly.Location);
-                string UICulture = CultureInfo.CurrentUICulture.ToString();
+                string UICulture = CultureInfo.CurrentUICulture.Name;
                 string path = Path.Combine(location, "samples", UICulture);
 
                 if (Directory.Exists(path))

Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ private static string GetSamplesFolder(string dataRootDirectory)`
`543`	`543`	`dataRootDirectory = Directory.GetParent(versionedDirectory).FullName;`
`544`	`544`	`}`
`545`	`545`
`546`		`- var uiCulture = CultureInfo.CurrentUICulture.ToString();`
	`546`	`+ var uiCulture = CultureInfo.CurrentUICulture.Name;`
`547`	`547`	`var sampleDirectory = Path.Combine(dataRootDirectory, SamplesDirectoryName, uiCulture);`
`548`	`548`
`549`	`549`	`// If the localized samples directory does not exist then fall back`
`@@ -582,7 +582,7 @@ private static string GetGalleryDirectory(string commonDataDir)`
`582`	`582`	`commonDataDir = Directory.GetParent(versionedDirectory).FullName;`
`583`	`583`	`}`
`584`	`584`
`585`		`- var uiCulture = CultureInfo.CurrentUICulture.ToString();`
	`585`	`+ var uiCulture = CultureInfo.CurrentUICulture.Name;`
`586`	`586`	`var galleryDirectory = Path.Combine(commonDataDir, GalleryDirectoryName, uiCulture);`
`587`	`587`
`588`	`588`	`// If the localized gallery directory does not exist then fall back`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private static bool ResolveForAssembly(string assemblyLocation,`
`67`	`67`	`baseDir = Path.GetDirectoryName(Path.GetFullPath(assemblyLocation));`
`68`	`68`	`}`
`69`	`69`
`70`		`- var language = System.Threading.Thread.CurrentThread.CurrentUICulture.ToString();`
	`70`	`+ var language = System.Threading.Thread.CurrentThread.CurrentUICulture.Name;`
`71`	`71`	`//try with the system culture`
`72`	`72`	`var localizedDocPath = Path.Combine(baseDir, language);`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -1373,7 +1373,7 @@ private void ShowOpenDialogAndOpenResult(object parameter)`
`1373`	`1373`	`{`
`1374`	`1374`	`Assembly dynamoAssembly = Assembly.GetExecutingAssembly();`
`1375`	`1375`	`string location = Path.GetDirectoryName(dynamoAssembly.Location);`
`1376`		`- string UICulture = CultureInfo.CurrentUICulture.ToString();`
	`1376`	`+ string UICulture = CultureInfo.CurrentUICulture.Name;`
`1377`	`1377`	`string path = Path.Combine(location, "samples", UICulture);`
`1378`	`1378`
`1379`	`1379`	`if (Directory.Exists(path))`