From d8c8a40bcb6963547f651ab59396c1fbad41c3dc Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 24 Jan 2019 21:26:23 +0100 Subject: [PATCH 1/2] Expanded CultureInfo debug page --- Site/Pages/v5/Admin/Json-CultureInfo.aspx.cs | 31 +- Site/Pages/v5/User/SelectLanguage.aspx.cs | 4 +- Site/Site.csproj | 406 ++++++++++++++++++- 3 files changed, 434 insertions(+), 7 deletions(-) diff --git a/Site/Pages/v5/Admin/Json-CultureInfo.aspx.cs b/Site/Pages/v5/Admin/Json-CultureInfo.aspx.cs index 63e948af..2249a920 100644 --- a/Site/Pages/v5/Admin/Json-CultureInfo.aspx.cs +++ b/Site/Pages/v5/Admin/Json-CultureInfo.aspx.cs @@ -2,10 +2,14 @@ using System.Collections.Generic; using System.Globalization; using System.Text; +using System.IO; using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using Newtonsoft.Json; +using Swarmops.Logic.Support; +using WebSocketSharp.Server; namespace Swarmops.Frontend.Pages.v5.Admin { @@ -22,6 +26,16 @@ namespace Swarmops.Frontend.Pages.v5.Admin private static string AllCulturesAsJson() { StringBuilder result = new StringBuilder(16384); + Dictionary cultureLookup = new Dictionary(); + + string[] supportedCultures = Swarmops.Logic.Support.Formatting.SupportedCultures; + foreach (string culture in supportedCultures) + { + cultureLookup[culture] = true; + } + + string yesImage = ""; + string noImage = ""; result.Append("{\"rows\":["); @@ -35,16 +49,27 @@ namespace Swarmops.Frontend.Pages.v5.Admin { region = new RegionInfo(culture.Name); + string flagFile = SupportFunctions.FlagFileFromCultureId(culture.Name); + + if (!File.Exists(HttpContext.Current.Server.MapPath("~" + flagFile))) + { + flagFile = string.Empty; + } + else + { + flagFile = ""; + } + result.Append("{"); result.AppendFormat( "\"cultureId\":\"{0}\",\"name\":\"{1}\",\"nameInternational\":\"{2}\",\"language\":\"{3}\",\"country\":\"{4}\",\"flag\":\"{5}\",\"supported\":\"{6}\"", culture.Name, culture.NativeName, culture.EnglishName, - "Language", + region.DisplayName, region.EnglishName, - "Fl", - "Sp" + flagFile.Length > 2? flagFile : noImage, + cultureLookup.ContainsKey(culture.Name)? yesImage: noImage ); result.Append("},"); diff --git a/Site/Pages/v5/User/SelectLanguage.aspx.cs b/Site/Pages/v5/User/SelectLanguage.aspx.cs index 6f2a90fd..a3625c60 100644 --- a/Site/Pages/v5/User/SelectLanguage.aspx.cs +++ b/Site/Pages/v5/User/SelectLanguage.aspx.cs @@ -32,9 +32,7 @@ namespace Swarmops.Frontend.Pages.v5.User private void PopulateRepeater() { - string[] availableCultures = {"ar-AE", "de-DE", "yo-Latn" /* Yoruba writes as Èbè */, "el" /* Greek writes as Ellenika */ , "es-ES", "fr-FR", "fil-Latn", "it-IT", "nl-NL", "pl-PL", "pt-PT", "ru-RU", "sr-Cyrl-RS", "sr-Latn-RS", "sv-SE", "tr-TR", "zh-CHS" }; - - // the above locales are sorted by the language NATIVE name, to make the list maximally useful + string[] availableCultures = Formatting.SupportedCultures; List availableLanguages = new List(); foreach (string cultureId in availableCultures) diff --git a/Site/Site.csproj b/Site/Site.csproj index 906524cb..6bf1d1d0 100644 --- a/Site/Site.csproj +++ b/Site/Site.csproj @@ -158,6 +158,116 @@ True Pages.Swarm.ca-ES.resx + + True + True + Controls.Swarm.cs-CZ.resx + + + True + True + Global.cs-CZ.resx + + + True + True + Menu5.cs-CZ.resx + + + True + True + Pages.Admin.cs-CZ.resx + + + True + True + Pages.Comms.cs-CZ.resx + + + True + True + Pages.Financial.cs-CZ.resx + + + True + True + Pages.Governance.cs-CZ.resx + + + True + True + Pages.Ledgers.cs-CZ.resx + + + True + True + Pages.Public.cs-CZ.resx + + + True + True + Pages.Security.cs-CZ.resx + + + True + True + Pages.Swarm.cs-CZ.resx + + + True + True + Controls.Swarm.es-VE.resx + + + True + True + Global.es-VE.resx + + + True + True + Menu5.es-VE.resx + + + True + True + Pages.Admin.es-VE.resx + + + True + True + Pages.Comms.es-VE.resx + + + True + True + Pages.Financial.es-VE.resx + + + True + True + Pages.Governance.es-VE.resx + + + True + True + Pages.Ledgers.es-VE.resx + + + True + True + Pages.Public.es-VE.resx + + + True + True + Pages.Security.es-VE.resx + + + True + True + Pages.Swarm.es-VE.resx + True True @@ -488,6 +598,116 @@ True Pages.Swarm.sk-SK.resx + + True + True + Controls.Swarm.sr-Cyrl-RS.resx + + + True + True + Global.sr-Cyrl-RS.resx + + + True + True + Menu5.sr-Cyrl-RS.resx + + + True + True + Pages.Admin.sr-Cyrl-RS.resx + + + True + True + Pages.Comms.sr-Cyrl-RS.resx + + + True + True + Pages.Financial.sr-Cyrl-RS.resx + + + True + True + Pages.Governance.sr-Cyrl-RS.resx + + + True + True + Pages.Ledgers.sr-Cyrl-RS.resx + + + True + True + Pages.Public.sr-Cyrl-RS.resx + + + True + True + Pages.Security.sr-Cyrl-RS.resx + + + True + True + Pages.Swarm.sr-Cyrl-RS.resx + + + True + True + Controls.Swarm.sr-Latn-RS.resx + + + True + True + Global.sr-Latn-RS.resx + + + True + True + Menu5.sr-Latn-RS.resx + + + True + True + Pages.Admin.sr-Latn-RS.resx + + + True + True + Pages.Comms.sr-Latn-RS.resx + + + True + True + Pages.Financial.sr-Latn-RS.resx + + + True + True + Pages.Governance.sr-Latn-RS.resx + + + True + True + Pages.Ledgers.sr-Latn-RS.resx + + + True + True + Pages.Public.sr-Latn-RS.resx + + + True + True + Pages.Security.sr-Latn-RS.resx + + + True + True + Pages.Swarm.sr-Latn-RS.resx + True True @@ -1578,7 +1798,6 @@ - @@ -1699,6 +1918,7 @@ + @@ -5332,6 +5552,190 @@ + + + GlobalResourceProxyGenerator + Controls.Swarm.cs-CZ.designer.cs + + + GlobalResourceProxyGenerator + Global.cs-CZ.designer.cs + + + GlobalResourceProxyGenerator + Menu5.cs-CZ.designer.cs + + + GlobalResourceProxyGenerator + Pages.Admin.cs-CZ.designer.cs + + + GlobalResourceProxyGenerator + Pages.Comms.cs-CZ.designer.cs + + + GlobalResourceProxyGenerator + Pages.Financial.cs-CZ.designer.cs + + + GlobalResourceProxyGenerator + Pages.Governance.cs-CZ.designer.cs + + + GlobalResourceProxyGenerator + Pages.Ledgers.cs-CZ.designer.cs + + + GlobalResourceProxyGenerator + Pages.Public.cs-CZ.designer.cs + + + GlobalResourceProxyGenerator + Pages.Security.cs-CZ.designer.cs + + + GlobalResourceProxyGenerator + Pages.Swarm.cs-CZ.designer.cs + + + + + GlobalResourceProxyGenerator + Controls.Swarm.es-VE.designer.cs + + + GlobalResourceProxyGenerator + Global.es-VE.designer.cs + + + GlobalResourceProxyGenerator + Menu5.es-VE.designer.cs + + + GlobalResourceProxyGenerator + Pages.Admin.es-VE.designer.cs + + + GlobalResourceProxyGenerator + Pages.Comms.es-VE.designer.cs + + + GlobalResourceProxyGenerator + Pages.Financial.es-VE.designer.cs + + + GlobalResourceProxyGenerator + Pages.Governance.es-VE.designer.cs + + + GlobalResourceProxyGenerator + Pages.Ledgers.es-VE.designer.cs + + + GlobalResourceProxyGenerator + Pages.Public.es-VE.designer.cs + + + GlobalResourceProxyGenerator + Pages.Security.es-VE.designer.cs + + + GlobalResourceProxyGenerator + Pages.Swarm.es-VE.designer.cs + + + + + GlobalResourceProxyGenerator + Controls.Swarm.sr-Cyrl-RS.designer.cs + + + GlobalResourceProxyGenerator + Global.sr-Cyrl-RS.designer.cs + + + GlobalResourceProxyGenerator + Menu5.sr-Cyrl-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Admin.sr-Cyrl-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Comms.sr-Cyrl-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Financial.sr-Cyrl-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Governance.sr-Cyrl-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Ledgers.sr-Cyrl-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Public.sr-Cyrl-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Security.sr-Cyrl-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Swarm.sr-Cyrl-RS.designer.cs + + + + + GlobalResourceProxyGenerator + Controls.Swarm.sr-Latn-RS.designer.cs + + + GlobalResourceProxyGenerator + Global.sr-Latn-RS.designer.cs + + + GlobalResourceProxyGenerator + Menu5.sr-Latn-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Admin.sr-Latn-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Comms.sr-Latn-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Financial.sr-Latn-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Governance.sr-Latn-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Ledgers.sr-Latn-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Public.sr-Latn-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Security.sr-Latn-RS.designer.cs + + + GlobalResourceProxyGenerator + Pages.Swarm.sr-Latn-RS.designer.cs + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) From e7c3bd247e63dc66f8809fe50d9aba908e4d741c Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 24 Jan 2019 21:32:09 +0100 Subject: [PATCH 2/2] Expanded CultureInfo debug page --- Site/Pages/v5/Admin/Json-CultureInfo.aspx.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Site/Pages/v5/Admin/Json-CultureInfo.aspx.cs b/Site/Pages/v5/Admin/Json-CultureInfo.aspx.cs index 2249a920..5d91cc3b 100644 --- a/Site/Pages/v5/Admin/Json-CultureInfo.aspx.cs +++ b/Site/Pages/v5/Admin/Json-CultureInfo.aspx.cs @@ -34,8 +34,8 @@ namespace Swarmops.Frontend.Pages.v5.Admin cultureLookup[culture] = true; } - string yesImage = ""; - string noImage = ""; + string yesImage = ""; + string noImage = ""; result.Append("{\"rows\":["); @@ -57,7 +57,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin } else { - flagFile = ""; + flagFile = ""; } result.Append("{");