michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Config.Entities.Medium : ToDescription() used in UI, Strings.cold/hot removed, gorjaca->ciepla, ver.2.19.879

Browse Source
This commit is contained in:
Milan Hanajik 2018-04-17 08:39:50 +02:00
parent 7c940bd633
commit 04878cea50
7 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Config/Entities/Enums.cs
View File

@ -82,8 +82,8 @@ namespace Config.Entities
{
[Description("")] NotSpecified,
#if LANG_PL
[Description("Zimna")] ColdWater,
[Description("Gorąca")] HotWater,
[Description("zimna")] ColdWater,
[Description("ciepła")] HotWater,
#else
[Description("cold")] ColdWater,
[Description("hot")] HotWater,

2
ResultsBrowser/Resources/Strings.pl.resx
View File

@ -637,7 +637,7 @@
<value>zimna</value>
</data>
<data name="hot" xml:space="preserve">
<value>gorąca</value>
<value>ciepła</value>
</data>
<data name="Product_name" xml:space="preserve">
<value>Nazwa produktu</value>

9
ResultsBrowser/ResultsBrowser.csproj
View File

@ -207,12 +207,17 @@
<EmbeddedResource Include="Resources\Strings.cs.resx" />
<EmbeddedResource Include="Resources\Strings.de.resx" />
<EmbeddedResource Include="Resources\Strings.it.resx" />
<EmbeddedResource Include="Resources\Strings.pl.resx" />
<EmbeddedResource Include="Resources\Strings.pl.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Strings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Strings1.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Strings.ru.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Strings.ru.resx" />
<EmbeddedResource Include="ResultsBrowserWnd.resx">
<DependentUpon>ResultsBrowserWnd.cs</DependentUpon>
</EmbeddedResource>

6
TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs
View File

@ -149,7 +149,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
case 21: return Text4;
case 22: return Text5;
case 23: return (WaterTemp == Medium.HotWater) ? Strings.hot : Strings.cold; /// "tepla" : "zimna";
case 23: return (WaterTemp == Medium.HotWater) ? Medium.HotWater.ToDescription() : Medium.ColdWater.ToDescription(); /// "tepla" : "zimna";
default: return string.Empty;
}
}
@ -207,7 +207,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
case 21: Text4 = strValue; return;
case 22: Text5 = strValue; return;
case 23: WaterTemp = strValue.Equals(Strings.hot) ? Medium.HotWater : Medium.ColdWater; return; /// "tepla"
case 23: WaterTemp = strValue.Equals(Medium.HotWater.ToDescription()) ? Medium.HotWater : Medium.ColdWater; return; /// "tepla"
default: return;
}
}
@ -258,7 +258,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
for (FlowProfileSensitivityClass tc = 0; tc < FlowProfileSensitivityClass.Count; tc++) if (tc.ToDescription().Equals(strValue)) return true;
break;
case 23:
if (strValue.Equals(Strings.cold) || strValue.Equals(Strings.hot)) return true; /// "zimna", "tepla"
if (strValue.Equals(Medium.ColdWater.ToDescription()) || strValue.Equals(Medium.HotWater.ToDescription())) return true; /// "zimna", "tepla"
break;
default:
message = "Invalid index";

18
TBF/Resources/Strings.Designer.cs generated
View File

@ -771,15 +771,6 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to cold.
/// </summary>
internal static string cold {
get {
return ResourceManager.GetString("cold", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Communication.
/// </summary>
@ -1896,15 +1887,6 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to hot.
/// </summary>
internal static string hot {
get {
return ResourceManager.GetString("hot", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to ID.
/// </summary>

6
TBF/Resources/Strings.pl.resx
View File

@ -1053,12 +1053,6 @@
<data name="Qt" xml:space="preserve">
<value>Qt</value>
</data>
<data name="cold" xml:space="preserve">
<value>Zimna</value>
</data>
<data name="hot" xml:space="preserve">
<value>Gorąca</value>
</data>
<data name="Water" xml:space="preserve">
<value>Woda</value>
</data>

6
TBF/Resources/Strings.resx
View File

@ -1027,12 +1027,6 @@
<data name="Qt" xml:space="preserve">
<value>Qt [m3/h]</value>
</data>
<data name="cold" xml:space="preserve">
<value>cold</value>
</data>
<data name="hot" xml:space="preserve">
<value>hot</value>
</data>
<data name="Water" xml:space="preserve">
<value>Water</value>
</data>