Skip to content

Commit

Permalink
9.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@sirinsidiator
sirinsidiator committed May 15, 2023
1 parent 95d9642 commit 3033f31
Show file tree
Hide file tree
Showing 27 changed files with 320 additions and 244 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -6,7 +6,7 @@ If you're a Zenimax Media Inc. representative and have any objection to any of t

This repo is also available at http://www.esoui.com/downloads/info1213-ESOUI-TheElderScrollsOnlinesourcecode.html

**Last update: 9.0.3 (API 101038) on 08 May 2023.**
**Last update: 9.0.4 (API 101038) on 15 May 2023.**

*Join ESOUI Dev Community on Gitter :*

Expand Down
5 changes: 4 additions & 1 deletion esoui/ingame/crafting/keyboard/provisioner.lua
View file
Expand Up @@ -510,7 +510,10 @@ function ZO_Provisioner:RefreshRecipeList()
end

function ZO_Provisioner:GetRecipeData()
return self.recipeTree:GetSelectedData()
if self.filterType ~= PROVISIONER_SPECIAL_INGREDIENT_TYPE_FILLET then
return self.recipeTree:GetSelectedData()
end
return nil
end

function ZO_Provisioner:GetSelectedRecipeListIndex()
Expand Down
13 changes: 8 additions & 5 deletions esoui/ingamelocalization/localizegeneratedstrings.lua
View file
Expand Up @@ -1097,7 +1097,7 @@ EsoStrings =
"http://www.elderscrollsonline.com/link", -- SI_APPROVEDURLTYPESTEAM6
"http://www.elderscrollsonline.com", -- SI_APPROVEDURLTYPEEPIC0
"https://account.elderscrollsonline.com", -- SI_APPROVEDURLTYPEEPIC1
"com.epicgames.launcher://store/product/fortnite", -- SI_APPROVEDURLTYPEEPIC2
"com.epicgames.launcher://store/all-dlc/elder-scrolls-online", -- SI_APPROVEDURLTYPEEPIC2
"https://account.elderscrollsonline.com/store/product/eso_plus?utm_source=ESO%20In-Game&utm_campaign=ESO%20Plus", -- SI_APPROVEDURLTYPEEPIC3
"https://help.elderscrollsonline.com", -- SI_APPROVEDURLTYPEEPIC4
"http://forums.elderscrollsonline.com", -- SI_APPROVEDURLTYPEEPIC5
Expand Down Expand Up @@ -3649,7 +3649,7 @@ EsoStrings =
"Unable to create account because screen name contains inappropriate language.", -- SI_ACCOUNTCREATELINKERROR12040
"Incorrect User ID or Password.", -- SI_ACCOUNTCREATELINKERROR12100
"That account has been deactivated. Please contact customer service at <<1>> or link to a different account.", -- SI_ACCOUNTCREATELINKERROR12101
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process.", -- SI_ACCOUNTCREATELINKERROR12102
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process. If you do not receive an email, contact customer service at <<1>>.", -- SI_ACCOUNTCREATELINKERROR12102
"That account has been permanently banned. Contact customer service at <<1>> for more information or link to a different account.", -- SI_ACCOUNTCREATELINKERROR12104
"Connection to server timed out. Please try again later.", -- SI_LOGINAUTHERROR2
"Unable to connect to the PlayStation™Network. Please confirm you are connected to the PlayStation™Network or try again later.", -- SI_LOGINAUTHERROR3
Expand All @@ -3659,11 +3659,11 @@ EsoStrings =
"The servers are temporarily down for maintenance. Please try again later.", -- SI_LOGINAUTHERROR3000
"Your account has been suspended. Contact customer service at <<1>> for more information.", -- SI_LOGINAUTHERROR8004
"Your account has been permanently banned. Contact customer service at <<1>> for more information.", -- SI_LOGINAUTHERROR8005
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process.", -- SI_LOGINAUTHERROR8007
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process. If you do not receive an email, contact customer service at <<1>>.", -- SI_LOGINAUTHERROR8007
"Game account not found", -- SI_LOGINAUTHERROR8008
"Your account has been suspended. Contact customer service at <<1>> for more information.", -- SI_LOGINAUTHERROR8009
"Your account has been permanently banned. Contact customer service at <<1>> for more information.", -- SI_LOGINAUTHERROR8010
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process.", -- SI_LOGINAUTHERROR8011
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process. If you do not receive an email, contact customer service at <<1>>.", -- SI_LOGINAUTHERROR8011
"Your account has restricted authentication. Please contact customer service at <<1>>.", -- SI_LOGINAUTHERROR8012
"The servers are temporarily down for maintenance. Please try again later.", -- SI_LOGINAUTHERROR8013
"Could not connect to the Xbox network", -- SI_LOGINAUTHERROR13000
Expand Down Expand Up @@ -21475,7 +21475,7 @@ SafeAddVersion(SI_EMOTECATEGORY8, 1)
SafeAddVersion(SI_APPROVEDURLTYPE2, 1)
SafeAddVersion(SI_APPROVEDURLTYPE3, 1)
SafeAddVersion(SI_APPROVEDURLTYPESTEAM2, 1)
SafeAddVersion(SI_APPROVEDURLTYPEEPIC2, 2)
SafeAddVersion(SI_APPROVEDURLTYPEEPIC2, 3)
SafeAddVersion(SI_APPROVEDURLTYPEEPIC3, 1)
SafeAddVersion(SI_PLATFORMSTORELABEL1, 1)
SafeAddVersion(SI_PLATFORMSTORELABEL2, 1)
Expand Down Expand Up @@ -21940,8 +21940,11 @@ SafeAddVersion(SI_STOREFAILURE4, 1)
SafeAddVersion(SI_STOREFAILURE8, 1)
SafeAddVersion(SI_STOREFAILURE19, 1)
SafeAddVersion(SI_ACCOUNTCREATELINKERROR12004, 1)
SafeAddVersion(SI_ACCOUNTCREATELINKERROR12102, 1)
SafeAddVersion(SI_LOGINAUTHERROR3, 2)
SafeAddVersion(SI_LOGINAUTHERROR4, 2)
SafeAddVersion(SI_LOGINAUTHERROR8007, 1)
SafeAddVersion(SI_LOGINAUTHERROR8011, 1)
SafeAddVersion(SI_LOGINAUTHERROR13000, 2)
SafeAddVersion(SI_LOGINAUTHERROR13002, 1)
SafeAddVersion(SI_LOGINAUTHERROR13003, 1)
Expand Down
28 changes: 15 additions & 13 deletions esoui/internalingame/globals/marketdialogs.lua
View file
Expand Up @@ -2,21 +2,17 @@ local MIN_PURCHASE_QUANTITY = 1

local function LogPurchaseClose(dialog)
if dialog.data then
if not dialog.data.dontLogClose then
if dialog.data.logPurchasedMarketId then
OnMarketEndPurchase(dialog.data.marketProductData:GetId())
else
OnMarketEndPurchase()
end
if dialog.data.logPurchasedMarketId then
OnMarketEndPurchase(dialog.data.marketProductData:GetId())
else
OnMarketEndPurchase()
end
dialog.data.dontLogClose = false
dialog.data.logPurchasedMarketId = false
end
end

ESO_Dialogs["MARKET_CROWN_STORE_PURCHASE_ERROR_CONTINUE"] =
{
finishedCallback = LogPurchaseClose,
canQueue = true,
title =
{
Expand All @@ -30,18 +26,19 @@ ESO_Dialogs["MARKET_CROWN_STORE_PURCHASE_ERROR_CONTINUE"] =
{
{
text = SI_MARKET_PURCHASE_ERROR_CONTINUE,
callback = function(dialog)
dialog.data.dontLogClose = true
-- the MARKET_PURCHASE_CONFIRMATION dialog will be queued to show once this one is hidden
ZO_Dialogs_ShowDialog("MARKET_PURCHASE_CONFIRMATION", dialog.data)
end,
keybind = "DIALOG_PRIMARY",
callback =function(dialog)
-- the MARKET_PURCHASE_CONFIRMATION dialog will be queued to show once this one is hidden
ZO_Dialogs_ShowDialog("MARKET_PURCHASE_CONFIRMATION", dialog.data)
end,
},
{
text = SI_DIALOG_EXIT,
keybind = "DIALOG_NEGATIVE",
callback = LogPurchaseClose,
},
},
noChoiceCallback = LogPurchaseClose,
}

ESO_Dialogs["MARKET_CROWN_STORE_PURCHASE_ERROR_PURCHASE_CROWNS"] =
Expand Down Expand Up @@ -1196,6 +1193,9 @@ function ZO_MarketPurchasingDialog_OnInitialized(self)
control = self:GetNamedChild("UseProduct"),
keybind = "DIALOG_RESET",
callback = function(dialog)
dialog.data.logPurchasedMarketId = true
LogPurchaseClose(dialog)

ZO_Market_Shared.GoToUseProductLocation(dialog.data.marketProductData)
end,
},
Expand All @@ -1216,6 +1216,8 @@ function ZO_MarketPurchasingDialog_OnInitialized(self)
ZO_Dialogs_ShowDialog("MARKET_PURCHASE_CONFIRMATION", restartData)
return
end

data.logPurchasedMarketId = true
LogPurchaseClose(dialog)
if data.wasGift == false then
local activeMarket = ZO_MARKET_MANAGER:GetActiveMarket()
Expand Down
13 changes: 8 additions & 5 deletions esoui/internalingamelocalization/localizeinternalingamegeneratedstrings.lua
View file
Expand Up @@ -1097,7 +1097,7 @@ EsoStrings =
"http://www.elderscrollsonline.com/link", -- SI_APPROVEDURLTYPESTEAM6
"http://www.elderscrollsonline.com", -- SI_APPROVEDURLTYPEEPIC0
"https://account.elderscrollsonline.com", -- SI_APPROVEDURLTYPEEPIC1
"com.epicgames.launcher://store/product/fortnite", -- SI_APPROVEDURLTYPEEPIC2
"com.epicgames.launcher://store/all-dlc/elder-scrolls-online", -- SI_APPROVEDURLTYPEEPIC2
"https://account.elderscrollsonline.com/store/product/eso_plus?utm_source=ESO%20In-Game&utm_campaign=ESO%20Plus", -- SI_APPROVEDURLTYPEEPIC3
"https://help.elderscrollsonline.com", -- SI_APPROVEDURLTYPEEPIC4
"http://forums.elderscrollsonline.com", -- SI_APPROVEDURLTYPEEPIC5
Expand Down Expand Up @@ -3649,7 +3649,7 @@ EsoStrings =
"Unable to create account because screen name contains inappropriate language.", -- SI_ACCOUNTCREATELINKERROR12040
"Incorrect User ID or Password.", -- SI_ACCOUNTCREATELINKERROR12100
"That account has been deactivated. Please contact customer service at <<1>> or link to a different account.", -- SI_ACCOUNTCREATELINKERROR12101
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process.", -- SI_ACCOUNTCREATELINKERROR12102
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process. If you do not receive an email, contact customer service at <<1>>.", -- SI_ACCOUNTCREATELINKERROR12102
"That account has been permanently banned. Contact customer service at <<1>> for more information or link to a different account.", -- SI_ACCOUNTCREATELINKERROR12104
"Connection to server timed out. Please try again later.", -- SI_LOGINAUTHERROR2
"Unable to connect to the PlayStation™Network. Please confirm you are connected to the PlayStation™Network or try again later.", -- SI_LOGINAUTHERROR3
Expand All @@ -3659,11 +3659,11 @@ EsoStrings =
"The servers are temporarily down for maintenance. Please try again later.", -- SI_LOGINAUTHERROR3000
"Your account has been suspended. Contact customer service at <<1>> for more information.", -- SI_LOGINAUTHERROR8004
"Your account has been permanently banned. Contact customer service at <<1>> for more information.", -- SI_LOGINAUTHERROR8005
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process.", -- SI_LOGINAUTHERROR8007
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process. If you do not receive an email, contact customer service at <<1>>.", -- SI_LOGINAUTHERROR8007
"Game account not found", -- SI_LOGINAUTHERROR8008
"Your account has been suspended. Contact customer service at <<1>> for more information.", -- SI_LOGINAUTHERROR8009
"Your account has been permanently banned. Contact customer service at <<1>> for more information.", -- SI_LOGINAUTHERROR8010
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process.", -- SI_LOGINAUTHERROR8011
"Your account must be verified in order to continue to play. Check the email you used to create an ESO account for instruction on how to complete the verification process. If you do not receive an email, contact customer service at <<1>>.", -- SI_LOGINAUTHERROR8011
"Your account has restricted authentication. Please contact customer service at <<1>>.", -- SI_LOGINAUTHERROR8012
"The servers are temporarily down for maintenance. Please try again later.", -- SI_LOGINAUTHERROR8013
"Could not connect to the Xbox network", -- SI_LOGINAUTHERROR13000
Expand Down Expand Up @@ -10402,7 +10402,7 @@ SafeAddVersion(SI_EMOTECATEGORY8, 1)
SafeAddVersion(SI_APPROVEDURLTYPE2, 1)
SafeAddVersion(SI_APPROVEDURLTYPE3, 1)
SafeAddVersion(SI_APPROVEDURLTYPESTEAM2, 1)
SafeAddVersion(SI_APPROVEDURLTYPEEPIC2, 2)
SafeAddVersion(SI_APPROVEDURLTYPEEPIC2, 3)
SafeAddVersion(SI_APPROVEDURLTYPEEPIC3, 1)
SafeAddVersion(SI_PLATFORMSTORELABEL1, 1)
SafeAddVersion(SI_PLATFORMSTORELABEL2, 1)
Expand Down Expand Up @@ -10867,8 +10867,11 @@ SafeAddVersion(SI_STOREFAILURE4, 1)
SafeAddVersion(SI_STOREFAILURE8, 1)
SafeAddVersion(SI_STOREFAILURE19, 1)
SafeAddVersion(SI_ACCOUNTCREATELINKERROR12004, 1)
SafeAddVersion(SI_ACCOUNTCREATELINKERROR12102, 1)
SafeAddVersion(SI_LOGINAUTHERROR3, 2)
SafeAddVersion(SI_LOGINAUTHERROR4, 2)
SafeAddVersion(SI_LOGINAUTHERROR8007, 1)
SafeAddVersion(SI_LOGINAUTHERROR8011, 1)
SafeAddVersion(SI_LOGINAUTHERROR13000, 2)
SafeAddVersion(SI_LOGINAUTHERROR13002, 1)
SafeAddVersion(SI_LOGINAUTHERROR13003, 1)
Expand Down
8 changes: 4 additions & 4 deletions esoui/lang/de_client.lua
View file
Expand Up @@ -115,7 +115,7 @@ SafeAddString(SI_ACCOUNTCREATELINKERROR12039, "Diese UserID wird bereits für ei
SafeAddString(SI_ACCOUNTCREATELINKERROR12040, "Es ist nicht möglich, das Konto zu erstellen, da der Name unangebrachte Worte enthält.", 0)
SafeAddString(SI_ACCOUNTCREATELINKERROR12100, "UserID und/oder Passwort sind falsch.", 0)
SafeAddString(SI_ACCOUNTCREATELINKERROR12101, "Dieses Konto wurde deaktiviert. Bitte kontaktiert unseren Kundendienst unter <<1>> oder verknüpft ein anderes Konto.", 0)
SafeAddString(SI_ACCOUNTCREATELINKERROR12102, "Ihr müsst Euer Konto verifizieren, um weiterspielen zu können. Bitte prüft Euer E-Mail-Postfach, das Ihr für die Erstellung Eures ESO-Kontos verwendet habt, um weitere Anweisungen für den Verifikationsprozess zu erhalten.", 0)
SafeAddString(SI_ACCOUNTCREATELINKERROR12102, "Ihr müsst Euer Konto verifizieren, um weiterspielen zu können. Bitte prüft Euer E-Mail-Postfach, das Ihr für die Erstellung Eures ESO-Kontos verwendet habt, um weitere Anweisungen für den Verifikationsprozess zu erhalten. Falls Ihr keine E-Mail erhalten habt, kontaktiert bitte unseren Kundendienst unter <<1>>.", 1)
SafeAddString(SI_ACCOUNTCREATELINKERROR12104, "Dieses Konto ist permanent gesperrt. Bitte kontaktiert unseren Kundendienst unter <<1>>, um weitere Informationen zu erhalten, oder verknüpft ein anderes Konto.", 0)
SafeAddString(SI_ACCOUNTCREATELINKERROR2, "Das Format der E-Mail-Adresse ist ungültig.", 0)
SafeAddString(SI_ACCOUNTCREATELINKERROR3, "Die Verbindung zum Server reagiert nicht mehr. Bitte versucht es später erneut.", 0)
Expand Down Expand Up @@ -475,7 +475,7 @@ SafeAddString(SI_APPROVEDURLTYPEDMM5, "http://eso.dmm.com/community", 0)
SafeAddString(SI_APPROVEDURLTYPEDMM6, "http://www.elderscrollsonline.com/link", 0)
SafeAddString(SI_APPROVEDURLTYPEEPIC0, "http://www.elderscrollsonline.com", 0)
SafeAddString(SI_APPROVEDURLTYPEEPIC1, "https://account.elderscrollsonline.com", 0)
SafeAddString(SI_APPROVEDURLTYPEEPIC2, "https://account.elderscrollsonline.com/store?utm_source=ESO%20in-game%20Crown%20Store&utm_campaign=Buy%20Crowns&utm_content=In-Game%20Buy%20Crowns", 2)
SafeAddString(SI_APPROVEDURLTYPEEPIC2, "com.epicgames.launcher://store/all-dlc/elder-scrolls-online", 3)
SafeAddString(SI_APPROVEDURLTYPEEPIC3, "https://account.elderscrollsonline.com/store/product/eso_plus?utm_source=ESO%20In-Game&utm_campaign=ESO%20Plus", 1)
SafeAddString(SI_APPROVEDURLTYPEEPIC4, "https://hilfe.elderscrollsonline.com", 0)
SafeAddString(SI_APPROVEDURLTYPEEPIC5, "https://forums.elderscrollsonline.com/de/", 0)
Expand Down Expand Up @@ -7036,11 +7036,11 @@ SafeAddString(SI_LOGINAUTHERROR5008, "Nicht kompatibler Spielclient. Bitte aktua
SafeAddString(SI_LOGINAUTHERROR7, "Verbindung zu Epic kann nicht hergestellt werden.", 0)
SafeAddString(SI_LOGINAUTHERROR8004, "Euer Konto wurde suspendiert. Bitte kontaktiert unseren Kundendienst unter <<1>>, um mehr zu erfahren.", 0)
SafeAddString(SI_LOGINAUTHERROR8005, "Euer Konto ist permanent gebannt. Bitte kontaktiert unseren Kundendienst unter <<1>>, um mehr zu erfahren.", 0)
SafeAddString(SI_LOGINAUTHERROR8007, "Ihr müsst Euer Konto verifizieren, um weiterspielen zu können. Bitte prüft Euer E-Mail-Postfach, das Ihr für die Erstellung Eures ESO-Kontos verwendet habt, um weitere Anweisungen für den Verifikationsprozess zu erhalten.", 0)
SafeAddString(SI_LOGINAUTHERROR8007, "Ihr müsst Euer Konto verifizieren, um weiterspielen zu können. Bitte prüft Euer E-Mail-Postfach, das Ihr für die Erstellung Eures ESO-Kontos verwendet habt, um weitere Anweisungen für den Verifikationsprozess zu erhalten. Falls Ihr keine E-Mail erhalten habt, kontaktiert bitte unseren Kundendienst unter <<1>>.", 1)
SafeAddString(SI_LOGINAUTHERROR8008, "Spielkonto nicht gefunden", 0)
SafeAddString(SI_LOGINAUTHERROR8009, "Euer Konto wurde suspendiert. Bitte kontaktiert unseren Kundendienst unter <<1>>, um weitere Informationen zu erhalten.", 0)
SafeAddString(SI_LOGINAUTHERROR8010, "Dieses Konto ist permanent gebannt. Bitte kontaktiert unseren Kundendienst unter <<1>>, um weitere Informationen zu erhalten.", 0)
SafeAddString(SI_LOGINAUTHERROR8011, "Ihr müsst Euer Konto verifizieren, um weiterspielen zu können. Bitte prüft Euer E-Mail-Postfach, das Ihr für die Erstellung Eures ESO-Kontos verwendet habt, um weitere Anweisungen für den Verifikationsprozess zu erhalten.", 0)
SafeAddString(SI_LOGINAUTHERROR8011, "Ihr müsst Euer Konto verifizieren, um weiterspielen zu können. Bitte prüft Euer E-Mail-Postfach, das Ihr für die Erstellung Eures ESO-Kontos verwendet habt, um weitere Anweisungen für den Verifikationsprozess zu erhalten.Falls Ihr keine E-Mail erhalten habt, kontaktiert bitte unseren Kundendienst unter <<1>>.", 1)
SafeAddString(SI_LOGINAUTHERROR8012, "Euer Konto hat eingeschränkte Authentifizierung. Bitte kontaktiert unseren Kundendienst unter <<1>>.", 0)
SafeAddString(SI_LOGINAUTHERROR8013, "Auf den Servern werden im Moment Wartungsarbeiten durchgeführt. Bitte versucht es später erneut.", 0)
SafeAddString(SI_LOGIN_DIALOG_TITLE_LINK_FAILED, "Kontoerstellung bzw. Verknüpfung fehlgeschlagen", 1)
Expand Down

0 comments on commit 3033f31

Please sign in to comment.