Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Controls/TransparentLabel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void Draw(Graphics g) {
private float GetFontSizeFactor() {
float factor;
Language lang = Stats.CurrentLanguage;
bool isLangGroup1 = lang == Language.English || lang == Language.French;
bool isLangGroup1 = lang == Language.English || lang == Language.French || lang == Language.Spanish;
bool isLangGroup2 = lang == Language.Korean || lang == Language.Japanese;
bool isLangGroup3 = lang == Language.SimplifiedChinese || lang == Language.TraditionalChinese;

Expand Down Expand Up @@ -202,7 +202,7 @@ private float GetFontSizeFactorForRoundName(string text) {
if (text.Length >= 9 && 30 >= text.Length) {
factor = 0.33f;
Language lang = Stats.CurrentLanguage;
bool isLangGroup1 = lang == Language.English || lang == Language.French;
bool isLangGroup1 = lang == Language.English || lang == Language.French || lang == Language.Spanish;
bool isLangGroup2 = lang == Language.Korean || lang == Language.Japanese;
bool isLangGroup3 = lang == Language.SimplifiedChinese || lang == Language.TraditionalChinese;
if (isLangGroup1 && string.Equals(this.Font.FontFamily.Name, Overlay.GetDefaultFontFamilies(Language.English).Name)) {
Expand Down
5,923 changes: 4,670 additions & 1,253 deletions Entities/Multilingual.cs

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Entities/Utils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,8 @@ public static string AppendOrdinal(int rank) {
case 1: return number + "er";
default: return number + "e";
}
} else if (Stats.CurrentLanguage == Language.Spanish) {
return number + "°";
} else if (Stats.CurrentLanguage == Language.Korean) {
return number + "위";
} else if (Stats.CurrentLanguage == Language.Japanese) {
Expand Down Expand Up @@ -426,6 +428,8 @@ public static string GetWeekString(int year, int week) {
switch (Stats.CurrentLanguage) {
case Language.French:
return $"Semaine {week}, {year}";
case Language.Spanish:
return $"Semana {week}, {year}";
case Language.Korean:
return $"{year}년 {week}주차";
case Language.Japanese:
Expand Down Expand Up @@ -458,6 +462,8 @@ public static string GetStartAndEndDates(int year, int weekOfYear) {
switch (Stats.CurrentLanguage) {
case Language.French:
return $"{start.ToString(GetDateFormat(), GetCultureInfo())} - {end.ToString(GetDateFormat(), GetCultureInfo())}";
case Language.Spanish:
return $"{start.ToString(GetDateFormat(), GetCultureInfo())} - {end.ToString(GetDateFormat(), GetCultureInfo())}";
case Language.Korean:
return $"{start.ToString(GetDateFormat(), GetCultureInfo())} - {end.ToString(GetDateFormat(), GetCultureInfo())}";
case Language.Japanese:
Expand All @@ -475,6 +481,7 @@ public static string GetDateFormat() {
switch (Stats.CurrentLanguage) {
case Language.English: return "MMM dd, yyyy";
case Language.French: return "d MMM yyyy";
case Language.Spanish: return "d de MMMM de yyyy";
case Language.Korean: return "yyyy년 M월 d일";
case Language.Japanese: return "yyyy年M月d日";
case Language.SimplifiedChinese: return "yyyy年M月d日";
Expand All @@ -487,6 +494,7 @@ public static CultureInfo GetCultureInfo() {
switch (Stats.CurrentLanguage) {
case Language.English: return new CultureInfo("en-US");
case Language.French: return new CultureInfo("fr-FR");
case Language.Spanish: return new CultureInfo("es-ES");
case Language.Korean: return new CultureInfo("ko-KR");
case Language.Japanese: return new CultureInfo("ja-JP");
case Language.SimplifiedChinese: return new CultureInfo("zh-CN");
Expand Down
1 change: 1 addition & 0 deletions Enums/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public enum QualifyTier {
public enum Language {
English,
French,
Spanish,
Korean,
Japanese,
SimplifiedChinese,
Expand Down
5 changes: 5 additions & 0 deletions Views/EditShows.cs
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,11 @@ private void ChangeLanguage() {
this.cboEditShows.Left = 185;
//this.cboEditShows.Size = new Size(198, 29);
this.lblEditShowsBackColor.Width = 525;
} else if (Stats.CurrentLanguage == Language.Spanish) {
this.Width = 525;
this.cboEditShows.Left = 185;
//this.cboEditShows.Size = new Size(198, 29);
this.lblEditShowsBackColor.Width = 525;
} else if (Stats.CurrentLanguage == Language.Korean) {
this.Width = 445;
this.cboEditShows.Left = 185;
Expand Down
2 changes: 1 addition & 1 deletion Views/InitLanguage.Designer.cs

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

1 change: 1 addition & 0 deletions Views/InitLanguage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public partial class InitLanguage : MetroFramework.Forms.MetroForm {

public InitLanguage(string sysLang) {
this.defaultLanguage = string.Equals(sysLang, "fr", StringComparison.OrdinalIgnoreCase) ? Language.French :
string.Equals(sysLang, "es", StringComparison.OrdinalIgnoreCase) ? Language.Spanish :
string.Equals(sysLang, "ko", StringComparison.OrdinalIgnoreCase) ? Language.Korean :
string.Equals(sysLang, "ja", StringComparison.OrdinalIgnoreCase) ? Language.Japanese :
string.Equals(sysLang, "zh-chs", StringComparison.OrdinalIgnoreCase) ? Language.SimplifiedChinese :
Expand Down
20 changes: 16 additions & 4 deletions Views/LevelDetails.cs
Original file line number Diff line number Diff line change
Expand Up @@ -402,12 +402,24 @@ private int GetClientWidth() {
Language lang = Stats.CurrentLanguage;
switch (this.statType) {
case StatType.Shows:
return this.Width - (lang == Language.English ? -380 : lang == Language.French ? -400 : lang == Language.Korean ? -370 : lang == Language.Japanese ? -370 : -380);
return this.Width - (lang == Language.English ? -380 :
lang == Language.French ? -400 :
lang == Language.Spanish ? -400 :
lang == Language.Korean ? -370 :
lang == Language.Japanese ? -370 : -380);
case StatType.Rounds:
case StatType.Levels:
return this.Width + (lang == Language.English ? 1310 : lang == Language.French ? 1305 : lang == Language.Korean ? 1260 : lang == Language.Japanese ? 1260 : 1340);
return this.Width + (lang == Language.English ? 1310 :
lang == Language.French ? 1305 :
lang == Language.Spanish ? 1305 :
lang == Language.Korean ? 1260 :
lang == Language.Japanese ? 1260 : 1340);
default:
return this.Width + (lang == Language.English ? 1310 : lang == Language.French ? 1305 : lang == Language.Korean ? 1260 : lang == Language.Japanese ? 1260 : 1340);
return this.Width + (lang == Language.English ? 1310 :
lang == Language.French ? 1305 :
lang == Language.Spanish ? 1305 :
lang == Language.Korean ? 1260 :
lang == Language.Japanese ? 1260 : 1340);
}
}

Expand Down Expand Up @@ -445,7 +457,7 @@ private int GetDataGridViewColumnWidth(string columnName, string columnText = ""
sizeOfText = TextRenderer.MeasureText(columnText, this.dataGridViewCellStyle1.Font).Width;
break;
case "Start":
return 0;
return 165;
case "End":
sizeOfText = TextRenderer.MeasureText(columnText, this.dataGridViewCellStyle1.Font).Width;
break;
Expand Down
6 changes: 3 additions & 3 deletions Views/Overlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,13 @@ private void SetFontColor(Color color) {
this.ForeColor = color;
}
public static void SetDefaultFont(float emSize, Language lang) {
DefaultFont = new Font(GetDefaultFontFamilies(lang), emSize, (lang == Language.English || lang == Language.French) ? FontStyle.Regular : FontStyle.Bold, GraphicsUnit.Pixel);
DefaultFont = new Font(GetDefaultFontFamilies(lang), emSize, (lang == Language.English || lang == Language.French || lang == Language.Spanish) ? FontStyle.Regular : FontStyle.Bold, GraphicsUnit.Pixel);
}
public static Font GetDefaultFont(float emSize, Language lang) {
return new Font(GetDefaultFontFamilies(lang), emSize, (lang == Language.English || lang == Language.French) ? FontStyle.Regular : FontStyle.Bold, GraphicsUnit.Pixel);
return new Font(GetDefaultFontFamilies(lang), emSize, (lang == Language.English || lang == Language.French || lang == Language.Spanish) ? FontStyle.Regular : FontStyle.Bold, GraphicsUnit.Pixel);
}
public static FontFamily GetDefaultFontFamilies(Language lang = Language.English) {
return (lang == Language.English || lang == Language.French) ? DefaultFontCollection.Families[2] : (lang == Language.SimplifiedChinese || lang == Language.TraditionalChinese) ? DefaultFontCollection.Families[0] : DefaultFontCollection.Families[1];
return (lang == Language.English || lang == Language.French || lang == Language.Spanish) ? DefaultFontCollection.Families[2] : (lang == Language.SimplifiedChinese || lang == Language.TraditionalChinese) ? DefaultFontCollection.Families[0] : DefaultFontCollection.Families[1];
}
public static Font GetMainFont(float emSize, FontStyle fontStyle = FontStyle.Regular, Language lang = Language.English) {
return new Font(GetMainFontFamilies(lang), emSize, fontStyle, GraphicsUnit.Pixel);
Expand Down
6 changes: 3 additions & 3 deletions Views/Settings.Designer.cs

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

11 changes: 6 additions & 5 deletions Views/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ private void Settings_Load(object sender, EventArgs e) {
List<ImageItem> flagItemArray = new List<ImageItem> {
new ImageItem(Properties.Resources.country_us_shiny_icon, "English", Overlay.GetMainFont(14f)),
new ImageItem(Properties.Resources.country_fr_shiny_icon, "Français", Overlay.GetMainFont(14f)),
new ImageItem(Properties.Resources.country_es_shiny_icon, "Español", Overlay.GetMainFont(14f)),
new ImageItem(Properties.Resources.country_kr_shiny_icon, "한국어", Overlay.GetMainFont(14f)),
new ImageItem(Properties.Resources.country_jp_shiny_icon, "日本語", Overlay.GetMainFont(14f)),
new ImageItem(Properties.Resources.country_cn_shiny_icon, "简体中文", Overlay.GetMainFont(14f)),
Expand Down Expand Up @@ -1014,7 +1015,7 @@ private void btnTestProxyConnection_Click(object sender, EventArgs e) {
}

private void linkIPinfoToken_MouseEnter(object sender, EventArgs e) {
Point position = new Point(((MetroLink)sender).Right + (this.DisplayLang == Language.English ? 120 : this.DisplayLang == Language.French ? 85 : this.DisplayLang == Language.Korean ? 119 : this.DisplayLang == Language.Japanese ? 0 : this.DisplayLang == Language.SimplifiedChinese ? 192 : this.DisplayLang == Language.TraditionalChinese ? 196 : 120), ((MetroLink)sender).Top + 110);
Point position = new Point(((MetroLink)sender).Right + (this.DisplayLang == Language.English ? 120 : this.DisplayLang == Language.French ? 85 : this.DisplayLang == Language.Spanish ? 100 : this.DisplayLang == Language.Korean ? 119 : this.DisplayLang == Language.Japanese ? 0 : this.DisplayLang == Language.SimplifiedChinese ? 192 : this.DisplayLang == Language.TraditionalChinese ? 196 : 120), ((MetroLink)sender).Top + 110);
this.StatsForm.AllocTooltip();
this.StatsForm.ShowTooltip(Multilingual.GetWord("settings_link_to_get_ipinfo_token", this.DisplayLang), this, position);
}
Expand Down Expand Up @@ -1248,7 +1249,7 @@ private void ChangeLanguage(Language lang) {
Multilingual.GetWord("settings_notification_window_bottom_right"),
});
this.cboNotificationWindowPosition.SelectedIndex = this.CurrentSettings.NotificationWindowPosition;
this.cboNotificationWindowPosition.Width = lang == Language.English ? 116 : lang == Language.French ? 140 : lang == Language.Korean ? 108 : lang == Language.Japanese ? 62 : lang == Language.SimplifiedChinese ? 77 : lang == Language.TraditionalChinese ? 77 : 120;
this.cboNotificationWindowPosition.Width = lang == Language.English ? 116 : lang == Language.French ? 140 : lang == Language.Spanish ? 158 : lang == Language.Korean ? 108 : lang == Language.Japanese ? 62 : lang == Language.SimplifiedChinese ? 77 : lang == Language.TraditionalChinese ? 77 : 120;
this.cboNotificationWindowPosition.Location = new Point(this.cboNotificationSounds.Location.X + this.cboNotificationSounds.Width + 5, this.cboNotificationWindowPosition.Location.Y);
this.cboNotificationWindowAnimation.Location = new Point(this.cboNotificationWindowPosition.Location.X + this.cboNotificationWindowPosition.Width + 5, this.cboNotificationWindowAnimation.Location.Y);
this.mlPlayNotificationSounds.Location = new Point(this.cboNotificationWindowAnimation.Location.X + this.cboNotificationWindowAnimation.Width + 5, this.mlPlayNotificationSounds.Location.Y);
Expand All @@ -1269,11 +1270,11 @@ private void ChangeLanguage(Language lang) {
this.txtPreviousWins.Location = new Point(this.lblPreviousWins.Location.X + this.lblPreviousWins.Width + 4, 10);
this.lblPreviousWinsNote.Location = new Point(this.txtPreviousWins.Location.X + this.txtPreviousWins.Width + 4, 12);
this.cboTheme.Location = new Point(this.lblTheme.Location.X + this.lblTheme.Width + 4, this.cboTheme.Location.Y);
this.cboTheme.Width = lang == Language.English ? 90 : lang == Language.French ? 105 : lang == Language.Korean ? 100 : lang == Language.Japanese ? 100 : 85;
this.cboTheme.Width = lang == Language.English ? 90 : lang == Language.French ? 105 : lang == Language.Spanish ? 105 : lang == Language.Korean ? 100 : lang == Language.Japanese ? 100 : 85;
this.txtCycleTimeSeconds.Location = new Point(this.lblCycleTimeSeconds.Location.X + this.lblCycleTimeSeconds.Width + 4, 167);
this.lblCycleTimeSecondsTag.Location = new Point(this.txtCycleTimeSeconds.Location.X + this.txtCycleTimeSeconds.Width + 4, 170);
this.cboLockButtonLocation.Location = new Point(lang == Language.French ? 280 : 203, 450);
this.cboLockButtonLocation.Width = lang == Language.English ? 79 : lang == Language.French ? 81 : lang == Language.Japanese ? 47 : 63;
this.cboLockButtonLocation.Location = new Point(lang == Language.French ? 280 : lang == Language.Spanish ? 230 : 203, 450);
this.cboLockButtonLocation.Width = lang == Language.English || lang == Language.Spanish ? 79 : lang == Language.French ? 81 : lang == Language.Japanese ? 47 : 63;
if (this.LaunchPlatform == 0) {
this.lblGameExeLocation.Location = new Point(this.grpLaunchPlatform.Location.X + this.grpLaunchPlatform.Width + 3, 20);
this.lblGameExeLocation.Text = Multilingual.GetWord("settings_fall_guys_shortcut_location");
Expand Down
Loading
Loading