dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change: Standardise unit conversions and allow decimal places.

Browse Source 
Previously the decimal_places member was mostly ignored except for
specific conversions. {DECIMAL} with 0 is the same as {COMMA} so there
is no downside to allowing any conversion to have decimals.
This commit is contained in:
Peter Nelson
2023-05-08 23:04:16 +01:00
committed by Michael Lutz
parent 3c2f87ce1f
commit e2f583a34f
2 changed files with 58 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/lang/english.txt
View File

@@ -191,15 +191,15 @@ STR_COLOUR_WHITE :White
STR_COLOUR_RANDOM :Random
# Units used in OpenTTD
STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mph
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_IMPERIAL :{DECIMAL}{NBSP}mph
STR_UNITS_VELOCITY_METRIC :{DECIMAL}{NBSP}km/h
STR_UNITS_VELOCITY_SI :{DECIMAL}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}tiles/day
STR_UNITS_VELOCITY_KNOTS :{COMMA}{NBSP}knots
STR_UNITS_VELOCITY_KNOTS :{DECIMAL}{NBSP}knots
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW
STR_UNITS_POWER_IMPERIAL :{DECIMAL}{NBSP}hp
STR_UNITS_POWER_METRIC :{DECIMAL}{NBSP}hp
STR_UNITS_POWER_SI :{DECIMAL}{NBSP}kW
STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_IMPERIAL :{DECIMAL}{NBSP}hp/t
STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_METRIC :{DECIMAL}{NBSP}hp/t
@@ -211,29 +211,29 @@ STR_UNITS_POWER_SI_TO_WEIGHT_IMPERIAL :{DECIMAL}{NBSP}
STR_UNITS_POWER_SI_TO_WEIGHT_METRIC :{DECIMAL}{NBSP}kW/t
STR_UNITS_POWER_SI_TO_WEIGHT_SI :{DECIMAL}{NBSP}W/kg
STR_UNITS_WEIGHT_SHORT_IMPERIAL :{COMMA}{NBSP}t
STR_UNITS_WEIGHT_SHORT_METRIC :{COMMA}{NBSP}t
STR_UNITS_WEIGHT_SHORT_SI :{COMMA}{NBSP}kg
STR_UNITS_WEIGHT_SHORT_IMPERIAL :{DECIMAL}{NBSP}t
STR_UNITS_WEIGHT_SHORT_METRIC :{DECIMAL}{NBSP}t
STR_UNITS_WEIGHT_SHORT_SI :{DECIMAL}{NBSP}kg
STR_UNITS_WEIGHT_LONG_IMPERIAL :{COMMA}{NBSP}ton{P "" s}
STR_UNITS_WEIGHT_LONG_METRIC :{COMMA}{NBSP}tonne{P "" s}
STR_UNITS_WEIGHT_LONG_SI :{COMMA}{NBSP}kg
STR_UNITS_WEIGHT_LONG_IMPERIAL :{DECIMAL}{NBSP}ton{P "" s}
STR_UNITS_WEIGHT_LONG_METRIC :{DECIMAL}{NBSP}tonne{P "" s}
STR_UNITS_WEIGHT_LONG_SI :{DECIMAL}{NBSP}kg
STR_UNITS_VOLUME_SHORT_IMPERIAL :{COMMA}{NBSP}gal
STR_UNITS_VOLUME_SHORT_METRIC :{COMMA}{NBSP}l
STR_UNITS_VOLUME_SHORT_SI :{COMMA}{NBSP}m³
STR_UNITS_VOLUME_SHORT_IMPERIAL :{DECIMAL}{NBSP}gal
STR_UNITS_VOLUME_SHORT_METRIC :{DECIMAL}{NBSP}l
STR_UNITS_VOLUME_SHORT_SI :{DECIMAL}{NBSP}m³
STR_UNITS_VOLUME_LONG_IMPERIAL :{COMMA}{NBSP}gallon{P "" s}
STR_UNITS_VOLUME_LONG_METRIC :{COMMA}{NBSP}litre{P "" s}
STR_UNITS_VOLUME_LONG_SI :{COMMA}{NBSP}m³
STR_UNITS_VOLUME_LONG_IMPERIAL :{DECIMAL}{NBSP}gallon{P "" s}
STR_UNITS_VOLUME_LONG_METRIC :{DECIMAL}{NBSP}litre{P "" s}
STR_UNITS_VOLUME_LONG_SI :{DECIMAL}{NBSP}m³
STR_UNITS_FORCE_IMPERIAL :{COMMA}{NBSP}lbf
STR_UNITS_FORCE_METRIC :{COMMA}{NBSP}kgf
STR_UNITS_FORCE_SI :{COMMA}{NBSP}kN
STR_UNITS_FORCE_IMPERIAL :{DECIMAL}{NBSP}lbf
STR_UNITS_FORCE_METRIC :{DECIMAL}{NBSP}kgf
STR_UNITS_FORCE_SI :{DECIMAL}{NBSP}kN
STR_UNITS_HEIGHT_IMPERIAL :{COMMA}{NBSP}ft
STR_UNITS_HEIGHT_METRIC :{COMMA}{NBSP}m
STR_UNITS_HEIGHT_SI :{COMMA}{NBSP}m
STR_UNITS_HEIGHT_IMPERIAL :{DECIMAL}{NBSP}ft
STR_UNITS_HEIGHT_METRIC :{DECIMAL}{NBSP}m
STR_UNITS_HEIGHT_SI :{DECIMAL}{NBSP}m
# Common window strings
STR_LIST_FILTER_TITLE :{BLACK}Filter: