From bad5dac776ba3ea62308f92000ab9f86023fff08 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Sun, 3 Nov 2024 21:25:19 -0500 Subject: [PATCH] Fix Broken i18n --- .../ThemeSettings/components/SettingColorComponent.tsx | 2 +- src/equicordplugins/anammox/index.ts | 4 ++-- src/equicordplugins/bannersEverywhere/index.tsx | 2 +- src/equicordplugins/betterBanReasons/index.tsx | 2 +- src/equicordplugins/betterInvites/index.tsx | 2 +- src/equicordplugins/fullUserInChatbox/index.tsx | 2 +- src/equicordplugins/glide/index.tsx | 2 +- src/equicordplugins/hideServers/index.tsx | 2 +- src/equicordplugins/identity/index.tsx | 2 +- src/equicordplugins/loginWithQR/index.tsx | 4 ++-- src/equicordplugins/moreStickers/index.tsx | 4 ++-- src/equicordplugins/noAppsAllowed/index.tsx | 4 ++-- src/equicordplugins/pinIcon/index.tsx | 4 ++-- src/equicordplugins/statusPresets/index.tsx | 4 ++-- src/plugins/_api/serverList.ts | 4 ++-- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/components/ThemeSettings/components/SettingColorComponent.tsx b/src/components/ThemeSettings/components/SettingColorComponent.tsx index 8e0582ba..f8d779f2 100644 --- a/src/components/ThemeSettings/components/SettingColorComponent.tsx +++ b/src/components/ThemeSettings/components/SettingColorComponent.tsx @@ -15,7 +15,7 @@ interface ColorPickerProps { showEyeDropper?: boolean; onChange(value: number | null): void; } -const ColorPicker = findComponentByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)"); +const ColorPicker = findComponentByCodeLazy("#{intl::USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR}", ".BACKGROUND_PRIMARY)"); // TinyColor is completely unmangled and it's duplicated in two modules! Fun! const TinyColor: tinycolor.Constructor = findByCodeLazy("this._gradientType="); diff --git a/src/equicordplugins/anammox/index.ts b/src/equicordplugins/anammox/index.ts index 1bf05abb..e80031cb 100644 --- a/src/equicordplugins/anammox/index.ts +++ b/src/equicordplugins/anammox/index.ts @@ -77,7 +77,7 @@ export default definePlugin({ find: "#{intl::BILLING_SETTINGS}", replacement: [ { - match: /(?<=#{intl::BILLING_SETTINGS},)/, + match: /(?<=#{intl::BILLING_SETTINGS}\),)/, replace: "capitalism:true," }, { @@ -99,7 +99,7 @@ export default definePlugin({ }, { // Emoji list - find: "#{intl::EMOJI_PICKER_CREATE_EMOJI_TITLE},size:", + find: "#{intl::EMOJI_PICKER_CREATE_EMOJI_TITLE}),size:", replacement: { match: /(\i)=\i\|\|!\i&&\i.\i.isEmojiCategoryNitroLocked\(\{[^}]*\}\);/, replace: "$&$1||" diff --git a/src/equicordplugins/bannersEverywhere/index.tsx b/src/equicordplugins/bannersEverywhere/index.tsx index 88b8ecec..3badaa03 100644 --- a/src/equicordplugins/bannersEverywhere/index.tsx +++ b/src/equicordplugins/bannersEverywhere/index.tsx @@ -39,7 +39,7 @@ export default definePlugin({ settings, patches: [ { - find: "#{intl::GUILD_OWNER},", + find: "#{intl::GUILD_OWNER}),", replacement: { // We add the banner as a property while we can still access the user id diff --git a/src/equicordplugins/betterBanReasons/index.tsx b/src/equicordplugins/betterBanReasons/index.tsx index dba15cd8..892d2579 100644 --- a/src/equicordplugins/betterBanReasons/index.tsx +++ b/src/equicordplugins/betterBanReasons/index.tsx @@ -75,7 +75,7 @@ export default definePlugin({ { find: "#{intl::BAN_MULTIPLE_CONFIRM_TITLE}", replacement: [{ - match: /\[\{name:#{intl::BAN_REASON_OPTION_SPAM_ACCOUNT}.+?\}\]/, + match: /\[\{name:\i\.\i\.string\(\i\.\i#{intl::BAN_REASON_OPTION_SPAM_ACCOUNT}\).+?\}\]/, replace: "$self.getReasons()" }, { diff --git a/src/equicordplugins/betterInvites/index.tsx b/src/equicordplugins/betterInvites/index.tsx index 8a98f95d..c26e21ba 100644 --- a/src/equicordplugins/betterInvites/index.tsx +++ b/src/equicordplugins/betterInvites/index.tsx @@ -40,7 +40,7 @@ export default definePlugin({ find: "#{intl::HUB_INVITE_ANOTHER_SCHOOL_LINK}", replacement: [ { - match: /,(\i)&&(\(.{0,15}\i\.TooltipContainer.+)(#{intl::Messages.GUEST_MEMBERSHIP_EXPLANATION})/, + match: /,(\i)&&(\(.{0,15}\i\.TooltipContainer.+)(\i\.\i\.string\(\i\.\i#{intl::GUEST_MEMBERSHIP_EXPLANATION}\))/, replace: ",($1||((!$1)&&arguments[0].invite.expires_at)) && $2$self.RenderTip($1, $3, arguments[0].invite.expires_at)" }, { diff --git a/src/equicordplugins/fullUserInChatbox/index.tsx b/src/equicordplugins/fullUserInChatbox/index.tsx index 3b30541c..b51c488c 100644 --- a/src/equicordplugins/fullUserInChatbox/index.tsx +++ b/src/equicordplugins/fullUserInChatbox/index.tsx @@ -17,7 +17,7 @@ export default definePlugin({ patches: [ { - find: "#{intl::UNKNOWN_ROLE_PLACEHOLDER}", + find: "#{intl::UNKNOWN_ROLE_PLACEHOLDER})]", replacement: { match: /(hidePersonalInformation.*?)return/, replace: "$1return $self.patchChatboxMention(arguments[0]);" diff --git a/src/equicordplugins/glide/index.tsx b/src/equicordplugins/glide/index.tsx index 8e98b3bc..6b31fee8 100644 --- a/src/equicordplugins/glide/index.tsx +++ b/src/equicordplugins/glide/index.tsx @@ -88,7 +88,7 @@ function CopyPresetComponent() { ); } -const ColorPicker = findComponentByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)"); +const ColorPicker = findComponentByCodeLazy("#{intl::USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR}", ".BACKGROUND_PRIMARY)"); export function generateAndApplyProceduralTheme() { diff --git a/src/equicordplugins/hideServers/index.tsx b/src/equicordplugins/hideServers/index.tsx index e1e19a7e..789884b5 100644 --- a/src/equicordplugins/hideServers/index.tsx +++ b/src/equicordplugins/hideServers/index.tsx @@ -77,7 +77,7 @@ export default definePlugin({ find: '("guildsnav")', replacement: [ { - match: /(?<=#{intl::SERVERS}"\]\),children:.{0,300}?)(\i)(\)?\.map\(\i\))/, + match: /(?<=#{intl::SERVERS}\),children:.{0,300}?)(\i)(\)?\.map\(\i\))/, replace: "$self.useFilteredGuilds($1)$2", }, // despite my best efforts, the above doesnt trigger a rerender diff --git a/src/equicordplugins/identity/index.tsx b/src/equicordplugins/identity/index.tsx index 729f5832..b39e1683 100644 --- a/src/equicordplugins/identity/index.tsx +++ b/src/equicordplugins/identity/index.tsx @@ -140,7 +140,7 @@ export default definePlugin({ { find: "DefaultCustomizationSections", replacement: { - match: /(?<=#{intl::USER_SETTINGS_AVATAR_DECORATION}},"decoration"\),)/, + match: /(?<=#{intl::USER_SETTINGS_AVATAR_DECORATION}\)},"decoration"\),)/, replace: "$self.ResetCard()," } }, diff --git a/src/equicordplugins/loginWithQR/index.tsx b/src/equicordplugins/loginWithQR/index.tsx index dc7538f7..955576ab 100644 --- a/src/equicordplugins/loginWithQR/index.tsx +++ b/src/equicordplugins/loginWithQR/index.tsx @@ -59,13 +59,13 @@ export default definePlugin({ replacement: { // Find the Edit User Profile button and insert our custom button. // A bit jank, but whatever - match: /,(.{11}\.Button,.{58}\.USER_SETTINGS_EDIT_USER_PROFILE}\))/, + match: /,(.{0,20}\.Button,.{0,100}#{intl::USER_SETTINGS_EDIT_USER_PROFILE}\)}\))/, replace: ",$self.insertScanQrButton($1)", }, }, // Insert a Scan QR Code MenuItem in the Swith Accounts popout { - find: "#{intl::SWITCH_ACCOUNTS_MANAGE_ACCOUNTS},", + find: 'id:"manage-accounts"', replacement: { match: /(id:"manage-accounts",.*?)}\)\)(,\i)/, replace: "$1}),$self.ScanQrMenuItem)$2" diff --git a/src/equicordplugins/moreStickers/index.tsx b/src/equicordplugins/moreStickers/index.tsx index f2083e55..f02e6dc3 100644 --- a/src/equicordplugins/moreStickers/index.tsx +++ b/src/equicordplugins/moreStickers/index.tsx @@ -32,7 +32,7 @@ export default definePlugin({ patches: [ { - find: "#{intl::STICKER_BUTTON_LABEL},", + find: "#{intl::STICKER_BUTTON_LABEL}", replacement: [{ match: /(children:\(0,\w\.jsx\)\()([\w.]+?)(,{innerClassName.{10,30}\.stickerButton)/, replace: (_, head, button, tail) => { @@ -66,7 +66,7 @@ export default definePlugin({ { find: "#{intl::EXPRESSION_PICKER_GIF}", replacement: { - match: /role:"tablist",.+?#{intl::EXPRESSION_PICKER_CATEGORIES_A11Y_LABEL},children:(\[.*?\)\]}\)}\):null,)(.*?closePopout:\w.*?:null)/s, + match: /role:"tablist",.+?#{intl::EXPRESSION_PICKER_CATEGORIES_A11Y_LABEL}\),children:(\[.*?\)\]}\)}\):null,)(.*?closePopout:\w.*?:null)/s, replace: m => { const stickerTabRegex = /(\w+?)\?(\([^()]+?\))\((.{1,2}),{.{0,128},isActive:(.{1,2})===.{1,150},children:(.{1,10}#{intl::EXPRESSION_PICKER_STICKER}).*?:null/s; const res = m.replace(stickerTabRegex, (_m, canUseStickers, jsx, tabHeaderComp, currentTab, stickerText) => { diff --git a/src/equicordplugins/noAppsAllowed/index.tsx b/src/equicordplugins/noAppsAllowed/index.tsx index a435e637..560ecf67 100644 --- a/src/equicordplugins/noAppsAllowed/index.tsx +++ b/src/equicordplugins/noAppsAllowed/index.tsx @@ -14,9 +14,9 @@ export default definePlugin({ patches: [ { - find: "BOT:default:", + find: "#{intl::APP_TAG})", replacement: { - match: /(default:\i)=.{0,30}\)/, + match: /(default:\i)=\i\.\i\.string\(\i\.\i#{intl::APP_TAG}\)/, replace: "$1=\"BOT\"" } } diff --git a/src/equicordplugins/pinIcon/index.tsx b/src/equicordplugins/pinIcon/index.tsx index bd13a5c1..cb603e6e 100644 --- a/src/equicordplugins/pinIcon/index.tsx +++ b/src/equicordplugins/pinIcon/index.tsx @@ -27,9 +27,9 @@ export default definePlugin({ authors: [EquicordDevs.iamme], patches: [ { - find: "#{intl::MESSAGE_EDITED},", + find: "#{intl::MESSAGE_EDITED}),", replacement: { - match: /#{intl::MESSAGE_EDITED},(?:[^}]*[}]){3}\)/, + match: /#{intl::MESSAGE_EDITED}\),(?:[^}]*[}]){3}\)/, replace: "$&,$self.PinnedIcon(arguments[0].message)" } } diff --git a/src/equicordplugins/statusPresets/index.tsx b/src/equicordplugins/statusPresets/index.tsx index ddebc316..5889448d 100644 --- a/src/equicordplugins/statusPresets/index.tsx +++ b/src/equicordplugins/statusPresets/index.tsx @@ -133,12 +133,12 @@ export default definePlugin({ { find: "#{intl::CUSTOM_STATUS_SET_CUSTOM_STATUS}", replacement: { - match: /\.ModalFooter,.{0,70}\.Messages\.SAVE\}\)/, + match: /\.ModalFooter,.{0,70}\i\.\i\.string\(\i\.\i#{intl::SAVE}\)\}\)/, replace: "$&,$self.renderRememberButton(this.state)" } }, { - find: '"aria-label":#{intl::STATUS_MENU_LABEL}', + find: /"aria-label":.{0,1}\.\i\.string\(\i\.\i#{intl::STATUS_MENU_LABEL}/, replacement: { match: /!\i&&(.{0,15}\i\.Fragment.{0,55}null==(\i).{0,200}customEmojiPlaceholder\}\),onClick:([^}]+}))/, replace: "$self.render($2, $3),false&&$1" diff --git a/src/plugins/_api/serverList.ts b/src/plugins/_api/serverList.ts index 01ace3a1..2b2c2cc6 100644 --- a/src/plugins/_api/serverList.ts +++ b/src/plugins/_api/serverList.ts @@ -32,10 +32,10 @@ export default definePlugin({ } }, { - find: '#{intl::SERVERS}"]),children', + find: "#{intl::SERVERS}),children", replacement: [ { - match: /(?<=#{intl::SERVERS}"\]\),children:)\i\.map\(\i\)/, + match: /(?<=#{intl::SERVERS}\),children:)\i\.map\(\i\)/, replace: "Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.In).concat($&)" }, {