Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Content.Shared.Localizations.Units: fix fluent IDs getting appended instead of the localized string, and wrong fluent IDs for some of the pressure units. (#5919)

Browse Source
This commit is contained in:
zlodo
2021-12-28 13:40:07 +01:00
committed by GitHub
parent 03b51e675b
commit 28df88ef21
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/Localizations/Units.cs
View File

@@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Robust.Shared.Localization;
namespace Content.Shared.Localizations namespace Content.Shared.Localizations
{ {
@@ -23,7 +24,7 @@ namespace Content.Shared.Localizations
public readonly double Factor; public readonly double Factor;
// Unit is an ID for Fluent. All Units are prefixed with // Unit is an ID for Fluent. All Units are prefixed with
// "unit-" internally. Usually follows the format $"{unit-abbrev}-{prefix}". // "units-" internally. Usually follows the format $"{unit-abbrev}-{prefix}".
// //
// Example: "si-g" is actually processed as "units-si-g" // Example: "si-g" is actually processed as "units-si-g"
// //
@@ -53,7 +54,7 @@ namespace Content.Shared.Localizations
public string Format(double val) public string Format(double val)
{ {
if (TryGetUnit(val, out var w)) if (TryGetUnit(val, out var w))
return (val * w.Factor).ToString() + " " + w.Unit; return (val * w.Factor).ToString() + " " + Loc.GetString("units-" + w.Unit);
return val.ToString(); return val.ToString();
} }
@@ -61,7 +62,7 @@ namespace Content.Shared.Localizations
public string Format(double val, string fmt) public string Format(double val, string fmt)
{ {
if (TryGetUnit(val, out var w)) if (TryGetUnit(val, out var w))
return (val * w.Factor).ToString(fmt) + " " + w.Unit; return (val * w.Factor).ToString(fmt) + " " + Loc.GetString("units-" + w.Unit);
return val.ToString(fmt); return val.ToString(fmt);
} }
@@ -96,8 +97,8 @@ namespace Content.Shared.Localizations
new TypeTable.Entry(range: (1e-6, 1e-3), factor: 1e6, unit: "m--pascal"), new TypeTable.Entry(range: (1e-6, 1e-3), factor: 1e6, unit: "m--pascal"),
new TypeTable.Entry(range: (1e-3, 1), factor: 1e3, unit: "pascal"), new TypeTable.Entry(range: (1e-3, 1), factor: 1e3, unit: "pascal"),
new TypeTable.Entry(range: ( 1, 1000), factor: 1, unit: "k-pascal"), new TypeTable.Entry(range: ( 1, 1000), factor: 1, unit: "k-pascal"),
new TypeTable.Entry(range: (1000, 1e6), factor: 1e-4, unit: "M-pascal"), new TypeTable.Entry(range: (1000, 1e6), factor: 1e-4, unit: "m-pascal"),
new TypeTable.Entry(range: ( 1e6, null), factor: 1e-6, unit: "G-pascal") new TypeTable.Entry(range: ( 1e6, null), factor: 1e-6, unit: "g-pascal")
); );
public static readonly TypeTable Power = new TypeTable public static readonly TypeTable Power = new TypeTable