Skip to content

Commit

Permalink
Multilanguage version (EN and ES) with international danger colors (#4)
Browse files Browse the repository at this point in the history
* International Version

* Update to .Net 4.8 and small translation changes

* Update to .Net 4.8 and small translation changes

* Update to .Net 4.8 and small translation changes

* Ignore Exe

* Intensity 4 = yellow

* Language Switch

* Load last selected language on startup

* Saves Settings to db

---------

Co-authored-by: Christoph Suter <christoph@suter-burri.ch>
  • Loading branch information
stumpigit and Christoph Suter authored Mar 1, 2024
1 parent eaf0257 commit fe4b867
Show file tree
Hide file tree
Showing 48 changed files with 208,181 additions and 355 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2737,3 +2737,8 @@ __pycache__/
/PostgreSQLPortable_10.4.1/App/AppInfo/appicon_16.png
/PostgreSQLPortable_10.4.1/App/AppInfo/appicon_128.png
/PostgreSQLPortable_10.4.1/App/AppInfo/appicon.ico
/PostgreSQLPortable_10.4.1/PostgreSQLPortable
/InnoSetup/sign_program.bat
/InnoSetup/sign_setup.bat
/InnoSetup/Output/setup_offline.exe
/InnoSetup/Output/setup.exe
14 changes: 7 additions & 7 deletions Calculation/App.config
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>

<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
</configSections>
<appSettings>
<add key="UseOfflineDB" value="false" />
<add key="PortablePostgreSQLDirectory" value="{appdata}/PostgreSQLPortable" />
Expand Down Expand Up @@ -80,10 +80,10 @@
</dependentAssembly>
</assemblyBinding>
</runtime>

<system.data>
<system.data>
<DbProviderFactories>
<remove invariant="Npgsql" />
<add name="Npgsql Provider" invariant="Npgsql" description=".NET Framework Data Provider for PostgreSQL" type="Npgsql.NpgsqlFactory, Npgsql, Version=4.1.3.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7" />
</DbProviderFactories>
</system.data></configuration>
</system.data>
</configuration>
15 changes: 7 additions & 8 deletions DB/App.config
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>


<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
</configSections>
<appSettings>
<add key="UseOfflineDB" value="false" />
</appSettings>
Expand Down Expand Up @@ -55,10 +54,10 @@
</dependentAssembly>
</assemblyBinding>
</runtime>

<system.data>
<system.data>
<DbProviderFactories>
<remove invariant="Npgsql" />
<add name="Npgsql Provider" invariant="Npgsql" description=".NET Framework Data Provider for PostgreSQL" type="Npgsql.NpgsqlFactory, Npgsql, Version=4.1.3.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7" />
</DbProviderFactories>
</system.data></configuration>
</system.data>
</configuration>
22 changes: 22 additions & 0 deletions DB/DB.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,18 @@
<Compile Include="Migrations\202009081259225_damageExtentPart.designer.cs">
<DependentUpon>202009081259225_damageExtentPart.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\202402280842568_Translations.cs" />
<Compile Include="Migrations\202402280842568_Translations.designer.cs">
<DependentUpon>202402280842568_Translations.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\202402281054590_Translation_Name.cs" />
<Compile Include="Migrations\202402281054590_Translation_Name.designer.cs">
<DependentUpon>202402281054590_Translation_Name.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\202402291415078_Settings.cs" />
<Compile Include="Migrations\202402291415078_Settings.designer.cs">
<DependentUpon>202402291415078_Settings.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\Configuration.cs" />
<Compile Include="Models\DamageExtent.cs" />
<Compile Include="Models\IKClasses.cs" />
Expand All @@ -128,6 +140,7 @@
<Compile Include="Models\ResilienceFactor.cs" />
<Compile Include="Models\ResilienceValues.cs" />
<Compile Include="Models\ResilienceWeight.cs" />
<Compile Include="Models\Settings.cs" />
<Compile Include="Models\Standard_PrA.cs" />
<Compile Include="Models\WillingnessToPay.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
Expand All @@ -151,6 +164,15 @@
<EmbeddedResource Include="Migrations\202009081259225_damageExtentPart.resx">
<DependentUpon>202009081259225_damageExtentPart.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\202402280842568_Translations.resx">
<DependentUpon>202402280842568_Translations.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\202402281054590_Translation_Name.resx">
<DependentUpon>202402281054590_Translation_Name.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\202402291415078_Settings.resx">
<DependentUpon>202402291415078_Settings.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Translation\Translation.csproj">
Expand Down
29 changes: 29 additions & 0 deletions DB/Migrations/202402280842568_Translations.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions DB/Migrations/202402280842568_Translations.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
namespace ResTB.DB.Migrations
{
using System;
using System.Data.Entity.Migrations;

public partial class Translations : DbMigration
{
public override void Up()
{
AddColumn("public.IKClasses", "Description_EN", c => c.String());
AddColumn("public.IKClasses", "Description_ES", c => c.String());
AddColumn("public.NatHazard", "Name_EN", c => c.String());
AddColumn("public.NatHazard", "Name_ES", c => c.String());
AddColumn("public.Objectparameter", "Description_EN", c => c.String());
AddColumn("public.Objectparameter", "Description_ES", c => c.String());
AddColumn("public.ObjectClass", "Name_EN", c => c.String());
AddColumn("public.ObjectClass", "Name_ES", c => c.String());
AddColumn("public.ResilienceFactor", "Preparedness_EN", c => c.String());
AddColumn("public.ResilienceFactor", "Preparedness_ES", c => c.String());
}

public override void Down()
{
DropColumn("public.ResilienceFactor", "Preparedness_ES");
DropColumn("public.ResilienceFactor", "Preparedness_EN");
DropColumn("public.ObjectClass", "Name_ES");
DropColumn("public.ObjectClass", "Name_EN");
DropColumn("public.Objectparameter", "Description_ES");
DropColumn("public.Objectparameter", "Description_EN");
DropColumn("public.NatHazard", "Name_ES");
DropColumn("public.NatHazard", "Name_EN");
DropColumn("public.IKClasses", "Description_ES");
DropColumn("public.IKClasses", "Description_EN");
}
}
}
126 changes: 126 additions & 0 deletions DB/Migrations/202402280842568_Translations.resx

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions DB/Migrations/202402281054590_Translation_Name.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions DB/Migrations/202402281054590_Translation_Name.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
namespace ResTB.DB.Migrations
{
using System;
using System.Data.Entity.Migrations;

public partial class Translation_Name : DbMigration
{
public override void Up()
{
AddColumn("public.Objectparameter", "Name_EN", c => c.String());
AddColumn("public.Objectparameter", "Name_ES", c => c.String());
}

public override void Down()
{
DropColumn("public.Objectparameter", "Name_ES");
DropColumn("public.Objectparameter", "Name_EN");
}
}
}
126 changes: 126 additions & 0 deletions DB/Migrations/202402281054590_Translation_Name.resx

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions DB/Migrations/202402291415078_Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions DB/Migrations/202402291415078_Settings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
namespace ResTB.DB.Migrations
{
using System;
using System.Data.Entity.Migrations;

public partial class Settings : DbMigration
{
public override void Up()
{
CreateTable(
"public.Settings",
c => new
{
Id = c.Int(nullable: false, identity: true),
Language = c.String(),
})
.PrimaryKey(t => t.Id);

}

public override void Down()
{
DropTable("public.Settings");
}
}
}
Loading

0 comments on commit fe4b867

Please sign in to comment.