From 2d0f5685df2f732518dd24c90ebf77b53bb4d7a1 Mon Sep 17 00:00:00 2001 From: Denis Kamenskikh Date: Sun, 2 Feb 2020 14:12:32 +0300 Subject: [PATCH 1/2] Find pet owner using correct player name declension for ruRU locale. --- classes/container_combatentes.lua | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/classes/container_combatentes.lua b/classes/container_combatentes.lua index 23f27041..737ba4e7 100644 --- a/classes/container_combatentes.lua +++ b/classes/container_combatentes.lua @@ -395,6 +395,25 @@ end end + --> check pet owner name with correct declension for ruRU locale + local find_name_declension = function (petTooltip, playerName) + if (GetLocale() ~= "ruRU") then + return petTooltip:find(playerName) + end + + for gender = 1, 2 do + for declensionSet = 1, GetNumDeclensionSets(playerName, gender) do + --> check genitive case of player name + local genitive = DeclineName(playerName, gender, declensionSet) + if petTooltip:find(genitive) then + return true + end + end + end + + return false + end + local find_pet_owner = function (serial, nome, flag, self) if (not _detalhes.tabela_vigente) then return @@ -409,7 +428,7 @@ for playerName, _ in _pairs (_detalhes.tabela_vigente.raid_roster) do local pName = playerName playerName = playerName:gsub ("%-.*", "") --remove realm name - if (text1:find (playerName)) then + if (find_name_declension(text1, playerName)) then return find_pet_found_owner (pName, serial, nome, flag, self) end end @@ -421,7 +440,7 @@ for playerName, _ in _pairs (_detalhes.tabela_vigente.raid_roster) do local pName = playerName playerName = playerName:gsub ("%-.*", "") --remove realm name - if (text2:find (playerName)) then + if (find_name_declension(text2, playerName)) then return find_pet_found_owner (pName, serial, nome, flag, self) end end From 238a4de40f30d7da069df87d6e941350d8c96070 Mon Sep 17 00:00:00 2001 From: Denis Kamenskikh Date: Sun, 2 Feb 2020 15:47:31 +0300 Subject: [PATCH 2/2] Fix gender constants. --- classes/container_combatentes.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/container_combatentes.lua b/classes/container_combatentes.lua index 737ba4e7..951022e5 100644 --- a/classes/container_combatentes.lua +++ b/classes/container_combatentes.lua @@ -401,7 +401,8 @@ return petTooltip:find(playerName) end - for gender = 1, 2 do + --> 2 - male, 3 - female + for gender = 2, 3 do for declensionSet = 1, GetNumDeclensionSets(playerName, gender) do --> check genitive case of player name local genitive = DeclineName(playerName, gender, declensionSet)