fix i18n

yofukashino · Nov 5, 2024 · 5230511 · 5230511
1 parent 45db2aa
commit 5230511
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 34 deletions.
diff --git a/src/Components/HDRCaptureSwitch.tsx b/src/Components/HDRCaptureSwitch.tsx
@@ -1,4 +1,4 @@
-import { CheckboxItem, Flex } from "replugged/components";
+import { Checkbox, CheckboxItem, Flex } from "replugged/components";
 import { SettingValues } from "../index";
 import { defaultSettings } from "../lib/consts";
 import Utils from "../lib/utils";
@@ -9,7 +9,8 @@ export default (): React.ReactElement => (
       paddingLeft: "16px",
     }}>
     <CheckboxItem
-      {...Utils.useSetting(SettingValues, "hdrCaptureMode", defaultSettings.hdrCaptureMode)}>
+      {...Utils.useSetting(SettingValues, "hdrCaptureMode", defaultSettings.hdrCaptureMode)}
+      type={Checkbox.Types.INVERTED}>
       HDR Capture Mode
     </CheckboxItem>
   </Flex>

diff --git a/src/index.ts b/src/index.ts
@@ -17,5 +17,5 @@ export const stop = (): void => {
   PluginInjector.uninjectAll();
   Injections.removeInjections();
 };
-export { defaultSettings } from "./lib/consts";
+export { defaultSettings, streamStoreKeys } from "./lib/consts";
 export { Settings } from "./Components/Settings";
diff --git a/src/injections/StreamSettings.tsx b/src/injections/StreamSettings.tsx
@@ -11,17 +11,13 @@ export default async (): Promise<void> => {
     StreamSettings,
     loader,
     ([{ selectedSource }], res: React.ReactElement & Types.Tree) => {
+      console.log(res);
       const SourceContainer = Utils.findInReactTree(res, (c: React.ReactElement & Types.Tree) =>
-        c?.props?.children?.some((v) =>
-          v?.type?.toString()?.includes(".Messages.GO_LIVE_MODAL_ENABLE_SCREEN_SOUNDSHARE_LABEL"),
-        ),
+        c?.props?.children?.some((v) => v?.type?.toString()?.includes('.id.startsWith("screen")')),
       ) as React.ReactElement & Types.Tree;
       if (SourceContainer?.props)
         SourceContainer.props.children = SourceContainer.props.children.filter(
-          (v) =>
-            !v?.type
-              ?.toString()
-              ?.includes(".Messages.GO_LIVE_MODAL_ENABLE_SCREEN_SOUNDSHARE_LABEL"),
+          (v) => !v?.type?.toString()?.includes("screen:"),
         );
       const qualitySelectorElement = res.props.children.find((c) => Boolean(c?.props?.onFPSChange));
       if (qualitySelectorElement?.props)

diff --git a/src/lib/requiredModules.ts b/src/lib/requiredModules.ts
@@ -14,7 +14,7 @@ Modules.loadModules = async (): Promise<void> => {
     .then(({ exports }) => exports);
   Modules.StreamSettingsPromise = webpack
     .waitForModule<Types.GenericExport>(
-      webpack.filters.bySource("Messages.GO_LIVE_MODAL_APPLICATION_FORM_TITLE"),
+      webpack.filters.bySource(".NOTIFY_STREAM_SETTING_UPDATE,"),
       {
         raw: true,
       },

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -30,13 +30,7 @@ export const saveModuleKeys = (): Promise<void> => {
   ).find(
     ([_key, value]) =>
       Array.isArray(value) &&
-      value.some(
-        (button: Types.StreamButtons) =>
-          button.label ==
-          i18n.Messages.STREAM_FPS_OPTION.format({
-            value: 15,
-          }),
-      ),
+      value.some((button: Types.StreamButtons) => button.label != 15 && button.value == 15),
   )[0];
 
   streamStoreKeys.ApplicationStreamPresetValues = Object.entries(
@@ -58,13 +52,7 @@ export const saveModuleKeys = (): Promise<void> => {
   ).find(
     ([_key, value]) =>
       Array.isArray(value) &&
-      value.some(
-        (button: Types.StreamButtons) =>
-          button.label ==
-          i18n.Messages.SCREENSHARE_RESOLUTION_ABBREVIATED.format({
-            resolution: 720,
-          }),
-      ),
+      value.some((button: Types.StreamButtons) => button.label != 720 && button.value == 720),
   )[0];
 
   streamStoreKeys.ApplicationStreamResolutions = Object.entries(
@@ -97,7 +85,7 @@ export const saveModuleKeys = (): Promise<void> => {
   );
   streamStoreKeys.makeResolutionLabel = webpack.getFunctionKeyBySource(
     Modules.ApplicationStreamingOption,
-    "Messages.SCREENSHARE_RESOLUTION_ABBREVIATED",
+    "Messages.",
   );
   return Promise.resolve();
 };
@@ -174,9 +162,9 @@ export const setCustomParameters = (streamingConstants: Types.StreamingConstants
     })),
     ApplicationStreamFPSButtonsWithSuffixLabel: streamingConstants.fps.map((fps) => ({
       value: fps,
-      label: i18n.Messages.STREAM_FPS_OPTION.format({
-        value: fps,
-      }),
+      label: defaultParameters.ApplicationStreamFPSButtonsWithSuffixLabel.find(
+        (button) => button.value == 15,
+      ).label.replace("15", `${fps}`),
     })),
     ApplicationStreamPresetValues: {
       1: [
@@ -201,17 +189,24 @@ export const setCustomParameters = (streamingConstants: Types.StreamingConstants
     },
     ApplicationStreamResolutionButtons: streamingConstants.resolution.map((resolution) => ({
       value: resolution,
-      label: resolution == 0 ? i18n.Messages.SCREENSHARE_SOURCE : resolution,
+      label:
+        resolution == 0
+          ? defaultParameters.ApplicationStreamResolutionButtonsWithSuffixLabel.find(
+              (button) => button.value == 0,
+            ).label
+          : resolution,
     })),
     ApplicationStreamResolutionButtonsWithSuffixLabel: streamingConstants.resolution.map(
       (resolution) => ({
         value: resolution,
         label:
           resolution == 0
-            ? i18n.Messages.SCREENSHARE_SOURCE
-            : i18n.Messages.SCREENSHARE_RESOLUTION_ABBREVIATED.format({
-                resolution,
-              }),
+            ? defaultParameters.ApplicationStreamResolutionButtonsWithSuffixLabel.find(
+                (button) => button.value == 0,
+              ).label
+            : defaultParameters.ApplicationStreamResolutionButtonsWithSuffixLabel.find(
+                (button) => button.value == 720,
+              ).label.replace("720", `${resolution}`),
       }),
     ),
     ApplicationStreamResolutions: Object.assign(