From 1953c10af598ad5b1de23747a04e56e56e1c74a9 Mon Sep 17 00:00:00 2001 From: Ioney Date: Tue, 9 Jul 2024 21:54:39 +0200 Subject: [PATCH 1/7] #407 Add Achievement Tracking Option --- core/localization/deDE.lua | 2 ++ core/localization/enUS.lua | 2 ++ core/localization/esES.lua | 2 ++ core/localization/esMX.lua | 2 ++ core/localization/frFR.lua | 2 ++ core/localization/koKR.lua | 2 ++ core/localization/ruRU.lua | 2 ++ core/localization/zhCN.lua | 2 ++ core/localization/zhTW.lua | 2 ++ core/options.lua | 8 ++++++++ core/rewards.lua | 2 +- core/templates.lua | 14 +++++++++++++- 12 files changed, 40 insertions(+), 2 deletions(-) diff --git a/core/localization/deDE.lua b/core/localization/deDE.lua index 7791b8029..c018289b6 100644 --- a/core/localization/deDE.lua +++ b/core/localization/deDE.lua @@ -186,6 +186,8 @@ L['options_restore_hidden_nodes_desc'] = 'Stellt alle Punkte wieder her, die üb L['options_rewards_settings'] = 'Belohnungen' L['options_reward_types'] = 'Zeige Belohnungstypen' +L['options_achievements_rewards'] = 'Zeige Erfolgsbelohnungen' +L['options_achievements_rewards_desc'] = 'Zeige Erfolgsbelohnungen in Tooltips an und verfolge ihren Sammlungsstatus.' L['options_manuscript_rewards'] = 'Zeige Drachenwächtermanuskriptbelohnungen' L['options_manuscript_rewards_desc'] = 'Zeige Drachenwächtermanuskriptbelohnungen in Tooltips an und verfolge ihren Sammlungsstatus.' L['options_mount_rewards'] = 'Zeige Reittierbelohnungen' diff --git a/core/localization/enUS.lua b/core/localization/enUS.lua index 1e59e1745..6cf08fb26 100644 --- a/core/localization/enUS.lua +++ b/core/localization/enUS.lua @@ -186,6 +186,8 @@ L['options_restore_hidden_nodes_desc'] = 'Restore all nodes hidden using the rig L['options_rewards_settings'] = 'Rewards' L['options_reward_types'] = 'Show reward types' +L['options_achievements_rewards'] = 'Show Achievement rewards' +L['options_achievements_rewards_desc'] = 'Display achievement rewards in tooltips and track their collected status.' L['options_manuscript_rewards'] = 'Show drakewatcher manuscript rewards' L['options_manuscript_rewards_desc'] = 'Display drakewatcher manuscript rewards in tooltips and track their collected status.' L['options_mount_rewards'] = 'Show mount rewards' diff --git a/core/localization/esES.lua b/core/localization/esES.lua index bfea83273..61ed580a0 100644 --- a/core/localization/esES.lua +++ b/core/localization/esES.lua @@ -186,6 +186,8 @@ L['options_restore_hidden_nodes_desc'] = 'Vuelve a mostrar todos los nodos ocult L['options_rewards_settings'] = 'Recompensas' L['options_reward_types'] = 'Mostrar tipos de recompensas' +L['options_achievements_rewards'] = nil +L['options_achievements_rewards_desc'] = nil L['options_manuscript_rewards'] = 'Mostrar las recompensas de los manuscritos de dracovigía' L['options_manuscript_rewards_desc'] = 'Muestra las recompensas de los manuscritos de dracovigía en los tooltips y sigue si ya lo has coleccionado.' L['options_mount_rewards'] = 'Mostrar recompensas de monturas' diff --git a/core/localization/esMX.lua b/core/localization/esMX.lua index 1fed50fc4..0cbff9061 100644 --- a/core/localization/esMX.lua +++ b/core/localization/esMX.lua @@ -186,6 +186,8 @@ L['options_restore_hidden_nodes_desc'] = nil L['options_rewards_settings'] = nil L['options_reward_types'] = nil +L['options_achievements_rewards'] = nil +L['options_achievements_rewards_desc'] = nil L['options_manuscript_rewards'] = nil L['options_manuscript_rewards_desc'] = nil L['options_mount_rewards'] = nil diff --git a/core/localization/frFR.lua b/core/localization/frFR.lua index 020bac757..190bc42a4 100644 --- a/core/localization/frFR.lua +++ b/core/localization/frFR.lua @@ -186,6 +186,8 @@ L['options_restore_hidden_nodes_desc'] = 'Restaure tous les nœuds cachés en ut L['options_rewards_settings'] = 'Récompenses' L['options_reward_types'] = 'Afficher les types de récompenses' +L['options_achievements_rewards'] = nil +L['options_achievements_rewards_desc'] = nil L['options_manuscript_rewards'] = 'Montrer les Manuscrits guette-drake en récompenses' L['options_manuscript_rewards_desc'] = 'Afficher les Manuscrits guette-drake en récompenses dans les infobulles et suivre l\'état de leur acquisition.' L['options_mount_rewards'] = 'Afficher les montures en récompense' diff --git a/core/localization/koKR.lua b/core/localization/koKR.lua index 2371f0bbe..cdc607d0f 100644 --- a/core/localization/koKR.lua +++ b/core/localization/koKR.lua @@ -186,6 +186,8 @@ L['options_restore_hidden_nodes_desc'] = '우클릭 메뉴에서 숨긴 지점 L['options_rewards_settings'] = '보상' L['options_reward_types'] = '보상 종류 표시' +L['options_achievements_rewards'] = nil +L['options_achievements_rewards_desc'] = nil L['options_manuscript_rewards'] = nil L['options_manuscript_rewards_desc'] = nil L['options_mount_rewards'] = '탈것 보상 표시' diff --git a/core/localization/ruRU.lua b/core/localization/ruRU.lua index 15fe22c03..6d9805ddd 100644 --- a/core/localization/ruRU.lua +++ b/core/localization/ruRU.lua @@ -186,6 +186,8 @@ L['options_restore_hidden_nodes_desc'] = 'Восстановите все скр L['options_rewards_settings'] = 'Награды' L['options_reward_types'] = 'Показать типы наград' +L['options_achievements_rewards'] = nil +L['options_achievements_rewards_desc'] = nil L['options_manuscript_rewards'] = nil L['options_manuscript_rewards_desc'] = nil L['options_mount_rewards'] = 'Показать маунтов' diff --git a/core/localization/zhCN.lua b/core/localization/zhCN.lua index 72c7fd51e..3573c5e4e 100644 --- a/core/localization/zhCN.lua +++ b/core/localization/zhCN.lua @@ -186,6 +186,8 @@ L['options_restore_hidden_nodes_desc'] = '使用右击菜单恢复全部隐藏 L['options_rewards_settings'] = '奖励' L['options_reward_types'] = '显示奖励类型' +L['options_achievements_rewards'] = nil +L['options_achievements_rewards_desc'] = nil L['options_manuscript_rewards'] = '显示观龙者手稿奖励' L['options_manuscript_rewards_desc'] = '在提示中显示龙观察者手稿奖励并跟踪其收集状态。' L['options_mount_rewards'] = '显示坐骑奖励' diff --git a/core/localization/zhTW.lua b/core/localization/zhTW.lua index 60be8105c..a9f98cb4d 100644 --- a/core/localization/zhTW.lua +++ b/core/localization/zhTW.lua @@ -186,6 +186,8 @@ L['options_restore_hidden_nodes_desc'] = '恢復所有使用右鍵選單隱藏 L['options_rewards_settings'] = '獎勵' L['options_reward_types'] = '顯示獎勵類型' +L['options_achievements_rewards'] = nil +L['options_achievements_rewards_desc'] = nil L['options_manuscript_rewards'] = nil L['options_manuscript_rewards_desc'] = nil L['options_mount_rewards'] = '顯示坐騎獎勵' diff --git a/core/options.lua b/core/options.lua index 14dcfe573..54f7c6173 100644 --- a/core/options.lua +++ b/core/options.lua @@ -133,6 +133,14 @@ ns.options = { name = L['options_rewards_settings'], order = 10 }, + show_achievement_rewards = { + type = 'toggle', + arg = 'show_achievement_rewards', + name = L['options_achievement_rewards'], + desc = L['options_achievement_rewards_desc'], + order = 11, + width = 'full' + }, show_manuscript_rewards = { type = 'toggle', arg = 'show_manuscript_rewards', diff --git a/core/rewards.lua b/core/rewards.lua index e67d2e136..46cb12ec3 100644 --- a/core/rewards.lua +++ b/core/rewards.lua @@ -107,7 +107,7 @@ function Spacer:Render(tooltip) tooltip:AddLine(' ') end --------------------------------- ACHIEVEMENT --------------------------------- ------------------------------------------------------------------------------- -local Achievement = Class('Achievement', Reward) +local Achievement = Class('Achievement', Reward, {display_option = 'show_achievements_rewards'}) local GetCriteriaInfo = function(id, criteria) local results = {GetAchievementCriteriaInfoByID(id, criteria)} diff --git a/core/templates.lua b/core/templates.lua index 9d91c6521..a46ced3f6 100644 --- a/core/templates.lua +++ b/core/templates.lua @@ -241,6 +241,18 @@ function WorldMapOptionsButtonMixin:InitializeDropDown(level) }) elseif level == 2 then if L_UIDROPDOWNMENU_MENU_VALUE == 'achievements' then + if not ns:GetOpt('show_achievements_rewards') then + LibDD:UIDropDownMenu_AddButton({ + text = 'Achievement Reward Tracking is off, therefore most Nodes will be hidden!\n', + isNotRadio = true, + notCheckable = true, + notClickable = true, + keepShownOnClick = true, + -- hasArrow = true, + -- value = 'rewards' + },level) + LibDD:UIDropDownMenu_AddSeparator(level) + end for i, group in ipairs(map.groups) do if group.type == ns.group_types.ACHIEVEMENT and group:IsEnabled() and group:HasEnabledNodes(map) then @@ -249,7 +261,7 @@ function WorldMapOptionsButtonMixin:InitializeDropDown(level) end elseif L_UIDROPDOWNMENU_MENU_VALUE == 'rewards' then for i, type in ipairs({ - 'manuscript', 'mount', 'pet', 'recipe', 'toy', 'transmog', + 'achievements', 'manuscript', 'mount', 'pet', 'recipe', 'toy', 'transmog', 'all_transmog' }) do LibDD:UIDropDownMenu_AddButton({ From 7e6d2c98915d250599e6a54afeedac6180bc19a4 Mon Sep 17 00:00:00 2001 From: Krovikan Date: Sat, 3 Aug 2024 11:09:03 +0200 Subject: [PATCH 2/7] Updated achievements_rewards Core esES --- core/localization/esES.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/localization/esES.lua b/core/localization/esES.lua index 61ed580a0..5cb237fab 100644 --- a/core/localization/esES.lua +++ b/core/localization/esES.lua @@ -186,8 +186,8 @@ L['options_restore_hidden_nodes_desc'] = 'Vuelve a mostrar todos los nodos ocult L['options_rewards_settings'] = 'Recompensas' L['options_reward_types'] = 'Mostrar tipos de recompensas' -L['options_achievements_rewards'] = nil -L['options_achievements_rewards_desc'] = nil +L['options_achievements_rewards'] = 'Mostrar recompensas de logros' +L['options_achievements_rewards_desc'] = 'Muestra las recompensas de logros en las notas y rastrea el estado de si ha sido conseguida.' L['options_manuscript_rewards'] = 'Mostrar las recompensas de los manuscritos de dracovigía' L['options_manuscript_rewards_desc'] = 'Muestra las recompensas de los manuscritos de dracovigía en los tooltips y sigue si ya lo has coleccionado.' L['options_mount_rewards'] = 'Mostrar recompensas de monturas' From 4d0b34b4fd7f6ae3307a29f0383cf86a58eb8346 Mon Sep 17 00:00:00 2001 From: Ioney Date: Mon, 26 Aug 2024 21:55:29 +0200 Subject: [PATCH 3/7] fix naming --- core/localization/deDE.lua | 4 ++-- core/localization/enUS.lua | 4 ++-- core/localization/esES.lua | 4 ++-- core/localization/esMX.lua | 4 ++-- core/localization/frFR.lua | 4 ++-- core/localization/koKR.lua | 4 ++-- core/localization/ruRU.lua | 4 ++-- core/localization/zhCN.lua | 4 ++-- core/localization/zhTW.lua | 4 ++-- core/rewards.lua | 2 +- core/templates.lua | 10 +++++----- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/core/localization/deDE.lua b/core/localization/deDE.lua index c018289b6..f9947494f 100644 --- a/core/localization/deDE.lua +++ b/core/localization/deDE.lua @@ -186,8 +186,8 @@ L['options_restore_hidden_nodes_desc'] = 'Stellt alle Punkte wieder her, die üb L['options_rewards_settings'] = 'Belohnungen' L['options_reward_types'] = 'Zeige Belohnungstypen' -L['options_achievements_rewards'] = 'Zeige Erfolgsbelohnungen' -L['options_achievements_rewards_desc'] = 'Zeige Erfolgsbelohnungen in Tooltips an und verfolge ihren Sammlungsstatus.' +L['options_achievement_rewards'] = 'Zeige Erfolgsbelohnungen' +L['options_achievement_rewards_desc'] = 'Zeige Erfolgsbelohnungen in Tooltips an und verfolge ihren Sammlungsstatus.' L['options_manuscript_rewards'] = 'Zeige Drachenwächtermanuskriptbelohnungen' L['options_manuscript_rewards_desc'] = 'Zeige Drachenwächtermanuskriptbelohnungen in Tooltips an und verfolge ihren Sammlungsstatus.' L['options_mount_rewards'] = 'Zeige Reittierbelohnungen' diff --git a/core/localization/enUS.lua b/core/localization/enUS.lua index 6cf08fb26..6feee9a63 100644 --- a/core/localization/enUS.lua +++ b/core/localization/enUS.lua @@ -186,8 +186,8 @@ L['options_restore_hidden_nodes_desc'] = 'Restore all nodes hidden using the rig L['options_rewards_settings'] = 'Rewards' L['options_reward_types'] = 'Show reward types' -L['options_achievements_rewards'] = 'Show Achievement rewards' -L['options_achievements_rewards_desc'] = 'Display achievement rewards in tooltips and track their collected status.' +L['options_achievement_rewards'] = 'Show Achievement rewards' +L['options_achievement_rewards_desc'] = 'Display achievement rewards in tooltips and track their collected status.' L['options_manuscript_rewards'] = 'Show drakewatcher manuscript rewards' L['options_manuscript_rewards_desc'] = 'Display drakewatcher manuscript rewards in tooltips and track their collected status.' L['options_mount_rewards'] = 'Show mount rewards' diff --git a/core/localization/esES.lua b/core/localization/esES.lua index 5cb237fab..2c3365f7a 100644 --- a/core/localization/esES.lua +++ b/core/localization/esES.lua @@ -186,8 +186,8 @@ L['options_restore_hidden_nodes_desc'] = 'Vuelve a mostrar todos los nodos ocult L['options_rewards_settings'] = 'Recompensas' L['options_reward_types'] = 'Mostrar tipos de recompensas' -L['options_achievements_rewards'] = 'Mostrar recompensas de logros' -L['options_achievements_rewards_desc'] = 'Muestra las recompensas de logros en las notas y rastrea el estado de si ha sido conseguida.' +L['options_achievement_rewards'] = 'Mostrar recompensas de logros' +L['options_achievement_rewards_desc'] = 'Muestra las recompensas de logros en las notas y rastrea el estado de si ha sido conseguida.' L['options_manuscript_rewards'] = 'Mostrar las recompensas de los manuscritos de dracovigía' L['options_manuscript_rewards_desc'] = 'Muestra las recompensas de los manuscritos de dracovigía en los tooltips y sigue si ya lo has coleccionado.' L['options_mount_rewards'] = 'Mostrar recompensas de monturas' diff --git a/core/localization/esMX.lua b/core/localization/esMX.lua index 0cbff9061..bda5b6062 100644 --- a/core/localization/esMX.lua +++ b/core/localization/esMX.lua @@ -186,8 +186,8 @@ L['options_restore_hidden_nodes_desc'] = nil L['options_rewards_settings'] = nil L['options_reward_types'] = nil -L['options_achievements_rewards'] = nil -L['options_achievements_rewards_desc'] = nil +L['options_achievement_rewards'] = nil +L['options_achievement_rewards_desc'] = nil L['options_manuscript_rewards'] = nil L['options_manuscript_rewards_desc'] = nil L['options_mount_rewards'] = nil diff --git a/core/localization/frFR.lua b/core/localization/frFR.lua index 190bc42a4..6afb08b80 100644 --- a/core/localization/frFR.lua +++ b/core/localization/frFR.lua @@ -186,8 +186,8 @@ L['options_restore_hidden_nodes_desc'] = 'Restaure tous les nœuds cachés en ut L['options_rewards_settings'] = 'Récompenses' L['options_reward_types'] = 'Afficher les types de récompenses' -L['options_achievements_rewards'] = nil -L['options_achievements_rewards_desc'] = nil +L['options_achievement_rewards'] = nil +L['options_achievement_rewards_desc'] = nil L['options_manuscript_rewards'] = 'Montrer les Manuscrits guette-drake en récompenses' L['options_manuscript_rewards_desc'] = 'Afficher les Manuscrits guette-drake en récompenses dans les infobulles et suivre l\'état de leur acquisition.' L['options_mount_rewards'] = 'Afficher les montures en récompense' diff --git a/core/localization/koKR.lua b/core/localization/koKR.lua index cdc607d0f..7baa3c3b3 100644 --- a/core/localization/koKR.lua +++ b/core/localization/koKR.lua @@ -186,8 +186,8 @@ L['options_restore_hidden_nodes_desc'] = '우클릭 메뉴에서 숨긴 지점 L['options_rewards_settings'] = '보상' L['options_reward_types'] = '보상 종류 표시' -L['options_achievements_rewards'] = nil -L['options_achievements_rewards_desc'] = nil +L['options_achievement_rewards'] = nil +L['options_achievement_rewards_desc'] = nil L['options_manuscript_rewards'] = nil L['options_manuscript_rewards_desc'] = nil L['options_mount_rewards'] = '탈것 보상 표시' diff --git a/core/localization/ruRU.lua b/core/localization/ruRU.lua index 6d9805ddd..a1f250468 100644 --- a/core/localization/ruRU.lua +++ b/core/localization/ruRU.lua @@ -186,8 +186,8 @@ L['options_restore_hidden_nodes_desc'] = 'Восстановите все скр L['options_rewards_settings'] = 'Награды' L['options_reward_types'] = 'Показать типы наград' -L['options_achievements_rewards'] = nil -L['options_achievements_rewards_desc'] = nil +L['options_achievement_rewards'] = nil +L['options_achievement_rewards_desc'] = nil L['options_manuscript_rewards'] = nil L['options_manuscript_rewards_desc'] = nil L['options_mount_rewards'] = 'Показать маунтов' diff --git a/core/localization/zhCN.lua b/core/localization/zhCN.lua index 3573c5e4e..54748b4dc 100644 --- a/core/localization/zhCN.lua +++ b/core/localization/zhCN.lua @@ -186,8 +186,8 @@ L['options_restore_hidden_nodes_desc'] = '使用右击菜单恢复全部隐藏 L['options_rewards_settings'] = '奖励' L['options_reward_types'] = '显示奖励类型' -L['options_achievements_rewards'] = nil -L['options_achievements_rewards_desc'] = nil +L['options_achievement_rewards'] = nil +L['options_achievement_rewards_desc'] = nil L['options_manuscript_rewards'] = '显示观龙者手稿奖励' L['options_manuscript_rewards_desc'] = '在提示中显示龙观察者手稿奖励并跟踪其收集状态。' L['options_mount_rewards'] = '显示坐骑奖励' diff --git a/core/localization/zhTW.lua b/core/localization/zhTW.lua index a9f98cb4d..4387e2fcf 100644 --- a/core/localization/zhTW.lua +++ b/core/localization/zhTW.lua @@ -186,8 +186,8 @@ L['options_restore_hidden_nodes_desc'] = '恢復所有使用右鍵選單隱藏 L['options_rewards_settings'] = '獎勵' L['options_reward_types'] = '顯示獎勵類型' -L['options_achievements_rewards'] = nil -L['options_achievements_rewards_desc'] = nil +L['options_achievement_rewards'] = nil +L['options_achievement_rewards_desc'] = nil L['options_manuscript_rewards'] = nil L['options_manuscript_rewards_desc'] = nil L['options_mount_rewards'] = '顯示坐騎獎勵' diff --git a/core/rewards.lua b/core/rewards.lua index 46cb12ec3..1ac77608f 100644 --- a/core/rewards.lua +++ b/core/rewards.lua @@ -107,7 +107,7 @@ function Spacer:Render(tooltip) tooltip:AddLine(' ') end --------------------------------- ACHIEVEMENT --------------------------------- ------------------------------------------------------------------------------- -local Achievement = Class('Achievement', Reward, {display_option = 'show_achievements_rewards'}) +local Achievement = Class('Achievement', Reward, {display_option = 'show_achievement_rewards'}) local GetCriteriaInfo = function(id, criteria) local results = {GetAchievementCriteriaInfoByID(id, criteria)} diff --git a/core/templates.lua b/core/templates.lua index a46ced3f6..db78c8b32 100644 --- a/core/templates.lua +++ b/core/templates.lua @@ -161,7 +161,7 @@ function WorldMapOptionsButtonMixin:InitializeDropDown(level) if level == 1 then local current_group_type = nil - local achievements_menu_added = false + local achievement_menu_added = false for i, group in ipairs(map.groups) do -- Add a separator each time the group type changes @@ -172,7 +172,7 @@ function WorldMapOptionsButtonMixin:InitializeDropDown(level) if group:IsEnabled() and group:HasEnabledNodes(map) then if group.type == ns.group_types.ACHIEVEMENT and - not achievements_menu_added then + not achievement_menu_added then LibDD:UIDropDownMenu_AddButton({ text = ns.GetIconLink(236671, 12, 1, 0) .. ' ' .. ACHIEVEMENTS, @@ -182,7 +182,7 @@ function WorldMapOptionsButtonMixin:InitializeDropDown(level) hasArrow = true, value = 'achievements' }) - achievements_menu_added = true + achievement_menu_added = true elseif group.type ~= ns.group_types.ACHIEVEMENT then self:AddGroupButton(group, 1) end @@ -241,7 +241,7 @@ function WorldMapOptionsButtonMixin:InitializeDropDown(level) }) elseif level == 2 then if L_UIDROPDOWNMENU_MENU_VALUE == 'achievements' then - if not ns:GetOpt('show_achievements_rewards') then + if not ns:GetOpt('show_achievement_rewards') then LibDD:UIDropDownMenu_AddButton({ text = 'Achievement Reward Tracking is off, therefore most Nodes will be hidden!\n', isNotRadio = true, @@ -261,7 +261,7 @@ function WorldMapOptionsButtonMixin:InitializeDropDown(level) end elseif L_UIDROPDOWNMENU_MENU_VALUE == 'rewards' then for i, type in ipairs({ - 'achievements', 'manuscript', 'mount', 'pet', 'recipe', 'toy', 'transmog', + 'achievement', 'manuscript', 'mount', 'pet', 'recipe', 'toy', 'transmog', 'all_transmog' }) do LibDD:UIDropDownMenu_AddButton({ From 6e8ab6c3f25aa8e738a626b1ad3a3fb2685d63f0 Mon Sep 17 00:00:00 2001 From: Ioney Date: Mon, 26 Aug 2024 21:58:32 +0200 Subject: [PATCH 4/7] fixes lint format error --- core/rewards.lua | 3 ++- core/templates.lua | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/rewards.lua b/core/rewards.lua index 1ac77608f..3076b9715 100644 --- a/core/rewards.lua +++ b/core/rewards.lua @@ -107,7 +107,8 @@ function Spacer:Render(tooltip) tooltip:AddLine(' ') end --------------------------------- ACHIEVEMENT --------------------------------- ------------------------------------------------------------------------------- -local Achievement = Class('Achievement', Reward, {display_option = 'show_achievement_rewards'}) +local Achievement = Class('Achievement', Reward, + {display_option = 'show_achievement_rewards'}) local GetCriteriaInfo = function(id, criteria) local results = {GetAchievementCriteriaInfoByID(id, criteria)} diff --git a/core/templates.lua b/core/templates.lua index db78c8b32..1cd2d4cba 100644 --- a/core/templates.lua +++ b/core/templates.lua @@ -247,10 +247,10 @@ function WorldMapOptionsButtonMixin:InitializeDropDown(level) isNotRadio = true, notCheckable = true, notClickable = true, - keepShownOnClick = true, + keepShownOnClick = true -- hasArrow = true, -- value = 'rewards' - },level) + }, level) LibDD:UIDropDownMenu_AddSeparator(level) end for i, group in ipairs(map.groups) do @@ -261,8 +261,8 @@ function WorldMapOptionsButtonMixin:InitializeDropDown(level) end elseif L_UIDROPDOWNMENU_MENU_VALUE == 'rewards' then for i, type in ipairs({ - 'achievement', 'manuscript', 'mount', 'pet', 'recipe', 'toy', 'transmog', - 'all_transmog' + 'achievement', 'manuscript', 'mount', 'pet', 'recipe', 'toy', + 'transmog', 'all_transmog' }) do LibDD:UIDropDownMenu_AddButton({ text = L['options_' .. type .. '_rewards'], From c60cf6f1a64a61f7751c610c2c5e383e8d8e1aa4 Mon Sep 17 00:00:00 2001 From: Ioney Date: Mon, 26 Aug 2024 22:27:42 +0200 Subject: [PATCH 5/7] add locale entry for achievement note --- core/localization/deDE.lua | 2 ++ core/localization/enUS.lua | 2 ++ core/localization/esES.lua | 2 ++ core/localization/esMX.lua | 2 ++ core/localization/frFR.lua | 2 ++ core/localization/koKR.lua | 2 ++ core/localization/ruRU.lua | 2 ++ core/localization/zhCN.lua | 2 ++ core/localization/zhTW.lua | 2 ++ core/templates.lua | 2 +- 10 files changed, 19 insertions(+), 1 deletion(-) diff --git a/core/localization/deDE.lua b/core/localization/deDE.lua index f9947494f..9ff11b632 100644 --- a/core/localization/deDE.lua +++ b/core/localization/deDE.lua @@ -154,6 +154,8 @@ L['options_open_settings_panel'] = 'Einstellungsmenü öffnen ...' L['options_open_world_map'] = 'Weltkarte öffnen' L['options_open_world_map_desc'] = 'Öffnet diese Zone auf der Weltkarte.' +L['achievement_rewards_off_note'] = 'Erfolgsbelohnungen werden nicht angezeigt, die meisten Punkte sind deshalb versteckt.\n' -- @Dathwada please review + ------------------------------------ ICONS ------------------------------------ L['options_icon_settings'] = 'Symboleinstellungen' diff --git a/core/localization/enUS.lua b/core/localization/enUS.lua index 6feee9a63..43a4a34b0 100644 --- a/core/localization/enUS.lua +++ b/core/localization/enUS.lua @@ -154,6 +154,8 @@ L['options_open_settings_panel'] = 'Open Settings Panel ...' L['options_open_world_map'] = 'Open World Map' L['options_open_world_map_desc'] = 'Open this zone in the world map.' +L['achievement_rewards_off_note'] = 'Achievement Reward Tracking is off, therefore most Nodes will be hidden!\n' + ------------------------------------ ICONS ------------------------------------ L['options_icon_settings'] = 'Icon Settings' diff --git a/core/localization/esES.lua b/core/localization/esES.lua index 2c3365f7a..a3f204706 100644 --- a/core/localization/esES.lua +++ b/core/localization/esES.lua @@ -154,6 +154,8 @@ L['options_open_settings_panel'] = 'Abrir el Panel de Preferencias...' L['options_open_world_map'] = 'Abrir el Mapa del Mundo' L['options_open_world_map_desc'] = 'Abre esta zona en el mapa del mundo.' +L['achievement_rewards_off_note'] = nil + ------------------------------------ ICONS ------------------------------------ L['options_icon_settings'] = 'Configuración de Iconos' diff --git a/core/localization/esMX.lua b/core/localization/esMX.lua index bda5b6062..1dc42fbda 100644 --- a/core/localization/esMX.lua +++ b/core/localization/esMX.lua @@ -154,6 +154,8 @@ L['options_open_settings_panel'] = nil L['options_open_world_map'] = nil L['options_open_world_map_desc'] = nil +L['achievement_rewards_off_note'] = nil + ------------------------------------ ICONS ------------------------------------ L['options_icon_settings'] = 'Configuración de Íconos' diff --git a/core/localization/frFR.lua b/core/localization/frFR.lua index 6afb08b80..da53ac7a0 100644 --- a/core/localization/frFR.lua +++ b/core/localization/frFR.lua @@ -154,6 +154,8 @@ L['options_open_settings_panel'] = 'Ouvrir le panneau de configuration' L['options_open_world_map'] = 'Ouvrir la carte du monde' L['options_open_world_map_desc'] = 'Ouvrir cette zone dans la carte du monde' -- Need review +L['achievement_rewards_off_note'] = nil + ------------------------------------ ICONS ------------------------------------ L['options_icon_settings'] = 'Paramètres des Icônes' diff --git a/core/localization/koKR.lua b/core/localization/koKR.lua index 7baa3c3b3..a519ff553 100644 --- a/core/localization/koKR.lua +++ b/core/localization/koKR.lua @@ -154,6 +154,8 @@ L['options_open_settings_panel'] = '설정창 열기' L['options_open_world_map'] = '세계지도 열기' L['options_open_world_map_desc'] = '세계지도에서 이 지역을 엽니다.' +L['achievement_rewards_off_note'] = nil + ------------------------------------ ICONS ------------------------------------ L['options_icon_settings'] = '아이콘 설정' diff --git a/core/localization/ruRU.lua b/core/localization/ruRU.lua index a1f250468..2fdbfe522 100644 --- a/core/localization/ruRU.lua +++ b/core/localization/ruRU.lua @@ -154,6 +154,8 @@ L['options_open_settings_panel'] = 'Открыть панель настроек L['options_open_world_map'] = 'Карта открытого мира' L['options_open_world_map_desc'] = 'Открыть эту локацию на карте мира.' +L['achievement_rewards_off_note'] = nil + ------------------------------------ ICONS ------------------------------------ L['options_icon_settings'] = 'Настройки значков' diff --git a/core/localization/zhCN.lua b/core/localization/zhCN.lua index 54748b4dc..d4b6bca35 100644 --- a/core/localization/zhCN.lua +++ b/core/localization/zhCN.lua @@ -154,6 +154,8 @@ L['options_open_settings_panel'] = '打开设置面板…' L['options_open_world_map'] = '打开世界地图' L['options_open_world_map_desc'] = '打开此区域世界地图。' +L['achievement_rewards_off_note'] = nil + ------------------------------------ ICONS ------------------------------------ L['options_icon_settings'] = '图标设置' diff --git a/core/localization/zhTW.lua b/core/localization/zhTW.lua index 4387e2fcf..3cfed0d35 100644 --- a/core/localization/zhTW.lua +++ b/core/localization/zhTW.lua @@ -154,6 +154,8 @@ L['options_open_settings_panel'] = '打開設定面板…' L['options_open_world_map'] = '打開世界地圖' L['options_open_world_map_desc'] = '在世界地圖中開啟此區域' +L['achievement_rewards_off_note'] = nil + ------------------------------------ ICONS ------------------------------------ L['options_icon_settings'] = '圖示設定' diff --git a/core/templates.lua b/core/templates.lua index 1cd2d4cba..17c0ad455 100644 --- a/core/templates.lua +++ b/core/templates.lua @@ -243,7 +243,7 @@ function WorldMapOptionsButtonMixin:InitializeDropDown(level) if L_UIDROPDOWNMENU_MENU_VALUE == 'achievements' then if not ns:GetOpt('show_achievement_rewards') then LibDD:UIDropDownMenu_AddButton({ - text = 'Achievement Reward Tracking is off, therefore most Nodes will be hidden!\n', + text = L['achievement_rewards_off_note'], isNotRadio = true, notCheckable = true, notClickable = true, From 4ebb853de5c10681026b3514c674c901b1b8232e Mon Sep 17 00:00:00 2001 From: Krovikan Date: Mon, 26 Aug 2024 22:45:30 +0200 Subject: [PATCH 6/7] Updated Core Rewards esES --- core/localization/esES.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/localization/esES.lua b/core/localization/esES.lua index a3f204706..d6b65a439 100644 --- a/core/localization/esES.lua +++ b/core/localization/esES.lua @@ -154,7 +154,7 @@ L['options_open_settings_panel'] = 'Abrir el Panel de Preferencias...' L['options_open_world_map'] = 'Abrir el Mapa del Mundo' L['options_open_world_map_desc'] = 'Abre esta zona en el mapa del mundo.' -L['achievement_rewards_off_note'] = nil +L['achievement_rewards_off_note'] = 'El Seguimiento de Recompensas para Logros está desactivado, por lo tanto, ¡la mayoría de los nodos estarán ocultos!\n' ------------------------------------ ICONS ------------------------------------ From fc645e70bde74f710337779c3a88ced9151d4907 Mon Sep 17 00:00:00 2001 From: Lightuky <47103897+Lightuky@users.noreply.github.com> Date: Mon, 26 Aug 2024 22:53:43 +0200 Subject: [PATCH 7/7] Update frFR.lua - achievement_rewards - Core --- core/localization/frFR.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/localization/frFR.lua b/core/localization/frFR.lua index da53ac7a0..335c52ed0 100644 --- a/core/localization/frFR.lua +++ b/core/localization/frFR.lua @@ -154,7 +154,7 @@ L['options_open_settings_panel'] = 'Ouvrir le panneau de configuration' L['options_open_world_map'] = 'Ouvrir la carte du monde' L['options_open_world_map_desc'] = 'Ouvrir cette zone dans la carte du monde' -- Need review -L['achievement_rewards_off_note'] = nil +L['achievement_rewards_off_note'] = 'Le suivi des récompenses de haut-faits est désactivé, par conséquent, la plupart des éléments seront cachés !\n' ------------------------------------ ICONS ------------------------------------ @@ -188,8 +188,8 @@ L['options_restore_hidden_nodes_desc'] = 'Restaure tous les nœuds cachés en ut L['options_rewards_settings'] = 'Récompenses' L['options_reward_types'] = 'Afficher les types de récompenses' -L['options_achievement_rewards'] = nil -L['options_achievement_rewards_desc'] = nil +L['options_achievement_rewards'] = 'Afficher les récompenses des haut-faits' +L['options_achievement_rewards_desc'] = 'Afficher les récompenses des haut-faits dans les infobulles et suivre l\'état de leur acquisition.' L['options_manuscript_rewards'] = 'Montrer les Manuscrits guette-drake en récompenses' L['options_manuscript_rewards_desc'] = 'Afficher les Manuscrits guette-drake en récompenses dans les infobulles et suivre l\'état de leur acquisition.' L['options_mount_rewards'] = 'Afficher les montures en récompense'