Skip to content

Commit

Permalink
Merge branch 'beyond-all-reason:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@AntlerForce
AntlerForce authored Oct 29, 2024
2 parents cf738ee + ed7499e commit c627610
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 18 deletions.
39 changes: 21 additions & 18 deletions LuaMenu/widgets/chobby/components/login_window.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
height = 35,
text = i18n("username") .. ":",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
}
loginChildren[#loginChildren+1] = self.txtUsername

Expand All @@ -120,9 +120,10 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
width = 200,
y = 51,
height = 35,
hint = i18n("enter_username"),
text = Configuration.userName or Configuration.suggestedNameFromSteam or "",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
useIME = false,
}
loginChildren[#loginChildren+1] = self.ebUsername
Expand All @@ -134,7 +135,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
height = 35,
text = i18n("password") .. ":",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
}
loginChildren[#loginChildren+1] = self.txtPassword

Expand All @@ -146,9 +147,9 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
height = 35,
text = Configuration.password or "",
passwordInput = true,
hint = "Enter password",
hint = i18n("enter_password"),
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
useIME = false,
OnKeyPress = {
function(obj, key, mods, ...)
Expand All @@ -172,7 +173,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
height = 35,
text = i18n("username") .. ":",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
}
registerChildren[#registerChildren+1] = self.txtUsernameRegister

Expand All @@ -181,9 +182,10 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
width = 200,
y = 51,
height = 35,
hint = i18n("enter_username"),
text = Configuration.userName or Configuration.suggestedNameFromSteam or "",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
useIME = false,
}
registerChildren[#registerChildren+1] = self.ebUsernameRegister
Expand All @@ -196,7 +198,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
height = 35,
text = i18n("password") .. ":",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
}
registerChildren[#registerChildren+1] = self.txtPasswordRegister

Expand All @@ -207,9 +209,9 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
height = 35,
text = Configuration.password or "",
passwordInput = true,
hint = "Enter password",
hint = i18n("enter_password"),
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
useIME = false,
OnKeyPress = {
function(obj, key, mods, ...)
Expand All @@ -233,7 +235,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
height = 70,
text = i18n("confirm") .. ":",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
useIME = false,
}
registerChildren[#registerChildren + 1] = self.txtConfirmPassword
Expand All @@ -244,7 +246,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
y = 131,
height = 35,
text = "",
hint = "Confirm password",
hint = i18n("confirm_password"),
passwordInput = true,
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
Expand All @@ -268,7 +270,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
height = 35,
text = i18n("email") .. ":",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
useIME = false,
}
registerChildren[#registerChildren + 1] = self.txtEmail
Expand All @@ -279,6 +281,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
y = 171,
height = 35,
text = "",
hint = i18n("enter_email"),
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
useIME = false,
Expand All @@ -301,7 +304,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
height = 35,
text = i18n("confirm") .. ":",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
useIME = false,
}
registerChildren[#registerChildren + 1] = self.txtConfirmEmail
Expand Down Expand Up @@ -334,7 +337,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
width = 170,
y = 260,
height = 35,
caption = "Required for online play only",
caption = i18n("required_for_online"),
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
}
registerChildren[#registerChildren + 1] = self.lblRegistrationMultiplayer
Expand All @@ -356,7 +359,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
y = 365,
height = 35,
text = "",
hint = "Ask moderation on Discord for keyword",
hint = i18n("ask_moderation"),
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
useIME = false,
Expand Down Expand Up @@ -435,7 +438,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
height = 400,
text = "",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
}
loginChildren[#loginChildren+1] = self.txtError

Expand All @@ -446,7 +449,7 @@ function LoginWindow:init(failFunction, cancelText, windowClassname, params)
height = 90,
text = "",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(3),
objectOverrideHintFont = WG.Chobby.Configuration:GetFont(11),
}
registerChildren[#registerChildren + 1] = self.txtErrorRegister

Expand Down
6 changes: 6 additions & 0 deletions LuaMenu/widgets/chobby/i18n/chililobby.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,16 @@ return {
keys = "Keys",
email = "Email",
email_verification_code = "Email Verification Code",
enter_email = "Enter email",
enter_username = "Enter username",
enter_password = "Enter password",
confirm_password = "Confirm password",
change_username = "Change Username",
change_password = "Change Password",
submit_email = "Submit email",
submit_verification = "Submit Verification",
required_for_online = "Required for online play only",
ask_moderation = "Ask moderation on Discord for keyword",
-- gui_battle_status_panel
spectating_game_status = "Spectating",
playing_game_status = "Playing",
Expand Down

0 comments on commit c627610

Please sign in to comment.