Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bulk i18n of epicmenu widget options #5237

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bulk i18n of epicmenu widget options #5237

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41b1604
feat: bulk i18n of epicmenu options
moreginger Apr 4, 2024
73eeb5e
feat: Reformat options that weren't parsing and i18n
moreginger Apr 4, 2024
13d42a5
fix: Fix key names
moreginger Apr 4, 2024
58248ed
fix: Lua is not Java
moreginger Apr 4, 2024
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
1,284 changes: 1,281 additions & 3 deletions LuaUI/Configs/lang/epicmenu.en.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions LuaUI/Widgets/api_chili_docking.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ local lastHeight = 0
----------------------------------------------------
-- Options
----------------------------------------------------
i18nPrefix = 'chilidocking_'
options_path = 'Settings/HUD Panels/Extras/Docking'
options_order = { 'dockEnabled', 'dockEnabledPanels', 'minimizeEnabled', 'dockThreshold'}
options = {
dockThreshold = {
name = "Docking distance",
type = 'number',
advanced = true,
value = 5,
Expand All @@ -45,28 +45,22 @@ options = {
end },
},
dockEnabled = {
name = 'Enable docking',
advanced = false,
type = 'bool',
value = true,
noHotkey = true,
desc = 'Dock windows to screen edges',
},
dockEnabledPanels = {
name = 'Use docking between panels',
advanced = false,
type = 'bool',
value = true,
noHotkey = true,
desc = 'Dock windows each other to prevent overlaps. Requires docking to be enabled via the previous setting.',
},
minimizeEnabled = {
name = 'Minimizable windows',
advanced = false,
type = 'bool',
value = true,
noHotkey = true,
desc = 'When enabled certain windows will have minimization tabs.',
},
}

Expand Down
5 changes: 2 additions & 3 deletions LuaUI/Widgets/api_chili_widgetselector.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ function MakeWidgetList() end
function KillWidgetList() end
local window_widgetlist

i18nPrefix = 'chiliwidgetselector_'
options_path = 'Settings/Misc'
options =
{
options = {
widgetlist_2 = {
name = 'Widget List',
type = 'button',
--hotkey = {key='f11', mod='A'}, -- In zk_keys.lua
advanced = true,
Expand Down
4 changes: 1 addition & 3 deletions LuaUI/Widgets/api_grabinput.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ local grabPaused = false
--------------------------------------------------------------------------------
-- Widget Options

i18nPrefix = 'grabinput_'
options_path = 'Settings/Interface/Mouse Cursor'
options_order = {
'grabinput',
Expand All @@ -35,7 +36,6 @@ options_order = {
-- toggle grabinput easily.
options = {
grabinput = {
name = "Lock Cursor to Window",
tooltip = "Prevents the cursor from leaving the Window/Screen",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tooltip seems unhandled?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oooh, good spot. I'm not sure if options work at all, certainly my script isn't smart enough to do them properly.
I guess we really need to cut this into smaller pieces.

type = "bool",
value = true,
Expand All @@ -48,7 +48,6 @@ options = {
end
},
lobbyDisables = {
name = "Lobby overlay disables lock",
tooltip = "Disables input grabbing when the lobby overlay is visible.",
type = "bool",
value = true,
Expand All @@ -62,7 +61,6 @@ options = {
noHotkey = true,
},
pauseDisables2 = {
name = "Pausing disables lock",
tooltip = "Disables input grabbing when the game is paused.",
type = "bool",
value = false,
Expand Down
Loading