Merge branch 'main' into chore/demos-standardize-locales

Author: siddhesh1051

.changeset/bright-ties-itch.md

@@ -1,5 +1,12 @@
 # adonis
 
+## 0.0.25
+
+### Patch Changes
+
+- Updated dependencies [[`060680c`](https://github.com/lingodotdev/lingo.dev/commit/060680cd13c05dd77dd9d5447c064d948bd21cb0), [`f102356`](https://github.com/lingodotdev/lingo.dev/commit/f102356e1ea12c800399ac11f074c42708c304b1), [`a956e53`](https://github.com/lingodotdev/lingo.dev/commit/a956e537d0d45565c3243dd0c5ba4eec8bed69c6), [`3fd38c2`](https://github.com/lingodotdev/lingo.dev/commit/3fd38c2d38e4b22dcd824c865fe31abbc56bc862)]:
+  - [email protected]
+
 ## 0.0.24
 
 ### Patch Changes

.changeset/mean-rings-beg.md

@@ -1,6 +1,6 @@
 {
   "name": "adonis",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "private": true,
   "type": "module",
   "license": "UNLICENSED",

.changeset/perfect-pens-prove.md

@@ -1,5 +1,12 @@
 # next-app
 
+## 0.2.77
+
+### Patch Changes
+
+- Updated dependencies [[`060680c`](https://github.com/lingodotdev/lingo.dev/commit/060680cd13c05dd77dd9d5447c064d948bd21cb0), [`f102356`](https://github.com/lingodotdev/lingo.dev/commit/f102356e1ea12c800399ac11f074c42708c304b1), [`a956e53`](https://github.com/lingodotdev/lingo.dev/commit/a956e537d0d45565c3243dd0c5ba4eec8bed69c6), [`3fd38c2`](https://github.com/lingodotdev/lingo.dev/commit/3fd38c2d38e4b22dcd824c865fe31abbc56bc862)]:
+  - [email protected]
+
 ## 0.2.76
 
 ### Patch Changes

demo/adonisjs/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "next-app",
-  "version": "0.2.76",
+  "version": "0.2.77",
   "private": true,
   "scripts": {
     "dev": "next dev",

demo/adonisjs/package.json

@@ -1,5 +1,19 @@
 # lingo.dev
 
+## 0.114.0
+
+### Minor Changes
+
+- [#1241](https://github.com/lingodotdev/lingo.dev/pull/1241) [`060680c`](https://github.com/lingodotdev/lingo.dev/commit/060680cd13c05dd77dd9d5447c064d948bd21cb0) Thanks [@davidturnbull](https://github.com/davidturnbull)! - Enable locked patterns for all buckets
+
+- [#1240](https://github.com/lingodotdev/lingo.dev/pull/1240) [`a956e53`](https://github.com/lingodotdev/lingo.dev/commit/a956e537d0d45565c3243dd0c5ba4eec8bed69c6) Thanks [@davidturnbull](https://github.com/davidturnbull)! - Enable ignored keys for all buckets
+
+- [#1239](https://github.com/lingodotdev/lingo.dev/pull/1239) [`3fd38c2`](https://github.com/lingodotdev/lingo.dev/commit/3fd38c2d38e4b22dcd824c865fe31abbc56bc862) Thanks [@davidturnbull](https://github.com/davidturnbull)! - Enable locked keys for all buckets
+
+### Patch Changes
+
+- [#1331](https://github.com/lingodotdev/lingo.dev/pull/1331) [`f102356`](https://github.com/lingodotdev/lingo.dev/commit/f102356e1ea12c800399ac11f074c42708c304b1) Thanks [@vrcprl](https://github.com/vrcprl)! - fix xcode-xcstrings-v2 flattening
+
 ## 0.113.8
 
 ### Patch Changes

demo/next-app/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "lingo.dev",
-  "version": "0.113.8",
+  "version": "0.114.0",
   "description": "Lingo.dev CLI",
   "private": false,
   "publishConfig": {

demo/next-app/package.json

@@ -72,10 +72,13 @@ function createDenormalizeLoader(
       });
 
       // Merge preserved objects back (they stay as objects, not flattened)
-      const denormalized: Record<string, any> = {
-        ...flattened,
-        ...preservedObjects,
-      };
+      // BUT: encode their keys too!
+      const denormalized: Record<string, any> = { ...flattened };
+
+      for (const [key, value] of Object.entries(preservedObjects)) {
+        const encodedKey = encodeURIComponent(String(key));
+        denormalized[encodedKey] = value;
+      }
 
       const keysMap = buildDenormalizedKeysMap(denormalized);
       return { denormalized, keysMap };