From 8a497b9286893dbd1c4d58d48a513afac6135b4f Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Wed, 29 Jul 2026 20:40:10 +0000 Subject: [PATCH 1/3] fix(locale): always fall back to English for missing translations When _APP_LOCALE was set to a partial locale (e.g. fr), Locale fallback matched that same incomplete set, so missing email keys rendered as {{emails.*}} instead of English. Keep instance default from _APP_LOCALE but always fall back to en, which is the complete translation catalog. Co-authored-by: Chirag Aggarwal --- app/init/resources/request.php | 5 +- .../Console/Http/Templates/Email/Get.php | 2 +- .../Http/Project/Templates/Email/Get.php | 2 +- .../Platform/Workers/Certificates.php | 2 +- src/Appwrite/Platform/Workers/Migrations.php | 2 +- tests/unit/Locale/FallbackTest.php | 49 +++++++++++++++++++ 6 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 tests/unit/Locale/FallbackTest.php diff --git a/app/init/resources/request.php b/app/init/resources/request.php index f64c8dcd23..70ddf17d90 100644 --- a/app/init/resources/request.php +++ b/app/init/resources/request.php @@ -118,7 +118,10 @@ return function (Container $context): void { $context->set('locale', function () { $locale = new Locale(System::getEnv('_APP_LOCALE', 'en')); - $locale->setFallback(System::getEnv('_APP_LOCALE', 'en')); + // Always fall back to English — it is the only complete translation set. + // Using _APP_LOCALE here left missing keys as {{emails.*}} when the + // instance default was a partial locale (e.g. fr). See #12448. + $locale->setFallback('en'); return $locale; }); diff --git a/src/Appwrite/Platform/Modules/Console/Http/Templates/Email/Get.php b/src/Appwrite/Platform/Modules/Console/Http/Templates/Email/Get.php index 003158ab9f..36931e6c33 100644 --- a/src/Appwrite/Platform/Modules/Console/Http/Templates/Email/Get.php +++ b/src/Appwrite/Platform/Modules/Console/Http/Templates/Email/Get.php @@ -61,7 +61,7 @@ class Get extends Action $locale = $locale ?: System::getEnv('_APP_LOCALE', 'en'); $localeObj = new Locale($locale); - $localeObj->setFallback(System::getEnv('_APP_LOCALE', 'en')); + $localeObj->setFallback('en'); $response->dynamic(new Document([ 'templateId' => $templateId, diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/Templates/Email/Get.php b/src/Appwrite/Platform/Modules/Project/Http/Project/Templates/Email/Get.php index f5adfe9a6c..20711c4bce 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/Templates/Email/Get.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/Templates/Email/Get.php @@ -73,7 +73,7 @@ class Get extends Action // Prepare default tempaltes $localeObj = new Locale($locale); - $localeObj->setFallback(System::getEnv('_APP_LOCALE', 'en')); + $localeObj->setFallback('en'); $defaultSubject = $localeObj->getText('emails.' . $templateId . '.subject'); $defaultMessage = $this->getDefaultMessage($templateId, $localeObj); diff --git a/src/Appwrite/Platform/Workers/Certificates.php b/src/Appwrite/Platform/Workers/Certificates.php index 89da7d01de..53c77075ea 100644 --- a/src/Appwrite/Platform/Workers/Certificates.php +++ b/src/Appwrite/Platform/Workers/Certificates.php @@ -543,7 +543,7 @@ class Certificates extends Action Console::warning('Cannot renew domain (' . $domain . ') on attempt no. ' . $attempt . ' certificate: ' . $errorMessage); $locale = new Locale(System::getEnv('_APP_LOCALE', 'en')); - $locale->setFallback(System::getEnv('_APP_LOCALE', 'en')); + $locale->setFallback('en'); // Send mail to administrator mail $template = Template::fromFile(__DIR__ . '/../../../../app/config/locale/templates/email-certificate-failed.tpl'); diff --git a/src/Appwrite/Platform/Workers/Migrations.php b/src/Appwrite/Platform/Workers/Migrations.php index ede3360b4c..2bb8d235d9 100644 --- a/src/Appwrite/Platform/Workers/Migrations.php +++ b/src/Appwrite/Platform/Workers/Migrations.php @@ -978,7 +978,7 @@ class Migrations extends Action } $locale = new Locale(System::getEnv('_APP_LOCALE', 'en')); - $locale->setFallback(System::getEnv('_APP_LOCALE', 'en')); + $locale->setFallback('en'); $emailType = $success ? 'success' diff --git a/tests/unit/Locale/FallbackTest.php b/tests/unit/Locale/FallbackTest.php new file mode 100644 index 0000000000..a4d1509f8d --- /dev/null +++ b/tests/unit/Locale/FallbackTest.php @@ -0,0 +1,49 @@ +translationsDir = __DIR__ . '/../../../app/config/locale/translations'; + Locale::$exceptions = false; + Locale::setLanguageFromJSON('en', $this->translationsDir . '/en.json'); + Locale::setLanguageFromJSON('fr', $this->translationsDir . '/fr.json'); + } + + public function testIncompleteLocaleFallsBackToEnglishForMissingEmailKeys(): void + { + $locale = new Locale('fr'); + $locale->setFallback('en'); + + $preview = $locale->getText('emails.verification.preview'); + + $this->assertNotSame('{{emails.verification.preview}}', $preview); + $this->assertSame( + 'Verify your email to activate your {{project}} account.', + $preview + ); + // Keys present in fr stay French. + $this->assertSame('Vérification du compte', $locale->getText('emails.verification.subject')); + } + + public function testFallbackMatchingIncompleteLocaleLeaksRawKeys(): void + { + $locale = new Locale('fr'); + // Mirrors the previous bug: fallback = _APP_LOCALE when that env is fr. + $locale->setFallback('fr'); + + $this->assertSame( + '{{emails.verification.preview}}', + $locale->getText('emails.verification.preview') + ); + } +} From 6c974a7da593f5eccf0bbc2fed34c1f255d618f2 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Wed, 29 Jul 2026 20:45:50 +0000 Subject: [PATCH 2/3] test(locale): satisfy Rector NarrowUnusedSetUpDefinedProperty Co-authored-by: Chirag Aggarwal --- tests/unit/Locale/FallbackTest.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/unit/Locale/FallbackTest.php b/tests/unit/Locale/FallbackTest.php index a4d1509f8d..92a5c59f6b 100644 --- a/tests/unit/Locale/FallbackTest.php +++ b/tests/unit/Locale/FallbackTest.php @@ -9,14 +9,12 @@ use Utopia\Locale\Locale; final class FallbackTest extends TestCase { - private string $translationsDir; - protected function setUp(): void { - $this->translationsDir = __DIR__ . '/../../../app/config/locale/translations'; + $translationsDir = __DIR__ . '/../../../app/config/locale/translations'; Locale::$exceptions = false; - Locale::setLanguageFromJSON('en', $this->translationsDir . '/en.json'); - Locale::setLanguageFromJSON('fr', $this->translationsDir . '/fr.json'); + Locale::setLanguageFromJSON('en', $translationsDir . '/en.json'); + Locale::setLanguageFromJSON('fr', $translationsDir . '/fr.json'); } public function testIncompleteLocaleFallsBackToEnglishForMissingEmailKeys(): void From 6abe990cf4ad6b7287852dc5d9c2d587523c84f1 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Wed, 29 Jul 2026 20:57:24 +0000 Subject: [PATCH 3/3] ci: retrigger after unrelated FunctionsSchedule flake Co-authored-by: Chirag Aggarwal