fix(android): validate resource apostrophe syntax

vincentkoc · vincentkoc · commit fde4d261d9cf · 2026-07-01T02:13:01.000-07:00
diff --git a/apps/android/app/src/main/res/values-it/strings.xml b/apps/android/app/src/main/res/values-it/strings.xml
@@ -20,7 +20,7 @@
     <string name="use_tls">Usa TLS</string>
     <string name="token_optional">Token (opzionale)</string>
     <string name="password">Password</string>
-    <string name="run_onboarding_again">Esegui di nuovo l&apos;onboarding</string>
+    <string name="run_onboarding_again">Esegui di nuovo l’onboarding</string>
     <string name="resolved_endpoint">Endpoint risolto</string>
     <string name="gateway_setup">Configurazione gateway</string>
     <string name="connect_to_gateway">Connettiti al tuo Gateway</string>
diff --git a/apps/android/app/src/main/res/values-tr/strings.xml b/apps/android/app/src/main/res/values-tr/strings.xml
@@ -27,7 +27,7 @@
     <string name="scan_setup_code">Kurulum kodunu tara</string>
     <string name="use_gateway_qr">Gateway QR kodunuzu veya kurulum kodunuzu kullanın</string>
     <string name="nearby_gateway">Yakındaki ağ geçidi</string>
-    <string name="enter_gateway_url">Ağ geçidi URL&apos;sini girin</string>
+    <string name="enter_gateway_url">Ağ geçidi URL’sini girin</string>
     <string name="connect_manual_url">Manuel URL kullanarak bağlan</string>
     <string name="permissions">İzinler</string>
     <string name="done">Bitti</string>
diff --git a/scripts/android-app-i18n.ts b/scripts/android-app-i18n.ts
@@ -17,6 +17,7 @@ const localeDirectory = (locale: string) => `values-${ANDROID_QUALIFIERS[locale]
 const LOCALES = ["values", ...NATIVE_I18N_LOCALES.map(localeDirectory)] as const;
 const STRING_RE = /<string\s+name="([A-Za-z0-9_]+)"[^>]*>([\s\S]*?)<\/string>/gu;
 const FORMAT_RE = /%\d+\$[a-z]/giu;
+const INVALID_APOSTROPHE_RE = /(?:&apos;|(?<!\\)')/u;
 
 async function readStrings(locale: string): Promise<Map<string, string>> {
   const source = await readFile(path.join(RESOURCE_ROOT, locale, "strings.xml"), "utf8");
@@ -46,6 +47,16 @@ async function readAndroidSource(root = SOURCE_ROOT): Promise<string> {
   return sources.join("\n");
 }
 
+function findInvalidResourceSyntax(strings: Map<string, string>): string[] {
+  return [...strings]
+    .filter(([, value]) => {
+      const trimmed = value.trim();
+      const isQuoted = trimmed.startsWith('"') && trimmed.endsWith('"');
+      return !isQuoted && INVALID_APOSTROPHE_RE.test(trimmed);
+    })
+    .map(([key]) => key);
+}
+
 export async function checkAndroidAppI18n() {
   const [source, localeStrings] = await Promise.all([
     readAndroidSource(),
@@ -69,8 +80,10 @@ export async function checkAndroidAppI18n() {
       [`${locale} missing`, [...baseKeys].filter((key) => !keys.has(key))],
       [`${locale} extra`, [...keys].filter((key) => !baseKeys.has(key))],
       [`${locale} placeholders`, placeholderMismatches],
+      [`${locale} syntax`, findInvalidResourceSyntax(strings)],
     ] as const;
   });
+  problems.push(["English syntax", findInvalidResourceSyntax(base)]);
   const unusedBaseKeys = [...baseKeys].filter(
     (key) => !source.includes(`R.string.${key}`) && !source.includes(`@string/${key}`),
   );
