i18n fixes (#1377)

* i18n fixes * Removing unused lang, linting, etc * lint
prosopo · Sep 19, 2024 · 78d37cf · 78d37cf
1 parent 6d0e187
commit 78d37cf
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/demos/client-example/src/config.ts b/demos/client-example/src/config.ts
@@ -13,18 +13,19 @@ import { getServerUrl } from "@prosopo/server";
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import {
+	ProcaptchaConfigSchema,
 	type ProsopoClientConfigOutput,
-	ProsopoClientConfigSchema,
 } from "@prosopo/types";
 
-const config: ProsopoClientConfigOutput = ProsopoClientConfigSchema.parse({
+const config: ProsopoClientConfigOutput = ProcaptchaConfigSchema.parse({
 	account: {
 		address: process.env.PROSOPO_SITE_KEY,
 	},
 	web2: process.env.PROSOPO_WEB2 !== "false",
 	defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT,
 	dappName: "client-example",
 	serverUrl: getServerUrl(),
+	theme: "light",
 });
 
 export default config;
diff --git a/packages/common/src/i18n.ts b/packages/common/src/i18n.ts
@@ -42,6 +42,10 @@ const reactOptions: InitOptions = {
 	react: {
 		useSuspense: false,
 	},
+	detection: {
+		order: ["navigator", "htmlTag", "path", "subdomain"],
+		caches: ["localStorage", "cookie"],
+	},
 };
 
 const nodeOptions: InitOptions = {};

diff --git a/packages/procaptcha-bundle/src/util/language.ts b/packages/procaptcha-bundle/src/util/language.ts
@@ -35,8 +35,11 @@ export const setLanguage = (
 	config: ProcaptchaClientConfigInput,
 ) => {
 	const languageAttribute =
-		renderOptions?.language || element.getAttribute("data-language") || "en";
-	config.language = validateLanguage(languageAttribute);
+		renderOptions?.language || element.getAttribute("data-language");
+
+	if (languageAttribute) {
+		config.language = validateLanguage(languageAttribute);
+	}
 };
 
 const validateLanguage = (

diff --git a/packages/procaptcha-react/src/components/ProcaptchaWidget.tsx b/packages/procaptcha-react/src/components/ProcaptchaWidget.tsx
@@ -51,8 +51,6 @@ const ProcaptchaWidget = (props: ProcaptchaProps) => {
 		if (config.language) {
 			i18n.changeLanguage(config.language);
 		}
-
-		console.log(config.language);
 	}, [config.language]);
 
 	return (

diff --git a/packages/types/src/config/config.ts b/packages/types/src/config/config.ts
@@ -142,8 +142,6 @@ export const ProsopoCaptchaSolutionConfigSchema = object({
 	captchaBlockRecency: number().positive().min(2),
 });
 
-export const LanguageSchema = z.enum(["en", "es", "pt"]);
-
 export const ProsopoClientConfigSchema = ProsopoBasicConfigSchema.merge(
 	object({
 		userAccountAddress: string().optional(),
@@ -255,13 +253,14 @@ export type ProsopoClientConfigOutput = output<
 >;
 
 const ThemeType = union([literal("light"), literal("dark")]);
+export const LanguageSchema = z.enum(["en", "pt", "es"]);
 
 export const ProcaptchaConfigSchema = ProsopoClientConfigSchema.and(
 	object({
 		accountCreator: AccountCreatorConfigSchema.optional(),
 		theme: ThemeType.optional().default("light"),
 		captchas: CaptchaTimeoutSchema.optional().default(defaultCaptchaTimeouts),
-		language: LanguageSchema.optional().default("en"),
+		language: LanguageSchema.optional(),
 	}),
 );