IBBoard.WarFoundry.API: api/Exporters/WarFoundryHtmlExporter.cs comparison

Re #179: Make sure that translations are used throughout UI * Fix locations in the API that are used in the front-end

comparison

equal deleted inserted replaced

-:c6713a1b4c0d
+:1b718b67f7f6
 using System.Xml;
 using System.Xml.Schema;
 using IBBoard.Lang;
 using IBBoard.Xml;
 using IBBoard.WarFoundry.API.Objects;
+using IBBoard.WarFoundry.API.Util;
 namespace IBBoard.WarFoundry.API.Exporters
 {
 	/// <summary>
 	/// Custom exporter that exports an army as a basic HTML file
 					}
 					else
 					{
 						sb.Append(", ");
 					}
-					sb.Append(Translation.GetTranslation("armyHtmlExportEquipAmountRatio", "{0} for {1}", equip.Name, unit.GetEquipmentAmountString(equip)));
+					string amountString;
+					double amount = UnitEquipmentUtil.GetEquipmentAmount(unit, equip);
+					if (UnitEquipmentUtil.GetEquipmentAmountIsRatio(unit, equip))
+					{
+						int number = UnitEquipmentUtil.GetEquipmentAmountTaken(unit, equip);
+						if (amount == 100)
+						{
+							amountString = Translation.GetTranslation("armyHtmlExportEquipAmountAll", "all ({1})", amount, number);
+						}
+						else
+						{
+							amountString = Translation.GetTranslation("armyHtmlExportEquipAmountPercentage", "{0}% ({1})", amount, number);
+						}
+					}
+					else
+					{
+						amountString = amount.ToString();
+					}
+					sb.Append(Translation.GetTranslation("armyHtmlExportEquipAmountRatio", "{0} for {1}", equip.Name, amountString));
 				}
 				sb.Append(". ");
 			}

Mercurial > repos > IBBoard.WarFoundry.API