Browse Source

Fix separator to avoid extra merge conflicts

pull/13407/head
Andrii Shvaika 1 year ago
parent
commit
09854dcb76
  1. 11
      tools/src/main/java/org/thingsboard/client/tools/i18n/TranslationPruner.java
  2. 13087
      ui-ngx/src/assets/locale/locale.constant-da_DK.json
  3. 11343
      ui-ngx/src/assets/locale/locale.constant-de_DE.json
  4. 15190
      ui-ngx/src/assets/locale/locale.constant-es_ES.json
  5. 11509
      ui-ngx/src/assets/locale/locale.constant-fr_FR.json
  6. 10905
      ui-ngx/src/assets/locale/locale.constant-it_IT.json

11
tools/src/main/java/org/thingsboard/client/tools/i18n/TranslationPruner.java

@ -1,8 +1,14 @@
package org.thingsboard.client.tools.i18n;
import com.fasterxml.jackson.core.FormatFeature;
import com.fasterxml.jackson.core.PrettyPrinter;
import com.fasterxml.jackson.core.util.Separators;
import com.fasterxml.jackson.core.util.Separators.Spacing;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import java.io.File;
import java.io.IOException;
@ -73,8 +79,9 @@ public class TranslationPruner {
throw new IllegalArgumentException("Source JSON must be an object at root");
}
ObjectNode pruned = pruneNode((ObjectNode) sourceRoot, validKeys, "", mapper);
mapper.writerWithDefaultPrettyPrinter().writeValue(destFile, pruned);
Separators seps = Separators.createDefaultInstance()
.withObjectFieldValueSpacing(Spacing.AFTER);
mapper.writer(new DefaultPrettyPrinter().withSeparators(seps)).writeValue(destFile, pruned);
System.out.println("Pruned translation written to " + destFile.getPath());
}
} catch (IOException e) {

13087
ui-ngx/src/assets/locale/locale.constant-da_DK.json

File diff suppressed because it is too large

11343
ui-ngx/src/assets/locale/locale.constant-de_DE.json

File diff suppressed because it is too large

15190
ui-ngx/src/assets/locale/locale.constant-es_ES.json

File diff suppressed because it is too large

11509
ui-ngx/src/assets/locale/locale.constant-fr_FR.json

File diff suppressed because it is too large

10905
ui-ngx/src/assets/locale/locale.constant-it_IT.json

File diff suppressed because it is too large
Loading…
Cancel
Save