Merge pull request #41 from sillsdev/add-device-ui-language

Added DeviceUILanguage application property in support of "Top 5 Devi…

Author: tombogle

DesktopAnalytics.sln.DotSettings

@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IO/@EntryIndexedValue">IO</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Analytics/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mixpanel/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=netapi/@EntryIndexedValue">True</s:Boolean>

src/DesktopAnalytics/Analytics.cs

@@ -220,17 +220,25 @@ public Analytics(string apiSecret, UserInfo userInfo, Dictionary<string,
 			ReportIpAddressOfThisMachineAsync(); //this will take a while and may fail, so just do it when/if we can
 
 			var assembly = assemblyToUseForVersion ?? Assembly.GetEntryAssembly();
-			var versionNumberWithBuild = assembly.GetName().Version?.ToString() ?? "";
-			string versionNumber = versionNumberWithBuild.Split('.').Take(2).Aggregate((a, b) => a + "." + b);
+			var versionNumberWithBuild = assembly?.GetName().Version?.ToString() ?? "";
+			var versionNumber = versionNumberWithBuild.Split('.').Take(2).Aggregate((a, b) => a + "." + b);
 			SetApplicationProperty("Version", versionNumber);
 			SetApplicationProperty("FullVersion", versionNumberWithBuild);
 			SetApplicationProperty("UserName", GetUserNameForEvent());
 			SetApplicationProperty("Browser", GetOperatingSystemLabel());
 			SetApplicationProperty("OS Version Number", GetOperatingSystemVersionLabel());
 			SetApplicationProperty("64bit OS", Environment.Is64BitOperatingSystem.ToString());
 			SetApplicationProperty("64bit App", Environment.Is64BitProcess.ToString());
-
-
+			// This (and "64bit OS" above) really belong in Context, but segment.io doesn't seem
+			// to convey context to Mixpanel in a reliable/predictable form.
+			var ci = CultureInfo.CurrentUICulture;
+			const string invariantCulture = "iv";
+			var installedUICulture = !IsNullOrEmpty(ci.TwoLetterISOLanguageName) &&
+				ci.TwoLetterISOLanguageName != invariantCulture
+				? ci.TwoLetterISOLanguageName
+				: ci.ThreeLetterISOLanguageName;
+			SetApplicationProperty("DeviceUILanguage", installedUICulture);
+			
 			if (IsNullOrEmpty(AnalyticsSettings.Default.LastVersionLaunched))
 			{
 				//"Created" is a special property that segment.io understands and coverts to equivalents in various analytics services

src/SampleApp/Program.cs

@@ -18,7 +18,7 @@ static int Main(string[] args)
 
 			if (!Enum.TryParse<ClientType>(args[1], true, out var clientType))
 			{
-				Console.WriteLine($"Usage: SampleApp <analyticsApiSecret> <Segment|Mixpanel|???>{Environment.NewLine}Unrecoginzed client type: {args[1]}");
+				Console.WriteLine($"Usage: SampleApp <analyticsApiSecret> <Segment|Mixpanel|???>{Environment.NewLine}Unrecognized client type: {args[1]}");
 				return 1;
 			}
 
@@ -29,7 +29,8 @@ static int Main(string[] args)
 				Email="[email protected]",
 				UILanguageCode= "fr"
 			};
-			userInfo.OtherProperties.Add("HowIUseIt","This is a really long explanation of how I use this product to see how much you would be able to extract from Mixpanel.\r\nAnd a second line of it.");
+			userInfo.OtherProperties.Add("HowIUseIt",
+				"This is a really long explanation of how I use this product to see how much you would be able to extract from Mixpanel.\r\nAnd a second line of it.");
 
 			var propsForEveryEvent = new Dictionary<string, string> {{"channel", "beta"}};
 			using (new Analytics(args[0], userInfo, propertiesThatGoWithEveryEvent: propsForEveryEvent, clientType: clientType))