Locale: Minor changes and bug fixes

Author: ScratchFakemon

docs/Fakemon/Locale.md

@@ -1,8 +1,8 @@
 # Locale
-The Locale extension allows developers to manualy register translations for text rather than using an external server like the Translate extension. It is designed for those who want control over the translations.
+Locale allows developers to manually register translations of text and get information about languages. It was designed to simplify the process of including manually-curated translations in projects and mitigate the need for automatic translations such as those provided by the Translate extension.
 
 > [!NOTE]
-> Some of these blocks use JSON, a format for storing data in key-value pairs. The JSON extension will make these blocks much easier to use, especially for beginners.
+> Many of these blocks use JSON, a format for storing data in key-value pairs. The JSON extension will make these blocks much easier to use, especially for beginners.
  
 
 ## Working With Translation Information
@@ -34,7 +34,7 @@ If you need to merge the existing the existing information with something new, u
 ```scratchblocks
 merge current translation information with JSON [{}] ::#2a5fa0
 ```
-This block takes the current translation information and sets the values of the keys defined in the input to their new values. This can both replace and add new keys.
+This block uses the newly-provided JSON to update the existing global translation information by keeping the information that only exists in the original object and adding the new object's values from there. Keys from both objects will use the new values.
 
 You can get the global information with this block:
 ```scratchblocks

extensions/Fakemon/Locale.js

@@ -1,14 +1,11 @@
 // Name: Locale
 // ID: fakemonLocale
-// Description: Blocks for manually registering translations of text.
+// Description: Blocks for manual translations and language information.
 // By: Scratch_Fakemon <https://scratch.mit.edu/users/Scratch_Fakemon/>
 // License: MPL-2.0
 
 /* Note for contributors:
-When updating this extension's block info, make sure to also update the documentation (/docs/Fakemon/Locale.md).
-This is most important for adding new blocks, but should also be done for changing block text to avoid confusion.
-
-Additionally, do NOT remove the TypeScript comments (//@ts-ignore); it doesn't like my code :(
+When updating this extension's block info, please also update the documentation (/docs/Fakemon/Locale.md). Thanks!
 */
 
 (async function (Scratch) {
@@ -31,7 +28,7 @@ Additionally, do NOT remove the TypeScript comments (//@ts-ignore); it doesn't l
    */
   let languageNameAndCodeLookupTableGLOBALIZED;
   // This is a backup of the lookup table in case the user is offline. It may not always be up-to-date.
-  // TODO: use a build script to automatically get the latest version of the table to put in here (and maybe also make a version of Locale without this hefty object)
+  // TODO: use a build script to automatically get the latest version of the table to put in here (and maybe also make a version of Locale without this hefty chonker)
   const backupTable = {
     menuMap: {
       am: [
@@ -15659,7 +15656,7 @@ Additionally, do NOT remove the TypeScript comments (//@ts-ignore); it doesn't l
             arguments: {
               JSON: {
                 type: Scratch.ArgumentType.STRING,
-                defaultValue: `{"en":{${Scratch.translate("Hello, world!")}:"Hello, world!"},"es":{${Scratch.translate("Hello, world!")}:"¡Hola, mundo!"}}`,
+                defaultValue: `{"en":{"${Scratch.translate("Hello, world!")}":"Hello, world!"},"es":{"${Scratch.translate("Hello, world!")}":"¡Hola, mundo!"}}`,
               },
             },
           },
@@ -15673,7 +15670,7 @@ Additionally, do NOT remove the TypeScript comments (//@ts-ignore); it doesn't l
             arguments: {
               JSON: {
                 type: Scratch.ArgumentType.STRING,
-                defaultValue: `{"en":{${Scratch.translate("Hello, world!")}:"Hello, world!"},"es":{${Scratch.translate("Hello, world!")}:"¡Hola, mundo!"}}`,
+                defaultValue: `{"pl":{"${Scratch.translate("Hello, world!")}":"Cześć, świat!"}}`,
               },
             },
           },
@@ -15708,7 +15705,7 @@ Additionally, do NOT remove the TypeScript comments (//@ts-ignore); it doesn't l
               },
               JSON: {
                 type: Scratch.ArgumentType.STRING,
-                defaultValue: `{${Scratch.translate("Hello, world!")}:"¡Hola, mundo!"}`,
+                defaultValue: `{"${Scratch.translate("Hello, world!")}":"¡Hola, mundo!"}`,
               },
             },
           },
@@ -15726,7 +15723,7 @@ Additionally, do NOT remove the TypeScript comments (//@ts-ignore); it doesn't l
               },
               JSON: {
                 type: Scratch.ArgumentType.STRING,
-                defaultValue: `{${Scratch.translate("Hello, world!")}:"¡Hola, mundo!"}`,
+                defaultValue: `{"${Scratch.translate("Apples and bananas")}":"Manzanas y plátanos"}`,
               },
             },
           },
@@ -15933,7 +15930,7 @@ Additionally, do NOT remove the TypeScript comments (//@ts-ignore); it doesn't l
           Scratch.translate(
             `This button will ${showRecreatableBlocks ? "hide" : "show"} blocks that can be recreated with other extensions or require values set by these blocks.`
           )
-        ); // Explain what the button does
+        );
         if (
           confirm(
             Scratch.translate(
@@ -15997,7 +15994,10 @@ Additionally, do NOT remove the TypeScript comments (//@ts-ignore); it doesn't l
     mergePerLangLocaleJSON(args) {
       let backupLocaleObject = localeObject; // Save a backup in case something breaks
       try {
-        localeObject[args.LANG] = { ...localeObject, ...JSON.parse(args.JSON) };
+        localeObject[args.LANG] = {
+          ...localeObject[args.LANG],
+          ...JSON.parse(args.JSON),
+        };
       } catch {
         localeObject = backupLocaleObject;
       }