Updated locales

FoxTube/App.xaml.cs

@@ -22,6 +22,8 @@ namespace FoxTube
 {
     sealed partial class App : Application
     {
+        public static string[] AvailableLanguages => new[] { "en-US", "ru-RU" };
+
         Stopwatch sw = new Stopwatch();
         public App()
         {

FoxTube/Classes/SettingsStorage.cs

@@ -24,9 +24,9 @@ namespace FoxTube
         public bool autoplay = true;
         public double volume = 100;
 
-        public string language = (new[] { "ua", "ru", "by", "kz", "kg", "md", "lv", "ee" }).Contains(CultureInfo.InstalledUICulture.TwoLetterISOLanguageName) ? "ru-RU" : "en-US";
-        public string relevanceLanguage = (new[] { "ua", "ru", "by", "kz", "kg", "md", "lv", "ee" }).Contains(CultureInfo.InstalledUICulture.TwoLetterISOLanguageName) ? "ru" : "en";
-        public string region = (new[] { "ua", "ru", "by", "kz", "kg", "md", "lv", "ee" }).Contains(CultureInfo.InstalledUICulture.TwoLetterISOLanguageName) ? "ru" : "us";
+        public string language = GetLanguage();
+        public string relevanceLanguage = CultureInfo.InstalledUICulture.TwoLetterISOLanguageName;
+        public string region = CultureInfo.InstalledUICulture.Name.Split('-')[1];
         public int safeSearch = 0;
 
         public bool hasAccount = false;
@@ -38,6 +38,16 @@ namespace FoxTube
 
         public bool processClipboard = true;
         public bool minimizeCommandbar = false;
+
+        private static string GetLanguage()
+        {
+            if (App.AvailableLanguages.Contains(CultureInfo.InstalledUICulture.Name))
+                return CultureInfo.InstalledUICulture.Name;
+            else if ((new[] { "ua", "ru", "by", "kz", "kg", "md", "lv", "ee" }).Contains(CultureInfo.InstalledUICulture.TwoLetterISOLanguageName))
+                return "ru-RU";
+            else
+                return "en-US";
+        }
     }
 
     public static class SettingsStorage

FoxTube/Pages/SettingsPages/Inbox.xaml.cs

@@ -8,6 +8,7 @@ using FoxTube.Classes;
 using Windows.Storage;
 using System.Xml;
 using Microsoft.AppCenter.Analytics;
+using System.Globalization;
 
 namespace FoxTube.Pages.SettingsPages
 {
@@ -23,6 +24,14 @@ namespace FoxTube.Pages.SettingsPages
             InitializeComponent();
         }
 
+        string GetLanguage()
+        {
+            if ((new[] { "ua", "ru", "by", "kz", "kg", "md", "lv", "ee" }).Contains(CultureInfo.InstalledUICulture.TwoLetterISOLanguageName))
+                return "ru-RU";
+            else
+                return "en-US";
+        }
+
         public async void LoadItems(string id = null)
         {
             try
@@ -34,14 +43,14 @@ namespace FoxTube.Pages.SettingsPages
                 foreach (XmlElement e in doc["items"].ChildNodes)
                     items.Add(new InboxItem(
                         e.GetAttribute("version"),
-                        e["content"][SettingsStorage.Language].InnerText,
+                        e["content"][GetLanguage()].InnerText,
                         DateTime.Parse(e.GetAttribute("time"), System.Globalization.CultureInfo.GetCultureInfo("en-US").DateTimeFormat)));
 
                 doc.Load("http://foxgame-studio.000webhostapp.com/foxtube-messages.xml");
                 foreach (XmlElement e in doc["posts"].ChildNodes)
                     items.Add(new InboxItem(
-                        e["header"][SettingsStorage.Language].InnerText,
-                        e["content"][SettingsStorage.Language].InnerText,
+                        e["header"][GetLanguage()].InnerText,
+                        e["content"][GetLanguage()].InnerText,
                         DateTime.Parse(e.GetAttribute("time"), System.Globalization.CultureInfo.GetCultureInfo("en-US").DateTimeFormat),
                         e["id"].InnerText,
                         e["contentHeader"].InnerText));

FoxTube/Strings/en-US/CommentsPage.resw

@@ -145,10 +145,10 @@
     <value>Submit</value>
   </data>
   <data name="failedDelete" xml:space="preserve">
-    <value>Failed to delete your commentary. Please, try again later.</value>
+    <value>Failed to delete your comment. Please, try again later.</value>
   </data>
   <data name="failedEdit" xml:space="preserve">
-    <value>Failed to edit your commentary. Please, try again later.</value>
+    <value>Failed to edit your comment. Please, try again later.</value>
   </data>
   <data name="failedReply" xml:space="preserve">
     <value>Failed to send your reply. Please, try again later.</value>

FoxTube/Strings/en-US/Downloads.resw

@@ -142,7 +142,7 @@
     <value>Bug report has been sent</value>
   </data>
   <data name="failedHead" xml:space="preserve">
-    <value>Error occured while dowloading a video</value>
+    <value>Error occurred while downloading a video</value>
   </data>
   <data name="gotoOrign.Text" xml:space="preserve">
     <value>Go to original</value>

FoxTube/Strings/en-US/VideoPage.resw

@@ -175,7 +175,7 @@
     <value>Go to live broadcast</value>
   </data>
   <data name="matureText" xml:space="preserve">
-    <value>This content may be not apropriate for children under 18</value>
+    <value>This content may be not appropriate for children under 18</value>
   </data>
   <data name="maximize.Text" xml:space="preserve">
     <value>Maximize</value>