Merge branch 'main' into ptr

Author: kodewdle

ElvUI/Core/init.lua

@@ -105,7 +105,7 @@ do
 end
 
 do -- this is different from E.locale because we need to convert for ace locale files
-	local convert = {enGB = 'enUS', esES = 'esMX', itIT = 'enUS'}
+	local convert = { enGB = 'enUS', esES = 'esMX', itIT = 'enUS' }
 	local gameLocale = convert[E.locale] or E.locale or 'enUS'
 
 	function E:GetLocale()
@@ -115,7 +115,7 @@ end
 
 function E:ParseVersionString(addon)
 	local version = GetAddOnMetadata(addon, 'Version')
-	if strfind(version, 'project%-version') then
+	if version == '@project-version@' then
 		return 13.60, '13.60-git', nil, true
 	else
 		local release, extra = strmatch(version, '^v?([%d.]+)(.*)')