From 7d3b382e85360ce73f2c3eabe1b54911485b100c Mon Sep 17 00:00:00 2001
From: Adrian L Lange <git@p3lim.net>
Date: Fri, 20 Dec 2024 09:48:40 +0100
Subject: [PATCH] Use globalstrings directly, cleanup localizations

---
 locale/deDE.lua | 3 ---
 locale/esES.lua | 8 +-------
 locale/esMX.lua | 8 +-------
 locale/frFR.lua | 8 +-------
 locale/itIT.lua | 8 +-------
 locale/koKR.lua | 4 ----
 locale/ptBR.lua | 8 +-------
 locale/ruRU.lua | 8 +-------
 locale/zhCN.lua | 4 ----
 locale/zhTW.lua | 4 ----
 settings.lua    | 6 +++---
 11 files changed, 9 insertions(+), 60 deletions(-)

diff --git a/locale/deDE.lua b/locale/deDE.lua
index d603931..e9455e7 100644
--- a/locale/deDE.lua
+++ b/locale/deDE.lua
@@ -1,7 +1,4 @@
 local L = select(2, ...).L('deDE')
 
 -- config
-L['ALT key'] = ALT_KEY
-L['ALT + CTRL key'] = ALT_KEY_TEXT .. ' + ' .. CTRL_KEY
-L['ALT + SHIFT key'] = ALT_KEY_TEXT .. ' + ' .. SHIFT_KEY
 L['Modifier to activate %s'] = 'Modifikator zum aktivieren von %s'
diff --git a/locale/esES.lua b/locale/esES.lua
index e78eed7..5cd5b17 100644
--- a/locale/esES.lua
+++ b/locale/esES.lua
@@ -1,7 +1 @@
-local L = select(2, ...).L('esES')
-
--- config
-L['ALT key'] = ALT_KEY
-L['ALT + CTRL key'] = ALT_KEY_TEXT .. ' + ' .. CTRL_KEY
-L['ALT + SHIFT key'] = ALT_KEY_TEXT .. ' + ' .. SHIFT_KEY
--- L['Modifier to activate %s'] -- MISSING! %s = "Molinari"
+local L = select(2, ...).L('esES') -- luacheck: ignore
diff --git a/locale/esMX.lua b/locale/esMX.lua
index ba3c106..3333c34 100644
--- a/locale/esMX.lua
+++ b/locale/esMX.lua
@@ -1,7 +1 @@
-local L = select(2, ...).L('esMX')
-
--- config
-L['ALT key'] = ALT_KEY
-L['ALT + CTRL key'] = ALT_KEY_TEXT .. ' + ' .. CTRL_KEY
-L['ALT + SHIFT key'] = ALT_KEY_TEXT .. ' + ' .. SHIFT_KEY
--- L['Modifier to activate %s'] -- MISSING! %s = "Molinari"
+local L = select(2, ...).L('esMX') -- luacheck: ignore
diff --git a/locale/frFR.lua b/locale/frFR.lua
index 87e4f53..45c44f0 100644
--- a/locale/frFR.lua
+++ b/locale/frFR.lua
@@ -1,7 +1 @@
-local L = select(2, ...).L('frFR')
-
--- config
-L['ALT key'] = ALT_KEY
-L['ALT + CTRL key'] = ALT_KEY_TEXT .. ' + ' .. CTRL_KEY
-L['ALT + SHIFT key'] = ALT_KEY_TEXT .. ' + ' .. SHIFT_KEY
--- L['Modifier to activate %s'] -- MISSING! %s = "Molinari"
+local L = select(2, ...).L('frFR') -- luacheck: ignore
diff --git a/locale/itIT.lua b/locale/itIT.lua
index 283065a..593fefb 100644
--- a/locale/itIT.lua
+++ b/locale/itIT.lua
@@ -1,7 +1 @@
-local L = select(2, ...).L('itIT')
-
--- config
-L['ALT key'] = ALT_KEY
-L['ALT + CTRL key'] = ALT_KEY_TEXT .. ' + ' .. CTRL_KEY
-L['ALT + SHIFT key'] = ALT_KEY_TEXT .. ' + ' .. SHIFT_KEY
--- L['Modifier to activate %s'] -- MISSING! %s = "Molinari"
+local L = select(2, ...).L('itIT') -- luacheck: ignore
diff --git a/locale/koKR.lua b/locale/koKR.lua
index d335a11..f838b9e 100644
--- a/locale/koKR.lua
+++ b/locale/koKR.lua
@@ -1,7 +1,3 @@
 local L = select(2, ...).L('koKR')
 
--- config
-L['ALT key'] = ALT_KEY
-L['ALT + CTRL key'] = ALT_KEY_TEXT .. ' + ' .. CTRL_KEY
-L['ALT + SHIFT key'] = ALT_KEY_TEXT .. ' + ' .. SHIFT_KEY
 L['Modifier to activate %s'] = '몰리나리를 작동시키는 수식어'
diff --git a/locale/ptBR.lua b/locale/ptBR.lua
index 2b56c1b..193614f 100644
--- a/locale/ptBR.lua
+++ b/locale/ptBR.lua
@@ -1,7 +1 @@
-local L = select(2, ...).L('ptBR')
-
--- config
-L['ALT key'] = ALT_KEY
-L['ALT + CTRL key'] = ALT_KEY_TEXT .. ' + ' .. CTRL_KEY
-L['ALT + SHIFT key'] = ALT_KEY_TEXT .. ' + ' .. SHIFT_KEY
--- L['Modifier to activate %s'] -- MISSING! %s = "Molinari"
+local L = select(2, ...).L('ptBR') -- luacheck: ignore
diff --git a/locale/ruRU.lua b/locale/ruRU.lua
index d97cb68..6607691 100644
--- a/locale/ruRU.lua
+++ b/locale/ruRU.lua
@@ -1,7 +1 @@
-local L = select(2, ...).L('ruRU')
-
--- config
-L['ALT key'] = ALT_KEY
-L['ALT + CTRL key'] = ALT_KEY_TEXT .. ' + ' .. CTRL_KEY
-L['ALT + SHIFT key'] = ALT_KEY_TEXT .. ' + ' .. SHIFT_KEY
--- L['Modifier to activate %s'] -- MISSING! %s = "Molinari"
+local L = select(2, ...).L('ruRU') -- luacheck: ignore
diff --git a/locale/zhCN.lua b/locale/zhCN.lua
index 433aa88..9219203 100644
--- a/locale/zhCN.lua
+++ b/locale/zhCN.lua
@@ -1,7 +1,3 @@
 local L = select(2, ...).L('zhCN')
 
--- config
-L['ALT key'] = ALT_KEY
-L['ALT + CTRL key'] = ALT_KEY_TEXT .. ' + ' .. CTRL_KEY
-L['ALT + SHIFT key'] = ALT_KEY_TEXT .. ' + ' .. SHIFT_KEY
 L['Modifier to activate %s'] = '按键激活 %s'
diff --git a/locale/zhTW.lua b/locale/zhTW.lua
index 40dfe5a..9d0b2b8 100644
--- a/locale/zhTW.lua
+++ b/locale/zhTW.lua
@@ -1,7 +1,3 @@
 local L = select(2, ...).L('zhTW')
 
--- config
-L['ALT key'] = ALT_KEY
-L['ALT + CTRL key'] = ALT_KEY_TEXT .. ' + ' .. CTRL_KEY
-L['ALT + SHIFT key'] = ALT_KEY_TEXT .. ' + ' .. SHIFT_KEY
 L['Modifier to activate %s'] = '啟用%s的設置選項'
diff --git a/settings.lua b/settings.lua
index ec9f26d..8481bfd 100644
--- a/settings.lua
+++ b/settings.lua
@@ -8,9 +8,9 @@ addon:RegisterSettings('MolinariDB3', {
 		title = string.format(L['Modifier to activate %s'], addonName),
 		default = 'ALT',
 		options = {
-			{value='ALT', label=L['Alt key']},
-			{value='CTRL', label=L['ALT + CTRL key']},
-			{value='SHIFT', label=L['ALT + SHIFT key']},
+			{value='ALT', label=ALT_KEY},
+			{value='CTRL', label=ALT_KEY_TEXT .. ' + ' .. CTRL_KEY},
+			{value='SHIFT', label=ALT_KEY_TEXT .. ' + ' .. SHIFT_KEY},
 		}
 	}
 })