Skip to content

Commit

Permalink
Updated translations
Browse files Browse the repository at this point in the history
  • Loading branch information
MisterJulsen committed Dec 14, 2024
1 parent f0c65a8 commit 3147046
Show file tree
Hide file tree
Showing 40 changed files with 2,475 additions and 713 deletions.
10 changes: 5 additions & 5 deletions common/src/main/java/de/mrjulsen/crn/client/ClientWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import de.mrjulsen.crn.client.gui.screen.TrainDebugScreen;
import de.mrjulsen.crn.client.gui.screen.TrainSectionSettingsScreen;
import de.mrjulsen.crn.client.gui.widgets.ResizableButton;
import de.mrjulsen.crn.client.lang.ELanguage;
import de.mrjulsen.crn.client.lang.CustomLanguage;
import de.mrjulsen.crn.config.ModClientConfig;
import de.mrjulsen.crn.data.schedule.condition.DynamicDelayCondition;
import de.mrjulsen.crn.data.schedule.condition.TrainSeparationCondition;
Expand Down Expand Up @@ -55,7 +55,7 @@

public class ClientWrapper {

private static ELanguage currentLanguage;
private static CustomLanguage currentLanguage;
private static Language currentClientLanguage;

public static void showNavigatorGui() {
Expand All @@ -75,14 +75,14 @@ public static void showAdvancedDisplaySettingsScreen(AdvancedDisplayBlockEntity
DLScreen.setScreen(new AdvancedDisplaySettingsScreen(blockEntity));
}

public static void updateLanguage(ELanguage lang, boolean force) {
public static void updateLanguage(CustomLanguage lang, boolean force) {
if (currentLanguage == lang && !force) {
return;
}

LanguageInfo info = lang == ELanguage.DEFAULT ? null : Minecraft.getInstance().getLanguageManager().getLanguage(lang.getCode());
LanguageInfo info = lang == CustomLanguage.DEFAULT ? null : Minecraft.getInstance().getLanguageManager().getLanguage(lang.getCode());
currentLanguage = lang;
if (lang == ELanguage.DEFAULT || info == null) {
if (lang == CustomLanguage.DEFAULT || info == null) {
currentClientLanguage = Language.getInstance();
CreateRailwaysNavigator.LOGGER.info("Updated custom language to: (Default)");
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import de.mrjulsen.crn.block.properties.ETimeDisplay;
import de.mrjulsen.crn.block.display.properties.DepartureBoardDisplayTableSettings;
import de.mrjulsen.crn.client.ber.AdvancedDisplayRenderInstance;
import de.mrjulsen.crn.client.lang.ELanguage;
import de.mrjulsen.crn.client.lang.CustomLanguage;
import de.mrjulsen.crn.config.ModClientConfig;
import de.mrjulsen.crn.data.train.TrainStatus.CompiledTrainStatus;
import de.mrjulsen.crn.data.train.portable.StationDisplayData;
Expand Down Expand Up @@ -73,15 +73,15 @@ public class BERDepartureBoardTable implements AbstractAdvancedDisplayRenderer<D
headlines = new BERLabel[LineComponent.values().length];

headlines[LineComponent.TIME.i()] = new BERLabel()
.setText(ELanguage.translate(keyDeparture).withStyle(ChatFormatting.BOLD).withStyle(ChatFormatting.ITALIC))
.setText(CustomLanguage.translate(keyDeparture).withStyle(ChatFormatting.BOLD).withStyle(ChatFormatting.ITALIC))
.setYScale(0.4f)
.setMaxWidth(12.5f, BoundsHitReaction.SCALE_SCROLL)
.setScale(0.4f, 0.2f)
.setPos(0, 3)
.setMaxWidth(0, BoundsHitReaction.CUT_OFF)
;
headlines[LineComponent.TRAIN_NAME.i()] = new BERLabel()
.setText(ELanguage.translate(keyTrain).withStyle(ChatFormatting.BOLD).withStyle(ChatFormatting.ITALIC))
.setText(CustomLanguage.translate(keyTrain).withStyle(ChatFormatting.BOLD).withStyle(ChatFormatting.ITALIC))
.setYScale(0.4f)
.setScrollingSpeed(2)
.setMaxWidth(14, BoundsHitReaction.SCALE_SCROLL)
Expand All @@ -91,23 +91,23 @@ public class BERDepartureBoardTable implements AbstractAdvancedDisplayRenderer<D
;

headlines[LineComponent.PLATFORM.i()] = new BERLabel()
.setText(ELanguage.translate(keyPlatform).withStyle(ChatFormatting.BOLD).withStyle(ChatFormatting.ITALIC))
.setText(CustomLanguage.translate(keyPlatform).withStyle(ChatFormatting.BOLD).withStyle(ChatFormatting.ITALIC))
.setYScale(0.4f)
.setScale(0.4f, 0.2f)
.setPos(0, 3)
.setMaxWidth(0, BoundsHitReaction.CUT_OFF)
;

headlines[LineComponent.DESTINATION.i()] = new BERLabel()
.setText(ELanguage.translate(keyDestination).withStyle(ChatFormatting.BOLD).withStyle(ChatFormatting.ITALIC))
.setText(CustomLanguage.translate(keyDestination).withStyle(ChatFormatting.BOLD).withStyle(ChatFormatting.ITALIC))
.setYScale(0.4f)
.setScrollingSpeed(2)
.setScale(0.4f, 0.2f)
.setPos(0, 3)
.setMaxWidth(0, BoundsHitReaction.CUT_OFF)
;
headlines[LineComponent.STOPOVERS.i()] = new BERLabel()
.setText(ELanguage.translate(keyVia).withStyle(ChatFormatting.BOLD).withStyle(ChatFormatting.ITALIC))
.setText(CustomLanguage.translate(keyVia).withStyle(ChatFormatting.BOLD).withStyle(ChatFormatting.ITALIC))
.setYScale(0.4f)
.setScrollingSpeed(2)
.setScale(0.4f, 0.2f)
Expand Down Expand Up @@ -174,13 +174,13 @@ private Collection<Component> getStatusInfo(AdvancedDisplayBlockEntity blockEnti
}
Collection<Component> content = new ArrayList<>();
if (data.getTrainData().isCancelled()) {
content.add(ELanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.information_about_cancelled", data.getTrainData().getName()));
content.add(CustomLanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.information_about_cancelled", data.getTrainData().getName()));
return content;
}
String delay = getDisplaySettings(blockEntity).getTimeDisplay() == ETimeDisplay.ETA ? ModUtils.timeRemainingString(data.getStationData().getDepartureTimeDeviation()) : String.valueOf(TimeUtils.formatToMinutes(data.getStationData().getDepartureTimeDeviation()));
MutableComponent delayComponent = ELanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.information_about_delayed", data.getTrainData().getName(), delay);
MutableComponent delayComponent = CustomLanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.information_about_delayed", data.getTrainData().getName(), delay);
if (getDisplaySettings(blockEntity).getTimeDisplay() == ETimeDisplay.ABS) {
delayComponent.append(" ").append(ELanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.delay_abs_suffix"));
delayComponent.append(" ").append(CustomLanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.delay_abs_suffix"));
}
content.add(delayComponent);
for (CompiledTrainStatus status : data.getTrainData().getStatus()) {
Expand Down Expand Up @@ -338,7 +338,7 @@ private void updateContent(AdvancedDisplayBlockEntity blockEntity, StationDispla

BERLabel destinationLabel = components[LineComponent.DESTINATION.i()]
.setText(isLast ?
ELanguage.translate("gui." + CreateRailwaysNavigator.MOD_ID + ".schedule_board.train_from", stop.getFirstStopName()) :
CustomLanguage.translate("gui." + CreateRailwaysNavigator.MOD_ID + ".schedule_board.train_from", stop.getFirstStopName()) :
TextUtils.text(stop.getStationData().getDestination()))
;
BERLabel stopoversLabel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import de.mrjulsen.crn.client.CRNGui;
import de.mrjulsen.crn.client.ber.AdvancedDisplayRenderInstance;
import de.mrjulsen.crn.client.gui.ModGuiIcons;
import de.mrjulsen.crn.client.lang.ELanguage;
import de.mrjulsen.crn.client.lang.CustomLanguage;
import de.mrjulsen.crn.config.ModClientConfig;
import de.mrjulsen.crn.data.TrainExitSide;
import de.mrjulsen.crn.data.train.portable.NextConnectionsDisplayData;
Expand Down Expand Up @@ -77,7 +77,7 @@ public class BERPassengerInfoInformative implements AbstractAdvancedDisplayRende
.setYScale(0.2f)
.setCentered(true)
;
private final BERLabel nextConnectionsTitleLabel = new BERLabel(ELanguage.translate(keyNextConnections).withStyle(ChatFormatting.BOLD))
private final BERLabel nextConnectionsTitleLabel = new BERLabel(CustomLanguage.translate(keyNextConnections).withStyle(ChatFormatting.BOLD))
.setPos(3, 5.5f)
.setScale(0.15f, 0.15f)
.setYScale(0.15f)
Expand Down Expand Up @@ -418,7 +418,7 @@ private void updateContent(AdvancedDisplayBlockEntity blockEntity, TrainDisplayD
.setColor((0xFF << 24) | (getDisplaySettings(blockEntity).getFontColor() & 0x00FFFFFF))
;
trainLineLabel
.setText(nextStopAnnounced ? ELanguage.translate(keyNextStop, data.getNextStop().get().getName()) : TextUtils.text((settings.getTrainTextComponents().showTrainName() ? data.getTrainData().getName() + " " : "") + (settings.getTrainTextComponents().showDestination() ? data.getNextStop().get().getDestination() : "")).withStyle(ChatFormatting.BOLD))
.setText(nextStopAnnounced ? CustomLanguage.translate(keyNextStop, data.getNextStop().get().getName()) : TextUtils.text((settings.getTrainTextComponents().showTrainName() ? data.getTrainData().getName() + " " : "") + (settings.getTrainTextComponents().showDestination() ? data.getNextStop().get().getDestination() : "")).withStyle(ChatFormatting.BOLD))
.setMaxWidth(blockEntity.getXSizeScaled() * 16 - 6 - (blockEntity.getXSizeScaled() > 1 && !nextStopAnnounced ? timeLabel.getTextWidth() - 4 : 0) - (blockEntity.getXSizeScaled() > 1 && !nextStopAnnounced ? carriageLabel.getTextWidth() - 5 : 0) - (this.exitSide != TrainExitSide.UNKNOWN ? 4 : 0), BoundsHitReaction.SCALE_SCROLL)
.setColor((0xFF << 24) | (getDisplaySettings(blockEntity).getFontColor() & 0x00FFFFFF))
;
Expand All @@ -428,7 +428,7 @@ private void updateContent(AdvancedDisplayBlockEntity blockEntity, TrainDisplayD
.setColor((0xFF << 24) | (getDisplaySettings(blockEntity).getFontColor() & 0x00FFFFFF))
;
dateLabel
.setText(ELanguage.translate(keyDate, blockEntity.getLevel().getDayTime() / Level.TICKS_PER_DAY, ModUtils.formatTime(DragonLib.getCurrentWorldTime(), getDisplaySettings(blockEntity).getTimeDisplay() == ETimeDisplay.ETA)))
.setText(CustomLanguage.translate(keyDate, blockEntity.getLevel().getDayTime() / Level.TICKS_PER_DAY, ModUtils.formatTime(DragonLib.getCurrentWorldTime(), getDisplaySettings(blockEntity).getTimeDisplay() == ETimeDisplay.ETA)))
.setMaxWidth(blockEntity.getXSizeScaled() * 16 - 6, BoundsHitReaction.CUT_OFF)
.setColor((0xFF << 24) | (getDisplaySettings(blockEntity).getFontColor() & 0x00FFFFFF))
;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import de.mrjulsen.crn.block.display.properties.PassengerInformationScrollingTextSettings;
import de.mrjulsen.crn.client.ber.AdvancedDisplayRenderInstance;
import de.mrjulsen.crn.client.gui.ModGuiIcons;
import de.mrjulsen.crn.client.lang.ELanguage;
import de.mrjulsen.crn.client.lang.CustomLanguage;
import de.mrjulsen.crn.config.ModClientConfig;
import de.mrjulsen.crn.data.TrainExitSide;
import de.mrjulsen.crn.util.ModUtils;
Expand Down Expand Up @@ -124,7 +124,7 @@ public void update(Level level, BlockPos pos, BlockState state, AdvancedDisplayB
} else if (blockEntity.getTrainData().isWaitingAtStation()) {
label.setText(TextUtils.text(blockEntity.getTrainData().getNextStop().get().getName()));
} else if (blockEntity.getTrainData().getNextStop().get().getRealTimeArrivalTime() - DragonLib.getCurrentWorldTime() < ModClientConfig.NEXT_STOP_ANNOUNCEMENT.get()) {
label.setText(ELanguage.translate(keyNextStop, blockEntity.getTrainData().getNextStop().get().getName()));
label.setText(CustomLanguage.translate(keyNextStop, blockEntity.getTrainData().getNextStop().get().getName()));
} else {
final int slides = 3;
int slide = (int)(DragonLib.getCurrentWorldTime() % (TICKS_PER_SLIDE * slides)) / TICKS_PER_SLIDE;
Expand All @@ -142,7 +142,7 @@ public void update(Level level, BlockPos pos, BlockState state, AdvancedDisplayB
? blockEntity.getTrainData().getNextStop().get().getDestination()
: "")));
case 1 -> label
.setText(ELanguage.translate(keyDate, blockEntity.getLevel().getDayTime() / Level.TICKS_PER_DAY,
.setText(CustomLanguage.translate(keyDate, blockEntity.getLevel().getDayTime() / Level.TICKS_PER_DAY,
ModUtils.formatTime(DragonLib.getCurrentWorldTime(), false)));
case 2 -> label.setText(ModUtils.calcSpeedString(blockEntity.getTrainData().getSpeed(),
ModClientConfig.SPEED_UNIT.get()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import de.mrjulsen.crn.block.properties.ETimeDisplay;
import de.mrjulsen.crn.block.display.properties.PlatformDisplayTableSettings;
import de.mrjulsen.crn.client.ber.AdvancedDisplayRenderInstance;
import de.mrjulsen.crn.client.lang.ELanguage;
import de.mrjulsen.crn.client.lang.CustomLanguage;
import de.mrjulsen.crn.config.ModClientConfig;
import de.mrjulsen.crn.data.train.TrainStatus.CompiledTrainStatus;
import de.mrjulsen.crn.data.train.portable.StationDisplayData;
Expand Down Expand Up @@ -71,7 +71,7 @@ public void renderTick(float deltaTime) {
@Override
public void tick(Level level, BlockPos pos, BlockState state, AdvancedDisplayBlockEntity blockEntity, AdvancedDisplayRenderInstance parent) {
timeLabel
.setText(ELanguage.translate(keyTime, ModUtils.formatTime(DragonLib.getCurrentWorldTime(), false)))
.setText(CustomLanguage.translate(keyTime, ModUtils.formatTime(DragonLib.getCurrentWorldTime(), false)))
;
}

Expand Down Expand Up @@ -106,14 +106,14 @@ public void update(Level level, BlockPos pos, BlockState state, AdvancedDisplayB
this.infoLineText = TextUtils.concat(TextUtils.text(" +++ "), preds.stream().limit(maxLines).filter(x -> x.getTrainData().hasStatusInfo() && x.getStationData().isDepartureDelayed()).flatMap(x -> {
Collection<Component> content = new ArrayList<>();
if (x.getTrainData().isCancelled()) {
content.add(ELanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.information_about_cancelled", x.getTrainData().getName()));
content.add(CustomLanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.information_about_cancelled", x.getTrainData().getName()));
return content.stream();
}
String delay = getDisplaySettings(blockEntity).getTimeDisplay() == ETimeDisplay.ETA ? ModUtils.timeRemainingString(x.getStationData().getDepartureTimeDeviation()) : String.valueOf(TimeUtils.formatToMinutes(x.getStationData().getDepartureTimeDeviation()));

MutableComponent delayComponent = ELanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.information_about_delayed", x.getTrainData().getName(), delay);
MutableComponent delayComponent = CustomLanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.information_about_delayed", x.getTrainData().getName(), delay);
if (getDisplaySettings(blockEntity).getTimeDisplay() == ETimeDisplay.ABS) {
delayComponent.append(" ").append(ELanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.delay_abs_suffix"));
delayComponent.append(" ").append(CustomLanguage.translate("block." + CreateRailwaysNavigator.MOD_ID + ".advanced_display.ber.delay_abs_suffix"));
}
content.add(delayComponent);

Expand Down Expand Up @@ -198,7 +198,7 @@ private void updateContent(AdvancedDisplayBlockEntity blockEntity, StationDispla
;
components[LineComponent.DESTINATION.i()]
.setText(isLast ?
ELanguage.translate("gui." + CreateRailwaysNavigator.MOD_ID + ".schedule_board.train_from", stop.getFirstStopName()) :
CustomLanguage.translate("gui." + CreateRailwaysNavigator.MOD_ID + ".schedule_board.train_from", stop.getFirstStopName()) :
TextUtils.text(stop.getStationData().getDestination()))
;

Expand Down
Loading

0 comments on commit 3147046

Please sign in to comment.