shiftos-archive/ShiftOS_TheReturn
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

language changing actually works

Browse source
This commit is contained in:
lempamo 2017-04-06 10:17:19 -04:00
parent 07376e9ecd
commit 9a8949cffc
12 changed files with 59 additions and 285 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
ShiftOS.WinForms/LanguageSelector.Designer.cs generated
View file

@ -1,94 +0,0 @@
using ShiftOS.Engine;
namespace ShiftOS.WinForms
{
partial class LanguageSelector
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// comboBox1
//
this.comboBox1.Cursor = System.Windows.Forms.Cursors.Default;
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Items.AddRange(Localization.GetAllLanguages());
this.comboBox1.Location = new System.Drawing.Point(13, 13);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(167, 21);
this.comboBox1.TabIndex = 0;
this.comboBox1.SelectedItem = this.comboBox1.Items[0];
//
// button1
//
this.button1.Location = new System.Drawing.Point(12, 40);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 1;
this.button1.Text = "Run";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// button2
//
this.button2.Location = new System.Drawing.Point(105, 40);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(75, 23);
this.button2.TabIndex = 2;
this.button2.Text = "Quit";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// LanguageSelector
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(192, 74);
this.Controls.Add(this.button2);
this.Controls.Add(this.button1);
this.Controls.Add(this.comboBox1);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "LanguageSelector";
this.ShowIcon = false;
this.Text = "Choose A Language";
this.ResumeLayout(false);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.closing);
}
#endregion
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button button2;
}
}

44
ShiftOS.WinForms/LanguageSelector.cs
View file

@ -1,44 +0,0 @@
using ShiftOS.Engine;
using ShiftOS.WinForms.Applications;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace ShiftOS.WinForms
{
public partial class LanguageSelector : Form
{
public string languageID;
public bool rdy = false;
public LanguageSelector()
{
InitializeComponent();
}
private void button1_Click(object sender, EventArgs e)
{
Localization.SetLanguageID((string)comboBox1.SelectedItem);
rdy = true;
this.Close();
}
private void button2_Click(object sender, EventArgs e)
{
Environment.Exit(0);
}
private void closing(object sender, FormClosingEventArgs e)
{
if (!rdy) Environment.Exit(0);
}
}
}

120
ShiftOS.WinForms/LanguageSelector.resx
View file

@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

8
ShiftOS.WinForms/Program.cs
View file

@ -58,14 +58,6 @@ namespace ShiftOS.WinForms
Environment.Exit(0);
};
var langselect = new LanguageSelector();
langselect.ShowDialog();
while (!langselect.rdy)
{
};
TutorialManager.RegisterTutorial(new Oobe());
TerminalBackend.TerminalRequested += () =>

2
ShiftOS.WinForms/Resources/languages.txt
View file

@ -1,4 +1,4 @@
[
"english"
"deutsch - in beta"
"deutsch"
]

3
ShiftOS.WinForms/Resources/strings_de.txt
View file

@ -159,6 +159,8 @@ Wenn eine Systemdatei von dem Virenscanner erkannt wird, wird sie ersetzt.",
"{COMMAND_SOS_SHUTDOWN_DESCRIPTION}":"Saves and shuts down ShiftOS",
"{COMMAND_SOS_STATUS_USAGE}":"%ns.%cmd",
"{COMMAND_SOS_STATUS_DESCRIPTION}":"Displays how many codepoints you have",
"{COMMAND_SOS_LANG_USAGE}":"%ns.%cmd{[language:\"english\"]}",
"{COMMAND_SOS_LANG_DESCRIPTION}":"Sprache ändern.",
"{COMMAND_DEV_CRASH_USAGE}":"%ns.%cmd",
"{COMMAND_DEV_CRASH_DESCRIPTION}":"Shuts down ShiftOS forcefully",
"{COMMAND_DEV_UNLOCKEVERYTHING_USAGE}":"%ns.%cmd",
@ -217,6 +219,7 @@ Wenn eine Systemdatei von dem Virenscanner erkannt wird, wird sie ersetzt.",
"{OBSOLETE_SYS_SHUTDOWN}":"sys.shutdown is obsolete",
"{PY_EXCEPTION}":"There was an error running python code.",
"{LUA_ERROR}":"There was an error running lua code.",
"{LANGUAGE_CHANGED}":"The language has been changed. Please restart ShiftOS for changes to take full effect.",
"{TERMINAL_NAME}":"Terminal",
"{ARTPAD_NAME}":"Artpad",

5
ShiftOS.WinForms/Resources/strings_en.txt
View file

@ -158,12 +158,14 @@ If a system file is deleted by the virus scanner, it will be replaced.",
"{COMMAND_SOS_SHUTDOWN_DESCRIPTION}":"Saves and shuts down ShiftOS",
"{COMMAND_SOS_STATUS_USAGE}":"%ns.%cmd",
"{COMMAND_SOS_STATUS_DESCRIPTION}":"Displays how many codepoints you have",
"{COMMAND_SOS_LANG_USAGE}":"%ns.%cmd{[language:\"deutsch\"]}",
"{COMMAND_SOS_LANG_DESCRIPTION}":"Change the language.",
"{COMMAND_DEV_CRASH_USAGE}":"%ns.%cmd",
"{COMMAND_DEV_CRASH_DESCRIPTION}":"Shuts down ShiftOS forcefully",
"{COMMAND_DEV_UNLOCKEVERYTHING_USAGE}":"%ns.%cmd",
"{COMMAND_DEV_UNLOCKEVERYTHING_DESCRIPTION}":"Unlocks all shiftorium upgrades",
"{COMMAND_DEV_FREECP_USAGE}":"%ns.%cmd{[amount:1000]}",
"{COMMAND_DEV_FREECP_DESCRIPTION}":"Gives [ammount] codepoints",
"{COMMAND_DEV_FREECP_DESCRIPTION}":"Gives [amount] codepoints",
"{COMMAND_TRM_CLEAR_USAGE}":"%ns.%cmd",
"{COMMAND_TRM_CLEAR_DESCRIPTION}":"Clears the terminal",
"{COMMAND_SHIFTORIUM_BUY_USAGE}":"%ns.%cmd{upgrade:}",
@ -217,6 +219,7 @@ If a system file is deleted by the virus scanner, it will be replaced.",
"{OBSOLETE_SYS_SHUTDOWN}":"sys.shutdown is obsolete",
"{PY_EXCEPTION}":"There was an error running python code.",
"{LUA_ERROR}":"There was an error running lua code.",
"{LANGUAGE_CHANGED}":"The language has been changed. Please restart ShiftOS for changes to take full effect.",
"{TERMINAL_NAME}":"Terminal",
"{ARTPAD_NAME}":"Artpad",

9
ShiftOS.WinForms/ShiftOS.WinForms.csproj
View file

@ -258,12 +258,6 @@
<Compile Include="GUIFunctions.cs" />
<Compile Include="HackerCommands.cs" />
<Compile Include="JobTasks.cs" />
<Compile Include="LanguageSelector.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="LanguageSelector.Designer.cs">
<DependentUpon>LanguageSelector.cs</DependentUpon>
</Compile>
<Compile Include="Oobe.cs">
<SubType>Form</SubType>
</Compile>
@ -389,9 +383,6 @@
<EmbeddedResource Include="FakeSetupScreen.resx">
<DependentUpon>FakeSetupScreen.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="LanguageSelector.resx">
<DependentUpon>LanguageSelector.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Oobe.resx">
<DependentUpon>Oobe.cs</DependentUpon>
</EmbeddedResource>

21
ShiftOS.WinForms/WFLanguageProvider.cs
View file

@ -42,13 +42,20 @@ namespace ShiftOS.WinForms
public string GetCurrentTranscript()
{
switch (SaveSystem.CurrentSave.Language)
try
{
case "deutsch - in beta":
return Properties.Resources.strings_de;
default:
return getDefault();
switch (SaveSystem.CurrentSave.Language)
{
case "deutsch":
return Properties.Resources.strings_de;
default:
return getDefault();
}
}
catch (NullReferenceException)
{
return getDefault();
}
}
@ -56,7 +63,7 @@ namespace ShiftOS.WinForms
{
switch (SaveSystem.CurrentSave.Language)
{
case "deutsch - in beta":
case "deutsch":
return Paths.GetPath("deutsch.local");
default:
return Paths.GetPath("english.local");

29
ShiftOS_TheReturn/Commands.cs
View file

@ -357,6 +357,35 @@ namespace ShiftOS.Engine
return true;
}
[Command("lang", usage = "{{COMMAND_SOS_LANG_USAGE}}", description = "{{COMMAND_SOS_LANG_DESCRIPTION}}")]
[RequiresArgument("language")]
public static bool SetLanguage(Dictionary<string, object> userArgs)
{
try
{
string lang = "";
if (userArgs.ContainsKey("language"))
lang = (string)userArgs["language"];
else
throw new Exception("You must specify a valid 'language' value.");
if (Localization.GetAllLanguages().Contains(lang))
{
SaveSystem.CurrentSave.Language = lang;
SaveSystem.SaveGame();
Console.WriteLine("{LANGUAGE_CHANGED}");
return true;
}
throw new Exception($"Couldn't find language with ID: {lang}");
}
catch
{
return false;
}
}
[Command("help", "{COMMAND_HELP_USAGE}", "{COMMAND_HELP_DESCRIPTION}")]
public static bool Help()
{

6
ShiftOS_TheReturn/Localization.cs
View file

@ -67,6 +67,12 @@ namespace ShiftOS.Engine
var path = "english.local";
Utils.WriteAllText(Paths.GetPath(path), lines);
}
else if (SaveSystem.CurrentSave == null)
{
var lines = Properties.Resources.strings_en;
var path = "english.local";
Utils.WriteAllText(Paths.GetPath(path), lines);
}
else
{
_provider.WriteTranscript();

3
ShiftOS_TheReturn/SaveSystem.cs
View file

@ -70,7 +70,6 @@ namespace ShiftOS.Engine
root.permissions = Permissions.All;
System.IO.File.WriteAllText(Paths.SaveFile, JsonConvert.SerializeObject(root));
}
CurrentSave.Language = Localization.GetLanguageID();
if (Utils.Mounts.Count == 0)
Utils.Mount(System.IO.File.ReadAllText(Paths.SaveFile));
@ -176,6 +175,8 @@ namespace ShiftOS.Engine
}
Localization.SetupTHETRUEDefaultLocals();
Shiftorium.Init();
while (CurrentSave.StoryPosition < 1)