GabrielTofvesson/BankProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Added internationalization manager

Browse Source 
- Prioritizes language file matching system language above all else
  - Secondarily prioritizes "default" lang file
  - Prioritizes lang files declared in meta file (low-to-high priority system)
Moved resource files to one folder
Added multi-file loading support
Started creating a shared layout resource file
Added language files
  - Swedish (default): Incomplete
  - English US (priority 0): Complete
  - English GB: (priority ): Complete
Continued implementing ListVew
Added reference support for 'top' variable in View.Draw()
This commit is contained in:
Gabriel Tofvesson 2018-04-04 11:58:09 +02:00
parent 5aacdba782
commit 3c36755c7c
28 changed files with 520 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Client/Client.csproj
View File

@ -51,6 +51,7 @@
<Compile Include="ConsoleForms\Graphics\ButtonView.cs" />
<Compile Include="ConsoleForms\Graphics\DialogView.cs" />
<Compile Include="ConsoleForms\Graphics\InputView.cs" />
<Compile Include="ConsoleForms\LangManager.cs" />
<Compile Include="ConsoleForms\LayoutMeta.cs" />
<Compile Include="ConsoleForms\Graphics\ListView.cs" />
<Compile Include="ConsoleForms\Graphics\TextView.cs" />
@ -88,13 +89,18 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Layout\Session.xml" />
<Content Include="Layout\Setup.xml">
<Content Include="Resources\Layout\Common.xml" />
<Content Include="Resources\Layout\Session.xml" />
<Content Include="Resources\Layout\Setup.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="Layout\Networking.xml">
<Content Include="Resources\Layout\Networking.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="Resources\Strings\en_GB\strings.xml" />
<Content Include="Resources\Strings\en_US\strings.xml" />
<Content Include="Resources\Strings\Meta.xml" />
<Content Include="Resources\Strings\sv_SE\strings.xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">

23
Client/ConsoleForms/ConsoleController.cs
View File

@ -211,9 +211,9 @@ namespace Client.ConsoleForms
}
}
private static ViewData DoElementParse(XmlNode el)
private static ViewData DoElementParse(XmlNode el, LangManager lang)
{
ViewData data = new ViewData(el.LocalName, el.InnerText);
ViewData data = new ViewData(el.LocalName, lang.MapIfExists(el.InnerText));
if (el.Attributes != null)
foreach (var attr in el.Attributes)
@ -222,14 +222,14 @@ namespace Client.ConsoleForms
if (el.ChildNodes != null)
foreach (var child in el.ChildNodes)
if (child is XmlNode) data.nestedData.Add(DoElementParse((XmlNode)child));
if (child is XmlNode) data.nestedData.Add(DoElementParse((XmlNode)child, lang));
return data;
}
private static Dictionary<string, List<Tuple<string, View>>> cache = new Dictionary<string, List<Tuple<string, View>>>();
public static List<Tuple<string, View>> LoadResourceViews(string name, bool doCache = true)
public static List<Tuple<string, View>> LoadResourceViews(string name, LangManager lang, bool doCache = true)
{
if (cache.ContainsKey(name))
return cache[name];
@ -237,10 +237,10 @@ namespace Client.ConsoleForms
PropertyInfo[] properties = typeof(Resources).GetProperties(BindingFlags.NonPublic | BindingFlags.Static);
foreach (var prop in properties)
if (prop.Name.Equals(name) && prop.PropertyType.Equals(typeof(string)))
return LoadViews((string)prop.GetValue(null), doCache ? name : null);
return LoadViews((string)prop.GetValue(null), lang, doCache ? name : null);
throw new SystemException($"Resource { name } could not be located!");
}
public static List<Tuple<string, View>> LoadViews(string xml, string cacheID = null)
public static List<Tuple<string, View>> LoadViews(string xml, LangManager lang, string cacheID = null)
{
if (cacheID != null && cache.ContainsKey(cacheID))
return cache[cacheID];
@ -254,25 +254,25 @@ namespace Client.ConsoleForms
foreach (var child in doc.FirstChild.NextSibling.ChildNodes)
if (!(child is XmlNode) || child is XmlComment) continue;
else views.Add(LoadView(ns, DoElementParse((XmlNode)child)));
else views.Add(LoadView(ns, DoElementParse((XmlNode)child, lang), lang));
if (cacheID != null) cache[cacheID] = views;
return views;
}
public static Tuple<string, View> LoadView(string ns, ViewData data)
public static Tuple<string, View> LoadView(string ns, ViewData data, LangManager lang)
{
Type type;
try { type = Type.GetType(ns + '.' + data.Name, true); }
catch { type = Type.GetType(data.Name, true); }
ConstructorInfo info = type.GetConstructor(new Type[] { typeof(ViewData) });
ConstructorInfo info = type.GetConstructor(new Type[] { typeof(ViewData), typeof(LangManager) });
string id = data.attributes.ContainsKey("id") ? data.attributes["id"] : "";
data.attributes["xmlns"] = ns;
return new Tuple<string, View>(id, (View)info.Invoke(new object[] { data }));
return new Tuple<string, View>(id, (View)info.Invoke(new object[] { data, lang }));
}
public delegate void Runnable();
@ -284,7 +284,8 @@ namespace Client.ConsoleForms
.SetAttribute("padding_right", 2)
.SetAttribute("padding_top", 1)
.SetAttribute("padding_bottom", 1)
.AddNested(new ViewData("Text", message)) // Add message
.AddNested(new ViewData("Text", message)), // Add message
LangManager.NO_LANG
)
{
BackgroundColor = ConsoleColor.White,

17
Client/ConsoleForms/Context.cs
View File

@ -16,10 +16,23 @@ namespace Client.ConsoleForms
protected readonly ReadOnlyCollection<Tuple<string, View>> views;
protected readonly ContextManager manager;
public Context(ContextManager manager, string contextName, bool asResource = true)
private delegate List<Tuple<string, View>> ViewLoader(string data, LangManager lang);
public Context(ContextManager manager, params string[] contextNames) : this(manager, true, contextNames) { }
public Context(ContextManager manager, bool asResource, params string[] contextNames)
{
this.manager = manager;
views = new ReadOnlyCollectionBuilder<Tuple<string, View>>(asResource ? ConsoleController.LoadResourceViews(contextName) : ConsoleController.LoadViews(contextName)).ToReadOnlyCollection();
ViewLoader loader;
if (asResource) loader = (d, m) => ConsoleController.LoadResourceViews(d, m);
else loader = (d, m) => ConsoleController.LoadViews(d, m);
List<Tuple<string, View>> l = new List<Tuple<string, View>>();
foreach(var contextName in contextNames)
foreach (var viewPair in loader(contextName, manager.I18n))
if (l.GetNamed(viewPair.Item1) != null) throw new SystemException($"View with id=\"{viewPair.Item1}\" has already been loaded!");
else l.Add(viewPair);
views = new ReadOnlyCollectionBuilder<Tuple<string, View>>(l).ToReadOnlyCollection();
}
public virtual bool Update(ConsoleController.KeyEvent keypress, bool hasKeypress = true)

7
Client/ConsoleForms/ContextManager.cs
View File

@ -9,6 +9,13 @@ namespace Client.ConsoleForms
public sealed class ContextManager
{
public Context Current { get; private set; }
public LangManager I18n { get; private set; }
public ContextManager(bool doLang = true)
{
if (doLang) I18n = LangManager.LoadLang();
else I18n = LangManager.NO_LANG;
}
public void LoadContext(Context ctx)
{

2
Client/ConsoleForms/Graphics/ButtonView.cs
View File

@ -12,7 +12,7 @@ namespace Client.ConsoleForms.Graphics
{
protected SubmissionEvent evt;
public ButtonView(ViewData parameters) : base(parameters)
public ButtonView(ViewData parameters, LangManager lang) : base(parameters, lang)
{
}

4
Client/ConsoleForms/Graphics/DialogView.cs
View File

@ -29,12 +29,12 @@ namespace Client.ConsoleForms.Graphics
private static int ComputeLength(Tuple<string, string>[] opts) => opts.CollectiveLength(true) + opts.Length - 1;
public DialogView(ViewData parameters) :
public DialogView(ViewData parameters, LangManager lang) :
base(parameters.SetAttribute("width",
Math.Max(
parameters.AttribueAsInt("width") < 1 ? parameters.NestedText("Text").Length : parameters.AttribueAsInt("width"),
ComputeLength(parameters.Get("Options").CollectSub("Option"))
)))
)), lang)
{
ViewData optionsData = parameters.Get("Options");
this.options = optionsData.nestedData.Filter(p => p.Name.Equals("Option")).ToArray();

2
Client/ConsoleForms/Graphics/InputView.cs
View File

@ -120,7 +120,7 @@ namespace Client.ConsoleForms.Graphics
public SubmissionListener SubmissionsListener { protected get; set; }
public TextEnteredListener InputListener { protected get; set; }
public InputView(ViewData parameters) : base(parameters)
public InputView(ViewData parameters, LangManager lang) : base(parameters, lang)
{
int
sBC = parameters.AttribueAsInt("textfield_select_color", (int)ConsoleColor.Gray),

4
Client/ConsoleForms/Graphics/ListView.cs
View File

@ -15,7 +15,7 @@ namespace Client.ConsoleForms.Graphics
public override Region Occlusion => new Region(new Rectangle(0, 0, ContentWidth, ContentHeight));
public ListView(ViewData parameters) : base(parameters)
public ListView(ViewData parameters, LangManager lang) : base(parameters, lang)
{
SelectBackground = (ConsoleColor)parameters.AttribueAsInt("background_select_color", (int)ConsoleColor.Gray);
SelectText = (ConsoleColor)parameters.AttribueAsInt("text_select_color", (int)ConsoleColor.Gray);
@ -29,7 +29,7 @@ namespace Client.ConsoleForms.Graphics
// Limit content width
if (limited && view.AttribueAsInt("width") > maxWidth) view.attributes["width"] = maxWidth.ToString();
Tuple<string, View> v = ConsoleController.LoadView(parameters.attributes["xmlns"], view); // Load the view in with standard namespace
Tuple<string, View> v = ConsoleController.LoadView(parameters.attributes["xmlns"], view, I18n); // Load the view in with standard namespace
innerViews.Add(v);
if (!limited) maxWidth = Math.Max(v.Item2.ContentWidth, maxWidth);

2
Client/ConsoleForms/Graphics/TextView.cs
View File

@ -41,7 +41,7 @@ namespace Client.ConsoleForms.Graphics
//public char Border { get; set; }
//public ConsoleColor BorderColor { get; set; }
public TextView(ViewData parameters) : base(parameters)
public TextView(ViewData parameters, LangManager lang) : base(parameters, lang)
{
//BorderColor = (ConsoleColor) parameters.AttribueAsInt("border", (int)ConsoleColor.Blue);

6
Client/ConsoleForms/Graphics/View.cs
View File

@ -29,8 +29,9 @@ namespace Client.ConsoleForms.Graphics
public int ContentHeight { get; protected set; }
public abstract Region Occlusion { get; }
public bool Dirty { get; set; }
public LangManager I18n { get; private set; }
public View(ViewData parameters)
public View(ViewData parameters, LangManager lang)
{
padding = new AbsolutePadding(parameters.AttribueAsInt("padding_left"), parameters.AttribueAsInt("padding_right"), parameters.AttribueAsInt("padding_top"), parameters.AttribueAsInt("padding_bottom"));
gravity = (Gravity)parameters.AttribueAsInt("gravity");
@ -39,6 +40,7 @@ namespace Client.ConsoleForms.Graphics
TextColor = (ConsoleColor)parameters.AttribueAsInt("color_text", (int)ConsoleColor.Black);
Border = ' ';
DrawBorder = parameters.attributes.ContainsKey("border");
I18n = lang;
back_data = parameters.GetAttribute("back");
@ -108,7 +110,7 @@ namespace Client.ConsoleForms.Graphics
{
string[] components;
if (action == null || !action.Contains(':') || (components = action.Split(':')).Length != 2) return () => { };
var views = ConsoleController.LoadResourceViews(components[0]);
var views = ConsoleController.LoadResourceViews(components[0], I18n);
var view = views.GetNamed(components[1]);
return () =>
{

141
Client/ConsoleForms/LangManager.cs Normal file
View File

@ -0,0 +1,141 @@
using Client.Properties;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Xml;
namespace Client.ConsoleForms
{
public sealed class LangManager
{
private const string MAPPING_PREFIX = "@string/";
public static readonly LangManager NO_LANG = new LangManager(true);
private readonly Dictionary<string, string> mappings;
public string Name { get; }
private LangManager(bool b)
{
mappings = new Dictionary<string, string>();
Name = "";
}
public LangManager(string langName = "en_US", bool fromResource = true)
{
string from = null;
if (fromResource)
{
PropertyInfo[] properties = typeof(Resources).GetProperties(BindingFlags.NonPublic | BindingFlags.Static);
foreach (var prop in properties)
if (prop.Name.Equals("strings_lang_" + langName) && prop.PropertyType.Equals(typeof(string)))
{
from = (string)prop.GetValue(null);
break;
}
if (from == null)
{
mappings = new Dictionary<string, string>();
Name = "";
return;
}
}
else from = langName;
mappings = DoMapping(from, out string name);
Name = name;
}
public bool HasMapping(string name) => name.StartsWith(MAPPING_PREFIX) && mappings.ContainsKey(StripPrefix(name));
public string GetMapping(string name) => mappings[StripPrefix(name)];
public string MapIfExists(string name) => HasMapping(name) ? GetMapping(name) : name;
private string StripPrefix(string from) => from.Substring(MAPPING_PREFIX.Length);
private Dictionary<string, string> DoMapping(string xml, out string label)
{
XmlDocument doc = new XmlDocument();
doc.LoadXml(xml);
XmlNode lang = doc.GetElementsByTagName("Strings").Item(0);
// Janky way of setting label since the compiler apparently doesn't accept it in an else-statement
label = null;
if (lang is XmlElement lang_el && lang_el.HasAttribute("label")) label = lang_el.GetAttribute("label");
// Read language mappings
Dictionary<string, string> map = new Dictionary<string, string>();
foreach(var node in lang.ChildNodes)
if(node is XmlElement el && el.Name.Equals("Entry") && el.HasAttribute("name"))
map.Add(el.GetAttribute("name"), el.InnerText);
return map;
}
public static LangManager LoadLang(string langMeta = "strings_meta", bool fromResource = true)
{
if (fromResource)
{
PropertyInfo[] properties = typeof(Resources).GetProperties(BindingFlags.NonPublic | BindingFlags.Static);
foreach (var prop in properties)
if (prop.Name.Equals(langMeta) && prop.PropertyType.Equals(typeof(string)))
return new LangManager(ProcessMeta((string)prop.GetValue(null)));
}
return new LangManager(ProcessMeta(langMeta));
}
private static string ProcessMeta(string metaString)
{
XmlDocument doc = new XmlDocument();
doc.LoadXml(metaString);
XmlNode lang = doc.GetElementsByTagName("Lang").Item(0);
List<XmlElement> priorities = new List<XmlElement>();
foreach(var node in lang.ChildNodes)
if (node is XmlElement el)
{
if (el.Name.Equals("Default")) priorities.Insert(0, (XmlElement)node);
else if (el.Name.Equals("Fallback"))
{
for (int i = 0; i < priorities.Count; ++i)
if (!priorities[i].Name.Equals("Default") && ComparePriority(el, priorities[i]))
{
priorities.Insert(i, el);
break;
}
else if (i == priorities.Count - 1)
{
priorities.Add(el);
break;
}
}
}
PropertyInfo[] properties = typeof(Resources).GetProperties(BindingFlags.NonPublic | BindingFlags.Static);
// Check if we can use system language
string culture = System.Globalization.CultureInfo.InstalledUICulture.Name.Replace('-', '_');
foreach(var elt in priorities)
if (elt.InnerText.Equals(culture))
{
foreach (var prop in properties)
if (prop.Name.Equals("strings_lang_" + culture) && prop.PropertyType.Equals(typeof(string)))
return culture;
priorities.Remove(elt);
break;
}
// Use defults and fallbacks
for (int i = 0; i<priorities.Count; ++i)
{
foreach (var prop in properties)
if (prop.Name.Equals("strings_lang_"+priorities[i].InnerText) && prop.PropertyType.Equals(typeof(string)))
return priorities[i].InnerText;
}
return "";
}
private static bool ComparePriority(XmlElement el1, XmlElement el2)
=> el1.HasAttribute("priority") && int.TryParse(el1.GetAttribute("priority"), out int el1_prio) && (!el2.HasAttribute("priority") || !int.TryParse(el2.GetAttribute("priority"), out int el2_prio) || el1_prio < el2_prio);
}
}

2
Client/Context/NetContext.cs
View File

@ -12,7 +12,7 @@ namespace Client
{
public class NetContext : Context
{
public NetContext(ContextManager manager) : base(manager, "Networking")
public NetContext(ContextManager manager) : base(manager, "Networking", "Common")
{
// Just close when anything is selected and "submitted"
RegisterSelectListeners((s, i, v) => controller.CloseView(s), "EmptyFieldError", "IPError", "PortError", "ConnectionError");

2
Client/Context/SessionContext.cs
View File

@ -15,7 +15,7 @@ namespace Client
private readonly BankNetInteractor interactor;
private readonly string sessionID;
public SessionContext(ContextManager manager, BankNetInteractor interactor, string sessionID) : base(manager, "Session")
public SessionContext(ContextManager manager, BankNetInteractor interactor, string sessionID) : base(manager, "Session", "Common")
{
this.interactor = interactor;
this.sessionID = sessionID;

2
Client/Context/WelcomeContext.cs
View File

@ -17,7 +17,7 @@ namespace Client
private Promise promise;
private bool forceDestroy = true;
public WelcomeContext(ContextManager manager, BankNetInteractor connection) : base(manager, "Setup")
public WelcomeContext(ContextManager manager, BankNetInteractor connection) : base(manager, "Setup", "Common")
{
this.interactor = connection;

13
Client/Layout/Session.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<Elements xmlns="Client.ConsoleForms.Graphics">
<DialogView id="Success"
padding_left="2"
padding_right="2"
padding_top="1"
padding_bottom="1">
<Options>
<Option>Quit</Option>
</Options>
<Text>Login succeeded!</Text>
</DialogView>
</Elements>

1
Client/Program.cs
View File

@ -18,6 +18,7 @@ namespace ConsoleForms
// Set up timestamps in debug output
DebugStream = new TimeStampWriter(DebugStream, "HH:mm:ss.fff");
Padding p = new AbsolutePadding(2, 2, 1, 1);
Console.CursorVisible = false;

114
Client/Properties/Resources.Designer.cs generated
View File

@ -60,6 +60,27 @@ namespace Client.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
///&lt;Resources&gt;
/// &lt;DialogView id=&quot;EmptyFieldError&quot;
/// padding_left=&quot;2&quot;
/// padding_right=&quot;2&quot;
/// padding_top=&quot;1&quot;
/// padding_bottom=&quot;1&quot;&gt;
/// &lt;Options&gt;
/// &lt;Option&gt;Ok&lt;/Option&gt;
/// &lt;/Options&gt;
/// &lt;Text&gt;@string/ERR_empty&lt;/Text&gt;
/// &lt;/DialogView&gt;
///&lt;/Resources&gt;.
/// </summary>
internal static string Common {
get {
return ResourceManager.GetString("Common", resourceCulture);
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -82,9 +103,9 @@ namespace Client.Properties {
/// <summary>
/// Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
///&lt;Elements xmlns=&quot;ConsoleForms&quot;&gt;
///&lt;Elements xmlns=&quot;Client.ConsoleForms.Graphics&quot;&gt;
/// &lt;!-- Networking context --&gt;
/// &lt;InputTextBox id=&quot;NetConnect&quot;
/// &lt;InputView id=&quot;NetConnect&quot;
/// padding_left=&quot;2&quot;
/// padding_right=&quot;2&quot;
/// padding_top=&quot;1&quot;
@ -93,8 +114,8 @@ namespace Client.Properties {
/// &lt;Field input_type=&quot;decimal&quot; max_length=&quot;15&quot;&gt;Server IP:&lt;/Field&gt;
/// &lt;Field default=&quot;80&quot; input_type=&quot;integer&quot; max_length=&quot;5&quot;&gt;Port:&lt;/Field&gt;
/// &lt;/Fields&gt;
/// &lt;Text&gt;Server connection configuration&lt;/Text&gt;
/// &lt;/Input [rest of string was truncated]&quot;;.
/// &lt;Text&gt;@string/NC_head&lt;/Text&gt;
/// &lt;/InputVie [rest of string was truncated]&quot;;.
/// </summary>
internal static string Networking {
get {
@ -104,8 +125,8 @@ namespace Client.Properties {
/// <summary>
/// Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
///&lt;Elements xmlns=&quot;ConsoleForms&quot;&gt;
/// &lt;DialogBox id=&quot;Success&quot;
///&lt;Elements xmlns=&quot;Client.ConsoleForms.Graphics&quot;&gt;
/// &lt;DialogView id=&quot;Success&quot;
/// padding_left=&quot;2&quot;
/// padding_right=&quot;2&quot;
/// padding_top=&quot;1&quot;
@ -114,8 +135,17 @@ namespace Client.Properties {
/// &lt;Option&gt;Quit&lt;/Option&gt;
/// &lt;/Options&gt;
/// &lt;Text&gt;Login succeeded!&lt;/Text&gt;
/// &lt;/DialogBox&gt;
///&lt;/Elements&gt;.
/// &lt;/DialogView&gt;
///
/// &lt;TextView id=&quot;balance&quot;
/// padding_left=&quot;2&quot;
/// padding_right=&quot;2&quot;
/// padding_top=&quot;1&quot;
/// padding_bottom=&quot;1&quot;&gt;
/// &lt;Text&gt;Balance: $balance&lt;/Text&gt;
/// &lt;/TextView&gt;
///
/// &lt;ListView id= [rest of string was truncated]&quot;;.
/// </summary>
internal static string Session {
get {
@ -125,10 +155,10 @@ namespace Client.Properties {
/// <summary>
/// Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
///&lt;Elements xmlns=&quot;ConsoleForms&quot;&gt;
///&lt;Elements xmlns=&quot;Client.ConsoleForms.Graphics&quot;&gt;
///
/// &lt;!-- Welcome screen --&gt;
/// &lt;DialogBox id=&quot;WelcomeScreen&quot;
/// &lt;DialogView id=&quot;WelcomeScreen&quot;
/// padding_left=&quot;2&quot;
/// padding_right=&quot;2&quot;
/// padding_top=&quot;1&quot;
@ -138,12 +168,74 @@ namespace Client.Properties {
/// &lt;Option event=&quot;Setup:Login&quot; close=&quot;true&quot;&gt;Login&lt;/Option&gt;
/// &lt;Option event=&quot;Setup:Register&quot; close=&quot;true&quot;&gt;Register&lt;/Option&gt;
/// &lt;/Options&gt;
/// &lt;Text&gt;Welcome to the Tofvesson banking system! To conti [rest of string was truncated]&quot;;.
/// &lt;Text&gt;Welcome to the Tofvesson banking [rest of string was truncated]&quot;;.
/// </summary>
internal static string Setup {
get {
return ResourceManager.GetString("Setup", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
///&lt;Strings label=&quot;English&quot;&gt;
/// &lt;Entry name=&quot;NC_head&quot;&gt;Server configuration&lt;/Entry&gt;
/// &lt;Entry name=&quot;NC_sec&quot;&gt;The selected server&apos;s identity could not be verified. This implies that it is not an official server. Continue?&lt;/Entry&gt;
/// &lt;Entry name=&quot;NC_stall&quot;&gt;Connecting to server...&lt;/Entry&gt;
///
/// &lt;Entry name=&quot;ERR_empty&quot;&gt;One of more required field was empty!&lt;/Entry&gt;
///&lt;/Strings&gt;.
/// </summary>
internal static string strings_lang_en_GB {
get {
return ResourceManager.GetString("strings_lang_en_GB", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
///&lt;Strings label=&quot;English&quot;&gt;
/// &lt;Entry name=&quot;NC_head&quot;&gt;Server configuration&lt;/Entry&gt;
/// &lt;Entry name=&quot;NC_sec&quot;&gt;The selected server&apos;s identity could not be verified. This implies that it is not an official server. Continue?&lt;/Entry&gt;
/// &lt;Entry name=&quot;NC_stall&quot;&gt;Connecting to server...&lt;/Entry&gt;
///
/// &lt;Entry name=&quot;ERR_empty&quot;&gt;One of more required field was empty!&lt;/Entry&gt;
///&lt;/Strings&gt;.
/// </summary>
internal static string strings_lang_en_US {
get {
return ResourceManager.GetString("strings_lang_en_US", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
///&lt;Strings label=&quot;Svenska&quot;&gt;
/// &lt;Entry name=&quot;NC_head&quot;&gt;Serverkonfiguration&lt;/Entry&gt;
/// &lt;Entry name=&quot;NC_sec&quot;&gt;Den valda serverns identitet kunde inte verifieras. Detta innebär att det inte är en officiell server. Fortsätt?&lt;/Entry&gt;
/// &lt;Entry name=&quot;NC_stall&quot;&gt;Kopplar upp mot servern...&lt;/Entry&gt;
///
/// &lt;Entry name=&quot;ERR_empty&quot;&gt;Ett eller fler obligatoriska inputfält är tomma!&lt;/Entry&gt;
///&lt;/Strings&gt;.
/// </summary>
internal static string strings_lang_sv_SE {
get {
return ResourceManager.GetString("strings_lang_sv_SE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
///&lt;Lang&gt;
/// &lt;Default&gt;sv_SE&lt;/Default&gt;
/// &lt;Fallback priority=&quot;0&quot;&gt;en_US&lt;/Fallback&gt;
/// &lt;Fallback priority=&quot;1&quot;&gt;en_GB&gt;&lt;/Fallback&gt;
///&lt;/Lang&gt;.
/// </summary>
internal static string strings_meta {
get {
return ResourceManager.GetString("strings_meta", resourceCulture);
}
}
}
}

21
Client/Properties/Resources.resx
View File

@ -124,13 +124,28 @@
<data name="n_0x200" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\0x200.n;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Common" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Layout\Common.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="Networking" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Layout\Networking.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
<value>..\Resources\Layout\Networking.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="Session" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Layout\Session.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
<value>..\Resources\Layout\Session.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="Setup" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Layout\Setup.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
<value>..\Resources\Layout\Setup.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="strings_lang_en_US" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Strings\en_US\strings.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="strings_lang_sv_SE" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Strings\sv_SE\strings.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="strings_meta" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Strings\Meta.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="strings_lang_en_GB" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Strings\en_GB\strings.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
</root>

13
Client/Resources/Layout/Common.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<Resources xmlns="Client.ConsoleForms.Graphics">
<DialogView id="EmptyFieldError"
padding_left="2"
padding_right="2"
padding_top="1"
padding_bottom="1">
<Options>
<Option>@string/GENERIC_accept</Option>
</Options>
<Text>@string/ERR_empty</Text>
</DialogView>
</Resources>

40
Client/Layout/Networking.xml → Client/Resources/Layout/Networking.xml
View File

@ -7,10 +7,10 @@
padding_top="1"
padding_bottom="1">
<Fields>
<Field input_type="decimal" max_length="15">Server IP:</Field>
<Field default="80" input_type="integer" max_length="5">Port:</Field>
<Field input_type="decimal" max_length="15">@string/NC_ip</Field>
<Field default="80" input_type="integer" max_length="5">@string/NC_port</Field>
</Fields>
<Text>Server connection configuration</Text>
<Text>@string/NC_head</Text>
</InputView>
<DialogView id="SecurityIssue"
@ -20,10 +20,10 @@
padding_bottom="1"
select="1">
<Options>
<Option>Continue</Option>
<Option>Cancel</Option>
<Option>@string/NC_next</Option>
<Option>@string/NC_cancel</Option>
</Options>
<Text>The identity of the server could not be verified. Continue?</Text>
<Text>@string/NC_sec</Text>
</DialogView>
<DialogView id="Connecting"
@ -32,21 +32,9 @@
padding_top="1"
padding_bottom="1">
<Options>
<Option>Cancel</Option>
<Option>@string/NC_cancel</Option>
</Options>
<Text>Connecting to server...</Text>
</DialogView>
<!-- Generic dialog boxes -->
<DialogView id="EmptyFieldError"
padding_left="2"
padding_right="2"
padding_top="1"
padding_bottom="1">
<Options>
<Option>Ok</Option>
</Options>
<Text>One or more required input field is empty</Text>
<Text>@string/NC_stall</Text>
</DialogView>
<DialogView id="IPError"
@ -55,9 +43,9 @@
padding_top="1"
padding_bottom="1">
<Options>
<Option>Ok</Option>
<Option>@string/GENERIC_accept</Option>
</Options>
<Text>The supplied IP-address is not valid</Text>
<Text>@string/NC_iperr</Text>
</DialogView>
<DialogView id="PortError"
@ -66,9 +54,9 @@
padding_top="1"
padding_bottom="1">
<Options>
<Option>Ok</Option>
<Option>@string/GENERIC_accept</Option>
</Options>
<Text>The supplied port is not valid</Text>
<Text>@string/NC_porterr</Text>
</DialogView>
<DialogView id="ConnectionError"
@ -78,8 +66,8 @@
padding_bottom="1"
border="4">
<Options>
<Option>Ok</Option>
<Option>@string/GENERIC_accept</Option>
</Options>
<Text>Could not connect to server</Text>
<Text>@string/NC_connerr</Text>
</DialogView>
</Elements>

41
Client/Resources/Layout/Session.xml Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8" ?>
<Elements xmlns="Client.ConsoleForms.Graphics">
<DialogView id="Success"
padding_left="2"
padding_right="2"
padding_top="1"
padding_bottom="1">
<Options>
<Option>Quit</Option>
</Options>
<Text>Login succeeded!</Text>
</DialogView>
<TextView id="balance"
padding_left="2"
padding_right="2"
padding_top="1"
padding_bottom="1">
<Text>@string/SE_bal</Text>
</TextView>
<ListView id="menu_options"
padding_left="2"
padding_right="2"
padding_top="1"
padding_bottom="1">
<Views>
<Button id="history">
<Text>@string/SE_hist</Text>
</Button>
<Button id="create">
<Text>@string/tx</Text>
</Button>
<Button id="update">
<Text>@string/pwdu</Text>
</Button>
</Views>
</ListView>
</Elements>

51
Client/Layout/Setup.xml → Client/Resources/Layout/Setup.xml
View File

@ -9,10 +9,10 @@
padding_bottom="1"
width="42">
<Options>
<Option event="Setup:Login" close="true">Login</Option>
<Option event="Setup:Register" close="true">Register</Option>
<Option event="Setup:Login" close="true">@string/SU_login_label</Option>
<Option event="Setup:Register" close="true">@string/SU_reg_label</Option>
</Options>
<Text>Welcome to the Tofvesson banking system! To continue, press [ENTER] To go back, press [ESCAPE]</Text>
<Text>@string/SU_welcome</Text>
</DialogView>
<!-- Register-context views -->
@ -24,11 +24,11 @@
width="35"
back="Setup:WelcomeScreen">
<Fields>
<Field>Username:</Field>
<Field hide="true">Password:</Field>
<Field hide="true">Repeat password:</Field>
<Field>@string/SU_usr</Field>
<Field hide="true">@string/SU_pwd</Field>
<Field hide="true">@string/SU_pwdrep</Field>
</Fields>
<Text>Register Account</Text>
<Text>@string/SU_reg</Text>
</InputView>
<TextView id="RegWait"
@ -37,7 +37,7 @@
padding_top="1"
padding_bottom="1"
border="3">
<Text>Registering...</Text>
<Text>@string/SU_regstall</Text>
</TextView>
<DialogView id="DuplicateAccountError"
@ -47,9 +47,9 @@
padding_bottom="1"
border="4">
<Options>
<Option>Ok</Option>
<Option>@string/GENERIC_accept</Option>
</Options>
<Text>An account with this username already exists!</Text>
<Text>@string/SU_dup</Text>
</DialogView>
<DialogView id="PasswordMismatchError"
@ -59,9 +59,9 @@
padding_bottom="1"
border="4">
<Options>
<Option>Ok</Option>
<Option>@string/GENERIC_accept</Option>
</Options>
<Text>The entered passwords don't match! </Text>
<Text>@string/SU_mismatch</Text>
</DialogView>
<DialogView id="WeakPasswordWarning"
@ -74,7 +74,7 @@
<Option>Yes</Option>
<Option>No</Option>
</Options>
<Text>The password you have supplied has been deemed to be weak. Are you sure you want to continue?</Text>
<Text>@string/SU_weak</Text>
</DialogView>
<!-- Login-context views -->
@ -86,10 +86,10 @@
width="35"
back="Setup:WelcomeScreen">
<Fields>
<Field>Username:</Field>
<Field hide="true">Password:</Field>
<Field>@string/SU_usr</Field>
<Field hide="true">@string/SU_pwd</Field>
</Fields>
<Text>Log in</Text>
<Text>@string/SU_login</Text>
</InputView>
<TextView id="AuthWait"
@ -98,21 +98,8 @@
padding_top="1"
padding_bottom="1"
border="3">
<Text>Authenticating...</Text>
<Text>@string/SU_authstall</Text>
</TextView>
<!-- Generic dialog boxes -->
<DialogView id="EmptyFieldError"
padding_left="2"
padding_right="2"
padding_top="1"
padding_bottom="1"
border="4">
<Options>
<Option>Ok</Option>
</Options>
<Text>One or more required input field is empty</Text>
</DialogView>
<DialogView id="AuthError"
padding_left="2"
@ -121,8 +108,8 @@
padding_bottom="1"
border="4">
<Options>
<Option>Ok</Option>
<Option>@string/GENERIC_accept</Option>
</Options>
<Text>The given username or password was incorrect</Text>
<Text>@string/SU_usrerr</Text>
</DialogView>
</Elements>

6
Client/Resources/Strings/Meta.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<Lang>
<Default>sv_SE</Default>
<Fallback priority="0">en_US</Fallback>
<Fallback priority="1">en_GB</Fallback>
</Lang>

39
Client/Resources/Strings/en_GB/strings.xml Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8" ?>
<Strings label="English">
<Entry name="NC_head">Server configuration</Entry>
<Entry name="NC_sec">The selected server's identity could not be verified. This implies that it is not an official server. Continue?</Entry>
<Entry name="NC_stall">Connecting to server...</Entry>
<Entry name="NC_next">Continue</Entry>
<Entry name="NC_cancel">Cancel</Entry>
<Entry name="NC_ip">Server IP:</Entry>
<Entry name="NC_port">Port:</Entry>
<Entry name="NC_iperr">The supplied IP-address is not valid</Entry>
<Entry name="NC_porterr">The supplied port is not valid</Entry>
<Entry name="NC_connerr">Could not connect to server</Entry>
<Entry name="SU_welcome">Welcome to the Tofvesson banking system! To continue, press [ENTER] To go back, press [ESCAPE]</Entry>
<Entry name="SU_reg">Register Account</Entry>
<Entry name="SU_regstall">Registering...</Entry>
<Entry name="SU_dup">An account with this username already exists!</Entry>
<Entry name="SU_mismatch">The entered passwords don't match! </Entry>
<Entry name="SU_weak">The password you have supplied has been deemed to be weak. Are you sure you want to continue?</Entry>
<Entry name="SU_login">Log in</Entry>
<Entry name="SU_authstall">Authenticating...</Entry>
<Entry name="SU_usrerr">The given username or password was incorrect</Entry>
<Entry name="SU_usr">Username:</Entry>
<Entry name="SU_pwd">Password:</Entry>
<Entry name="SU_pwdrep">Repeat password:</Entry>
<Entry name="SU_reg_label">Register</Entry>
<Entry name="SU_login_label">Login</Entry>
<Entry name="SE_bal">Balance: $1</Entry>
<Entry name="SE_hist">View transaction history</Entry>
<Entry name="SE_tx">Transfer funds</Entry>
<Entry name="SE_pwdu">Update password</Entry>
<Entry name="GENERIC_accept">Ok</Entry>
<Entry name="GENERIC_positive">Yes</Entry>
<Entry name="GENERIC_negative">No</Entry>
<Entry name="ERR_empty">One of more required field was empty!</Entry>
</Strings>

39
Client/Resources/Strings/en_US/strings.xml Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8" ?>
<Strings label="English">
<Entry name="NC_head">Server configuration</Entry>
<Entry name="NC_sec">The selected server's identity could not be verified. This implies that it is not an official server. Continue?</Entry>
<Entry name="NC_stall">Connecting to server...</Entry>
<Entry name="NC_next">Continue</Entry>
<Entry name="NC_cancel">Cancel</Entry>
<Entry name="NC_ip">Server IP:</Entry>
<Entry name="NC_port">Port:</Entry>
<Entry name="NC_iperr">The supplied IP-address is not valid</Entry>
<Entry name="NC_porterr">The supplied port is not valid</Entry>
<Entry name="NC_connerr">Could not connect to server</Entry>
<Entry name="SU_welcome">Welcome to the Tofvesson banking system! To continue, press [ENTER] To go back, press [ESCAPE]</Entry>
<Entry name="SU_reg">Register Account</Entry>
<Entry name="SU_regstall">Registering...</Entry>
<Entry name="SU_dup">An account with this username already exists!</Entry>
<Entry name="SU_mismatch">The entered passwords don't match! </Entry>
<Entry name="SU_weak">The password you have supplied has been deemed to be weak. Are you sure you want to continue?</Entry>
<Entry name="SU_login">Log in</Entry>
<Entry name="SU_authstall">Authenticating...</Entry>
<Entry name="SU_usrerr">The given username or password was incorrect</Entry>
<Entry name="SU_usr">Username:</Entry>
<Entry name="SU_pwd">Password:</Entry>
<Entry name="SU_pwdrep">Repeat password:</Entry>
<Entry name="SU_reg_label">Register</Entry>
<Entry name="SU_login_label">Login</Entry>
<Entry name="SE_bal">Balance: $1</Entry>
<Entry name="SE_hist">View transaction history</Entry>
<Entry name="SE_tx">Transfer funds</Entry>
<Entry name="SE_pwdu">Update password</Entry>
<Entry name="GENERIC_accept">Ok</Entry>
<Entry name="GENERIC_positive">Yes</Entry>
<Entry name="GENERIC_negative">No</Entry>
<Entry name="ERR_empty">One of more required field was empty!</Entry>
</Strings>

8
Client/Resources/Strings/sv_SE/strings.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<Strings label="Svenska">
<Entry name="NC_head">Serverkonfiguration</Entry>
<Entry name="NC_sec">Den valda serverns identitet kunde inte verifieras. Detta innebär att det inte är en officiell server. Fortsätt?</Entry>
<Entry name="NC_stall">Kopplar upp mot servern...</Entry>
<Entry name="ERR_empty">Ett eller fler obligatoriska inputfält är tomma!</Entry>
</Strings>

11
Common/RSA.cs
View File

@ -178,5 +178,16 @@ namespace Tofvesson.Crypto
public override bool Equals(object obj)
=> obj is RSA && ((RSA)obj).CanDecrypt == CanDecrypt && ((RSA)obj).e.Equals(e) && ((RSA)obj).n.Equals(n) && (!CanDecrypt || ((RSA)obj).d.Equals(d));
public override int GetHashCode()
{
var hashCode = 2073836280;
hashCode = hashCode * -1521134295 + EqualityComparer<BigInteger>.Default.GetHashCode(e);
hashCode = hashCode * -1521134295 + EqualityComparer<BigInteger>.Default.GetHashCode(n);
hashCode = hashCode * -1521134295 + EqualityComparer<BigInteger>.Default.GetHashCode(d);
hashCode = hashCode * -1521134295 + CanEncrypt.GetHashCode();
hashCode = hashCode * -1521134295 + CanDecrypt.GetHashCode();
return hashCode;
}
}
}

10
Server/Database.cs
View File

@ -403,6 +403,16 @@ namespace Server
return true;
}
public override int GetHashCode()
{
var hashCode = 495068346;
hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Text);
hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Name);
hashCode = hashCode * -1521134295 + EqualityComparer<Dictionary<string, string>>.Default.GetHashCode(Attributes);
hashCode = hashCode * -1521134295 + EqualityComparer<List<Entry>>.Default.GetHashCode(NestedEntries);
return hashCode;
}
}
public class User