From 7d48d439b6bce033335b336cf6f4ae702beb35a3 Mon Sep 17 00:00:00 2001 From: modmuss Date: Tue, 14 Jan 2025 13:45:03 +0000 Subject: [PATCH] Sort & format language files (#4360) --- build.gradle | 8 ++++++++ .../fabric-gamerule-test/lang/en_us.json | 7 +++---- .../resources/assets/fabric/lang/en_us.json | 2 +- .../lang/en_us.json | 4 ++-- .../lang/en_us.json | 4 ++-- .../lang/en_us.json | 2 +- .../fabric-registry-sync-v0/lang/en_us.json | 20 +++++++++---------- .../fabric-resource-loader-v0/lang/en_us.json | 8 ++++---- .../fabric-tag-api-v1-testmod/lang/en_us.json | 2 +- 9 files changed, 32 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index ae35a7cfb6..91b20a15bd 100644 --- a/build.gradle +++ b/build.gradle @@ -267,6 +267,14 @@ allprojects { indentWithTabs() trimTrailingWhitespace() } + + // Sort the en_us translation files + // The other languages are handled by Crowdin + json { + target 'src/**/lang/en_us.json' + targetExclude 'src/**/generated/**' + gson().indentWithSpaces(2).sortByKeys() + } } checkstyle { diff --git a/fabric-game-rule-api-v1/src/testmod/resources/assets/fabric-gamerule-test/lang/en_us.json b/fabric-game-rule-api-v1/src/testmod/resources/assets/fabric-gamerule-test/lang/en_us.json index b26f453c33..8a2f1b4a7a 100644 --- a/fabric-game-rule-api-v1/src/testmod/resources/assets/fabric-gamerule-test/lang/en_us.json +++ b/fabric-game-rule-api-v1/src/testmod/resources/assets/fabric-gamerule-test/lang/en_us.json @@ -1,17 +1,16 @@ { "gamerule.cardinalDirection": "Random Cardinal Direction Very Long Title", "gamerule.cardinalDirection.description": "A cardinal direction. Should never be up or down", + "gamerule.cardinalDirection.east": "Eastbound", "gamerule.cardinalDirection.north": "Northbound", "gamerule.cardinalDirection.south": "Southbound", - "gamerule.cardinalDirection.east": "Eastbound", "gamerule.cardinalDirection.west": "Westbound", - "gamerule.redSleepFailureEnum": "Why I didn't go to bed", "gamerule.redSleepFailureEnum.description": "Bed bugs are nasty man.", "gamerule.redSleepFailureEnum.not_possible_here": "Not here", "gamerule.redSleepFailureEnum.not_possible_now": "Not now", - "gamerule.redSleepFailureEnum.too_far_away": "Too far away", + "gamerule.redSleepFailureEnum.not_safe": "Not safe", "gamerule.redSleepFailureEnum.obstructed": "Obstructed", "gamerule.redSleepFailureEnum.other_problem": "Other problem", - "gamerule.redSleepFailureEnum.not_safe": "Not safe" + "gamerule.redSleepFailureEnum.too_far_away": "Too far away" } diff --git a/fabric-item-group-api-v1/src/main/resources/assets/fabric/lang/en_us.json b/fabric-item-group-api-v1/src/main/resources/assets/fabric/lang/en_us.json index 35c4d8b127..5dedb80c53 100644 --- a/fabric-item-group-api-v1/src/main/resources/assets/fabric/lang/en_us.json +++ b/fabric-item-group-api-v1/src/main/resources/assets/fabric/lang/en_us.json @@ -1,3 +1,3 @@ { "fabric.gui.creativeTabPage": "Page %d/%d" -} \ No newline at end of file +} diff --git a/fabric-key-binding-api-v1/src/testmodClient/resources/assets/fabric-keybindings-v1-testmod/lang/en_us.json b/fabric-key-binding-api-v1/src/testmodClient/resources/assets/fabric-keybindings-v1-testmod/lang/en_us.json index f678d522df..4a33fc1246 100644 --- a/fabric-key-binding-api-v1/src/testmodClient/resources/assets/fabric-keybindings-v1-testmod/lang/en_us.json +++ b/fabric-key-binding-api-v1/src/testmodClient/resources/assets/fabric-keybindings-v1-testmod/lang/en_us.json @@ -3,6 +3,6 @@ "key.category.second.test": "Second Test Category", "key.fabric-key-binding-api-v1-testmod.test_keybinding_1": "Test 1", "key.fabric-key-binding-api-v1-testmod.test_keybinding_2": "Test 2", - "key.fabric-key-binding-api-v1-testmod.test_keybinding_sticky": "Sticky Test", - "key.fabric-key-binding-api-v1-testmod.test_keybinding_duplicate": "Duplicate Test" + "key.fabric-key-binding-api-v1-testmod.test_keybinding_duplicate": "Duplicate Test", + "key.fabric-key-binding-api-v1-testmod.test_keybinding_sticky": "Sticky Test" } diff --git a/fabric-networking-api-v1/src/testmod/resources/assets/fabric-networking-api-v1-testmod/lang/en_us.json b/fabric-networking-api-v1/src/testmod/resources/assets/fabric-networking-api-v1-testmod/lang/en_us.json index e8773318a1..0c0921f6b6 100644 --- a/fabric-networking-api-v1/src/testmod/resources/assets/fabric-networking-api-v1-testmod/lang/en_us.json +++ b/fabric-networking-api-v1/src/testmod/resources/assets/fabric-networking-api-v1-testmod/lang/en_us.json @@ -1,5 +1,5 @@ { "key.category.fabric-networking-api-v1-testmod": "Fabric Network Test", - "key.fabric-networking-api-v1-testmod.test": "Send test packet", - "key.fabric-networking-api-v1-testmod.open": "Open channel tester" + "key.fabric-networking-api-v1-testmod.open": "Open channel tester", + "key.fabric-networking-api-v1-testmod.test": "Send test packet" } diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/lang/en_us.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/lang/en_us.json index 174bf682d7..6c30ebdb49 100644 --- a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/lang/en_us.json +++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/lang/en_us.json @@ -3,7 +3,7 @@ "block.fabric-object-builder-api-v1-testmod.first_multi_betrayal_block": "First Multi Betrayal Block", "block.fabric-object-builder-api-v1-testmod.initial_betrayal_block": "Initial Betrayal Block", "block.fabric-object-builder-api-v1-testmod.second_multi_betrayal_block": "Second Multi Betrayal Block", - "block.fabric-object-builder-api-v1-testmod.teal_sign": "Teal Sign", "block.fabric-object-builder-api-v1-testmod.teal_hanging_sign": "Teal Hanging Sign", + "block.fabric-object-builder-api-v1-testmod.teal_sign": "Teal Sign", "text.fabric-object-builder-api-v1-testmod.block_entity_type_success": "Betrayal block at %s has correct block entity type: %s" } diff --git a/fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/en_us.json b/fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/en_us.json index c71e2a916f..e05ed18caa 100644 --- a/fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/en_us.json +++ b/fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/en_us.json @@ -1,12 +1,12 @@ { - "fabric-registry-sync-v0.unknown-remote.title.singular" : "Received a registry entry that is unknown to this client.\n", - "fabric-registry-sync-v0.unknown-remote.title.plural" : "Received %d registry entries that are unknown to this client.\n", - "fabric-registry-sync-v0.unknown-remote.subtitle.1" : "This is usually caused by a mismatched mod set between the client and server.", - "fabric-registry-sync-v0.unknown-remote.subtitle.2" : " See the client logs for more details.\nThe following registry entry namespaces may be related:\n\n", - "fabric-registry-sync-v0.unknown-remote.footer" : "And %d more...", - "fabric-registry-sync-v0.unknown-registry.title.singular" : "Received a registry that is unknown to this client.\n", - "fabric-registry-sync-v0.unknown-registry.title.plural" : "Received %d registries that are unknown to this client.\n", - "fabric-registry-sync-v0.unknown-registry.subtitle.1" : "This is usually caused by a mismatched mod set between the client and server.", - "fabric-registry-sync-v0.unknown-registry.subtitle.2" : " See the client logs for more details.\nThe following registries are not present on the client:\n\n", - "fabric-registry-sync-v0.unknown-registry.footer" : "And %d more..." + "fabric-registry-sync-v0.unknown-registry.footer": "And %d more...", + "fabric-registry-sync-v0.unknown-registry.subtitle.1": "This is usually caused by a mismatched mod set between the client and server.", + "fabric-registry-sync-v0.unknown-registry.subtitle.2": " See the client logs for more details.\nThe following registries are not present on the client:\n\n", + "fabric-registry-sync-v0.unknown-registry.title.plural": "Received %d registries that are unknown to this client.\n", + "fabric-registry-sync-v0.unknown-registry.title.singular": "Received a registry that is unknown to this client.\n", + "fabric-registry-sync-v0.unknown-remote.footer": "And %d more...", + "fabric-registry-sync-v0.unknown-remote.subtitle.1": "This is usually caused by a mismatched mod set between the client and server.", + "fabric-registry-sync-v0.unknown-remote.subtitle.2": " See the client logs for more details.\nThe following registry entry namespaces may be related:\n\n", + "fabric-registry-sync-v0.unknown-remote.title.plural": "Received %d registry entries that are unknown to this client.\n", + "fabric-registry-sync-v0.unknown-remote.title.singular": "Received a registry entry that is unknown to this client.\n" } diff --git a/fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/en_us.json b/fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/en_us.json index 892c6fe421..a15e0613f3 100644 --- a/fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/en_us.json +++ b/fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/en_us.json @@ -1,9 +1,9 @@ { + "commands.datapack.fabric.internal": "Cannot enable or disable Fabric internal pack \"%s\".", "pack.description.modResources": "Mod resources.", - "pack.source.fabricmod": "Fabric mod", - "pack.source.builtinMod": "built-in: %s", "pack.name.fabricMod": "Fabric Mod \"%s\"", - "pack.name.fabricMods": "Fabric Mods", "pack.name.fabricMod.subPack": "Fabric Mod \"%s\" (%s)", - "commands.datapack.fabric.internal": "Cannot enable or disable Fabric internal pack \"%s\"." + "pack.name.fabricMods": "Fabric Mods", + "pack.source.builtinMod": "built-in: %s", + "pack.source.fabricmod": "Fabric mod" } diff --git a/fabric-tag-api-v1/src/testmod/resources/assets/fabric-tag-api-v1-testmod/lang/en_us.json b/fabric-tag-api-v1/src/testmod/resources/assets/fabric-tag-api-v1-testmod/lang/en_us.json index af3ea0f849..27b1bf080d 100644 --- a/fabric-tag-api-v1/src/testmod/resources/assets/fabric-tag-api-v1-testmod/lang/en_us.json +++ b/fabric-tag-api-v1/src/testmod/resources/assets/fabric-tag-api-v1-testmod/lang/en_us.json @@ -1,6 +1,6 @@ { - "tag.block.fabric-tag-api-v1-testmod.bricks": "Bricks", "tag.block.fabric-tag-api-v1-testmod.brick_blocks": "Brick Blocks", + "tag.block.fabric-tag-api-v1-testmod.bricks": "Bricks", "tag.block.fabric-tag-api-v1-testmod.more_brick_blocks": "More Brick Blocks", "tag.item.fabric-tag-api-v1-testmod.beetroots": "Beetroots", "tag.item.fabric-tag-api-v1-testmod.expensive_rocks": "Expensive Rocks",