Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-02-21 02:31:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Translation config in json instead of yaml

Browse Source
This commit is contained in:
Vankka 2024-12-28 01:00:51 +02:00
parent 8f639259e5
commit 6498c5af2c
No known key found for this signature in database
GPG Key ID: 62E48025ED4E7EBB
8 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/crowdin-download.yaml vendored
View File

@ -40,7 +40,7 @@ jobs:
project_id: ${{ secrets.CROWDIN_PROJECT_ID }} project_id: ${{ secrets.CROWDIN_PROJECT_ID }}
token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
source: "i18n/build/source.yaml" source: "i18n/build/source.json"
translation: "/i18n/src/main/resources/translations/%two_letters_code%.%file_extension%" translation: "/i18n/src/main/resources/translations/%two_letters_code%.%file_extension%"
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

2
.github/workflows/crowdin-upload.yaml vendored
View File

@ -32,7 +32,7 @@ jobs:
project_id: ${{ secrets.CROWDIN_PROJECT_ID }} project_id: ${{ secrets.CROWDIN_PROJECT_ID }}
token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
source: "i18n/build/source.yaml" source: "i18n/build/source.json"
translation: "/i18n/src/main/resources/translations/%two_letters_code%.%file_extension%" translation: "/i18n/src/main/resources/translations/%two_letters_code%.%file_extension%"
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

1
common/build.gradle
View File

@ -79,6 +79,7 @@ dependencies {
// Config // Config
runtimeDownloadApi(libs.configurate.yaml) runtimeDownloadApi(libs.configurate.yaml)
runtimeDownloadApi(libs.configurate.jackson)
// Logging // Logging
compileOnly(libs.log4j.core) compileOnly(libs.log4j.core)

2
common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java
View File

@ -300,7 +300,7 @@ public abstract class ConfigurateConfigManager<T, LT extends AbstractConfigurati
return (value, destination) -> { return (value, destination) -> {
processor.process(value, destination); processor.process(value, destination);
if (destination instanceof CommentedConfigurationNode) { if (commentSubstitutions && destination instanceof CommentedConfigurationNode) {
String comment = ((CommentedConfigurationNode) destination).comment(); String comment = ((CommentedConfigurationNode) destination).comment();
if (comment != null) { if (comment != null) {
// Yaml doesn't render empty lines correctly, so we add a space when there are double line breaks // Yaml doesn't render empty lines correctly, so we add a space when there are double line breaks

4
common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/TranslatedConfigManager.java
View File

@ -25,9 +25,9 @@ import org.jetbrains.annotations.Nullable;
import org.spongepowered.configurate.CommentedConfigurationNode; import org.spongepowered.configurate.CommentedConfigurationNode;
import org.spongepowered.configurate.ConfigurateException; import org.spongepowered.configurate.ConfigurateException;
import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.ConfigurationNode;
import org.spongepowered.configurate.jackson.JacksonConfigurationLoader;
import org.spongepowered.configurate.loader.AbstractConfigurationLoader; import org.spongepowered.configurate.loader.AbstractConfigurationLoader;
import org.spongepowered.configurate.serialize.SerializationException; import org.spongepowered.configurate.serialize.SerializationException;
import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
import java.net.URL; import java.net.URL;
import java.nio.file.Path; import java.nio.file.Path;
@ -127,7 +127,7 @@ public abstract class TranslatedConfigManager<T extends Config, LT extends Abstr
return null; return null;
} }
return YamlConfigurationLoader.builder().url(resourceURL).build().load(); return JacksonConfigurationLoader.builder().url(resourceURL).build().load();
} }
private void translateNode( private void translateNode(

1
i18n/build.gradle
View File

@ -20,6 +20,7 @@ dependencies {
implementation(project(':velocity')) { transitive = false } implementation(project(':velocity')) { transitive = false }
api(libs.configurate.yaml) api(libs.configurate.yaml)
api(libs.configurate.jackson)
} }
application { application {

6
i18n/src/main/java/com/discordsrv/config/DiscordSRVTranslation.java
View File

@ -28,10 +28,10 @@ import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl;
import org.spongepowered.configurate.CommentedConfigurationNode; import org.spongepowered.configurate.CommentedConfigurationNode;
import org.spongepowered.configurate.ConfigurateException; import org.spongepowered.configurate.ConfigurateException;
import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.ConfigurationNode;
import org.spongepowered.configurate.jackson.JacksonConfigurationLoader;
import org.spongepowered.configurate.objectmapping.ObjectMapper; import org.spongepowered.configurate.objectmapping.ObjectMapper;
import org.spongepowered.configurate.objectmapping.meta.Processor; import org.spongepowered.configurate.objectmapping.meta.Processor;
import org.spongepowered.configurate.serialize.SerializationException; import org.spongepowered.configurate.serialize.SerializationException;
import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@ -103,8 +103,8 @@ public final class DiscordSRVTranslation {
section.set(configSection); section.set(configSection);
} }
YamlConfigurationLoader.builder() JacksonConfigurationLoader.builder()
.path(Paths.get("i18n", "build", "source.yaml")) .path(Paths.get("i18n", "build", "source.json"))
.build() .build()
.save(node); .save(node);
} }

3
settings.gradle
View File

@ -83,8 +83,9 @@ dependencyResolutionManagement {
library('jackson-databind', 'com.fasterxml.jackson.core', 'jackson-databind').version('2.16.1') library('jackson-databind', 'com.fasterxml.jackson.core', 'jackson-databind').version('2.16.1')
// Config(urate) // Config(urate)
version('configurate', '4.2.0-yamlbranch-4') version('configurate', '4.2.0-yamlbranch-5')
library('configurate-yaml', 'org.spongepowered', 'configurate-yaml').versionRef('configurate') library('configurate-yaml', 'org.spongepowered', 'configurate-yaml').versionRef('configurate')
library('configurate-jackson', 'org.spongepowered', 'configurate-jackson').versionRef('configurate')
// DB // DB
library('hikaricp', 'com.zaxxer', 'HikariCP').version { library('hikaricp', 'com.zaxxer', 'HikariCP').version {