Skip to content

Commit

Permalink
Translate UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@silfumus
silfumus committed Aug 17, 2018
1 parent 565d177 commit c382f31
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion ElectronicObserver/Observer/kcsapi/api_start2/getData.cs
View file
Expand Up @@ -218,7 +218,7 @@ public override void OnResponseReceived(dynamic data)
}


Utility.Logger.Add(2, "提督が鎮守府に着任しました。これより艦隊の指揮を執ります。");
Utility.Logger.Add(2, "The Admiral has checked in at the base. You may now take control.");

base.OnResponseReceived((object)data);
}
Expand Down
2 changes: 1 addition & 1 deletion ElectronicObserver/Window/Control/FleetState.cs
View file
Expand Up @@ -373,7 +373,7 @@ public void UpdateFleetState(FleetData fleet, ToolTip tooltip)
iconIndex,
colorInPort);

tooltip.SetToolTip( state.Label, string.Format( "Recovery time: {0}\r\n(予測誤差: {1})",
tooltip.SetToolTip( state.Label, string.Format( "Recovery time: {0}\r\n(prediction error: {1})",
DateTimeHelper.TimeToCSVString( state.Timer ), DateTimeHelper.ToTimeRemainString( TimeSpan.FromSeconds( db.Fleet.ConditionBorderAccuracy ) ) ) );

index++;
Expand Down
14 changes: 7 additions & 7 deletions ElectronicObserver/Window/Dialog/DialogDropRecordViewer.Designer.cs
View file

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

38 changes: 19 additions & 19 deletions ElectronicObserver/Window/Dialog/DialogExpChecker.Designer.cs
View file

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

32 changes: 16 additions & 16 deletions ElectronicObserver/Window/Dialog/DialogExpChecker.cs
View file
Expand Up @@ -15,7 +15,7 @@ namespace ElectronicObserver.Window.Dialog
{
public partial class DialogExpChecker : Form
{
private static readonly string DefaultTitle = "必要経験値計算";
private static readonly string DefaultTitle = "Exp Calculator";
private DataGridViewCellStyle CellStyleModernized;


Expand Down Expand Up @@ -73,7 +73,7 @@ private void DialogExpChecker_Load(object sender, EventArgs e)

if (!ships.Any())
{
MessageBox.Show("艦船が存在しません。\r\n母港まで移動してください。", "対象艦船なし", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("No ships available.\r\nPlease return to the home port page.", "Ships Unavailable", MessageBoxButtons.OK, MessageBoxIcon.Error);
Close();
return;
}
Expand Down Expand Up @@ -177,28 +177,28 @@ private void UpdateLevelView()
{
if (selectedShip.SlotSize >= 4)
{
ASWEquipmentPairs.Add(openingASWborder - 51, "[四式水中聴音機x3, 試製15cm9連装対潜噴進砲]");
ASWEquipmentPairs.Add(openingASWborder - 48, "[四式水中聴音機x4]");
ASWEquipmentPairs.Add(openingASWborder - 44, "[四式水中聴音機x3, 三式爆雷投射機]");
ASWEquipmentPairs.Add(openingASWborder - 51, "[Type 4 SONARx3, 15cm ASW Rocket Launcher]");
ASWEquipmentPairs.Add(openingASWborder - 48, "[Type 4 SONARx4]");
ASWEquipmentPairs.Add(openingASWborder - 44, "[Type 4 SONARx3, Type 3 DC]");
}
if (selectedShip.SlotSize >= 3)
{
ASWEquipmentPairs.Add(openingASWborder - 39, "[四式水中聴音機x2, 試製15cm9連装対潜噴進砲]");
ASWEquipmentPairs.Add(openingASWborder - 36, "[四式水中聴音機x3]");
ASWEquipmentPairs.Add(openingASWborder - 32, "[四式水中聴音機x2, 三式爆雷投射機]");
ASWEquipmentPairs.Add(openingASWborder - 28, "[三式水中探信儀x2, 三式爆雷投射機]");
ASWEquipmentPairs.Add(openingASWborder - 27, "[四式水中聴音機, 三式爆雷投射機, 二式爆雷]");
ASWEquipmentPairs.Add(openingASWborder - 39, "[Type 4 SONARx2, 15cm ASW Rocket Launcher]");
ASWEquipmentPairs.Add(openingASWborder - 36, "[Type 4 SONARx3]");
ASWEquipmentPairs.Add(openingASWborder - 32, "[Type 4 SONARx2, Type 3 DC]");
ASWEquipmentPairs.Add(openingASWborder - 28, "[Type 3 SONARx2, Type 3 DC]");
ASWEquipmentPairs.Add(openingASWborder - 27, "[Type 4 SONAR, Type 3 DC, Type 2 DC]");
}
if (selectedShip.SlotSize >= 2)
{
if (ASWEquipmentPairs.ContainsKey(openingASWborder - 27))
ASWEquipmentPairs[openingASWborder - 27] += ", [四式水中聴音機, 試製15cm9連装対潜噴進砲]";
ASWEquipmentPairs[openingASWborder - 27] += ", [Type 4 SONAR, 15cm ASW Rocket Launcher]";
else
ASWEquipmentPairs.Add(openingASWborder - 27, "[四式水中聴音機, 試製15cm9連装対潜噴進砲]");
ASWEquipmentPairs.Add(openingASWborder - 20, "[四式水中聴音機, 三式爆雷投射機]");
ASWEquipmentPairs.Add(openingASWborder - 18, "[三式水中探信儀, 三式爆雷投射機]");
ASWEquipmentPairs.Add(openingASWborder - 27, "[Type 4 SONAR, 15cm ASW Rocket Launcher]");
ASWEquipmentPairs.Add(openingASWborder - 20, "[Type 4 SONAR, Type 3 DC]");
ASWEquipmentPairs.Add(openingASWborder - 18, "[Type 3 SONAR, Type 3 DC]");
}
ASWEquipmentPairs.Add(openingASWborder - 12, "[四式水中聴音機]");
ASWEquipmentPairs.Add(openingASWborder - 12, "[Type 4 SONAR]");
}


Expand Down Expand Up @@ -245,7 +245,7 @@ private void UpdateLevelView()


Text = DefaultTitle + " - " + selectedShip.NameWithLevel;
GroupExp.Text = $"{selectedShip.NameWithLevel}: Exp. {selectedShip.ExpTotal}, 対潜 {selectedShip.ASWBase} (現在改修+{selectedShip.ASWModernized})";
GroupExp.Text = $"{selectedShip.NameWithLevel}: Exp. {selectedShip.ExpTotal}, ASW {selectedShip.ASWBase} (Modernization+{selectedShip.ASWModernized})";
}


Expand Down
14 changes: 7 additions & 7 deletions ElectronicObserver/Window/FormFleet.cs
View file
Expand Up @@ -174,13 +174,13 @@ public void Update(FleetData fleet)
{
case 0:
default:
supporttype = "発動不能"; break;
supporttype = "n/a"; break;
case 1:
supporttype = "航空支援";break;
supporttype = "Aerial Support";break;
case 2:
supporttype = "支援射撃"; break;
supporttype = "Support Shelling"; break;
case 3:
supporttype = "支援長距離雷撃"; break;
supporttype = "Long-range Torpedo Attack"; break;
}

double expeditionBonus = Calculator.GetExpeditionBonus(fleet);
Expand All @@ -194,7 +194,7 @@ public void Update(FleetData fleet)
ToolTipInfo.SetToolTip(Name, string.Format(
"Lv sum: {0} / avg: {1:0.00}\r\n" +
"{2} fleet\r\n" +
"支援攻撃: {3}\r\n" +
"Support Expedition: {3}\r\n" +
"Total AA: {4} / ASW: {5} / LOS: {6}\r\n" +
"Drum: {7} ({8} ships)\r\n" +
"Daihatsu: {9} ({10} ships, +{11:p1})\r\n" +
Expand Down Expand Up @@ -470,7 +470,7 @@ public void Update(int shipMasterID)
Name.Tag = ship.ShipID;
ToolTipInfo.SetToolTip(Name,
string.Format(
"{0} {1}\r\n火力: {2}/{3}\r\n雷装: {4}/{5}\r\n対空: {6}/{7}\r\n装甲: {8}/{9}\r\n対潜: {10}/{11}\r\n回避: {12}/{13}\r\n索敵: {14}/{15}\r\n運: {16}\r\n射程: {17} / 速力: {18}\r\n(右クリックで図鑑)\n",
"{0} {1}\r\nFP: {2}/{3}\r\nTorp: {4}/{5}\r\nAA: {6}/{7}\r\nArmor: {8}/{9}\r\nASW: {10}/{11}\r\nEvasion: {12}/{13}\r\nLOS: {14}/{15}\r\nLuck: {16}\r\nRange: {17} / Speed: {18}\r\n(right click to open encyclopedia)\n",
ship.MasterShip.ShipTypeName, ship.NameWithLevel,
ship.FirepowerBase, ship.FirepowerTotal,
ship.TorpedoBase, ship.TorpedoTotal,
Expand Down Expand Up @@ -509,7 +509,7 @@ public void Update(int shipMasterID)
tip.AppendFormat(GeneralRes.ToX + " exp.\r\n", ExpTable.ShipMaximumLevel, Math.Max(ExpTable.GetExpToLevelShip(ship.ExpTotal, ExpTable.ShipMaximumLevel), 0));
}

tip.AppendLine("(右クリックで必要Exp計算)");
tip.AppendLine("(right click to calculate exp)");

ToolTipInfo.SetToolTip(Level, tip.ToString());
}
Expand Down
12 changes: 6 additions & 6 deletions ElectronicObserver/Window/FormHeadquarters.cs
View file
Expand Up @@ -224,21 +224,21 @@ void Updated(string apiname, dynamic data)
StringBuilder tooltip = new StringBuilder();

var sortieCount = db.Admiral.SortieWin + db.Admiral.SortieLose;
tooltip.AppendFormat("出撃回数: {0} / 出撃勝利: {1} ({2:p2}) / 出撃敗北: {3}\r\n",
tooltip.AppendFormat("Sorties: {0} / Win: {1} ({2:p2}) / Lose: {3}\r\n",
sortieCount, db.Admiral.SortieWin, db.Admiral.SortieWin / Math.Max(sortieCount, 1.0), db.Admiral.SortieLose);

tooltip.AppendFormat("出撃あたりの平均獲得Exp: {0:n2} / 勝利時 {1:n2}\r\n",
tooltip.AppendFormat("Avg exp per sortie: {0:n2} / per victory: {1:n2}\r\n",
db.Admiral.Exp / Math.Max(sortieCount, 1.0),
db.Admiral.Exp / Math.Max(db.Admiral.SortieWin, 1.0));

tooltip.AppendFormat("遠征回数: {0} / 遠征成功: {1} ({2:p2}) / 遠征失敗: {3}\r\n",
tooltip.AppendFormat("Expeditions: {0} / Success: {1} ({2:p2}) / Failed: {3}\r\n",
db.Admiral.MissionCount, db.Admiral.MissionSuccess, db.Admiral.MissionSuccess / Math.Max(db.Admiral.MissionCount, 1.0), db.Admiral.MissionCount - db.Admiral.MissionSuccess);

var practiceCount = db.Admiral.PracticeWin + db.Admiral.PracticeLose;
tooltip.AppendFormat("演習回数: {0} / 演習勝利: {1} ({2:p2}) / 演習敗北: {3}\r\n",
tooltip.AppendFormat("Naval Exercises: {0} / Win: {1} ({2:p2}) / Lose: {3}\r\n",
practiceCount, db.Admiral.PracticeWin, db.Admiral.PracticeWin / Math.Max(practiceCount, 1.0), db.Admiral.PracticeLose);

tooltip.AppendFormat("甲種勲章保有数: {0}\r\n", db.Admiral.Medals);
tooltip.AppendFormat("Memedals: {0}\r\n", db.Admiral.Medals);

ToolTipInfo.SetToolTip(AdmiralName, tooltip.ToString());
}
Expand Down Expand Up @@ -591,7 +591,7 @@ private void UpdateDisplayUseItem()
case "お茶":
DisplayUseItem.Text = (item?.Count ?? 0).ToString();
ToolTipInfo.SetToolTip(DisplayUseItem,
$"お米: {db.UseItems[85]?.Count ?? 0}\r\n梅干: {db.UseItems[86]?.Count ?? 0}\r\n海苔: {db.UseItems[87]?.Count ?? 0}\r\nお茶: {db.UseItems[88]?.Count ?? 0}\r\n{tail}");
$"Rice: {db.UseItems[85]?.Count ?? 0}\r\nUmeboshi: {db.UseItems[86]?.Count ?? 0}\r\nNori: {db.UseItems[87]?.Count ?? 0}\r\nTea: {db.UseItems[88]?.Count ?? 0}\r\n{tail}");
break;

default:
Expand Down

0 comments on commit c382f31

Please sign in to comment.