Skip to content

Commit

Permalink
Fix compile error, formatting issue in translation file
Browse files Browse the repository at this point in the history
  • Loading branch information
LostLuma committed Apr 23, 2024
1 parent d103f68 commit 9fd7396
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/main/java/com/terraformersmc/modmenu/ModMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.terraformersmc.modmenu.config.ModMenuConfig.TitleMenuButtonStyle;
import com.terraformersmc.modmenu.config.ModMenuConfigManager;
import com.terraformersmc.modmenu.event.ModMenuEventHandler;
import com.terraformersmc.modmenu.util.TranslationUtil;
import com.terraformersmc.modmenu.util.UpdateCheckerUtil;
import com.terraformersmc.modmenu.util.mod.Mod;
import com.terraformersmc.modmenu.util.mod.fabric.FabricDummyParentMod;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,15 @@ public void render(int mouseX, int mouseY, float delta) {
Map.Entry<String, SortedSet<String>> role = iterator.next();
String roleName = role.getKey();

for (Object line : textRenderer.split(this.creditsRoleText(roleName).buildString(true), wrapWidth - 16)) {
for (Object line : textRenderer.split(this.creditsRoleText(roleName), wrapWidth - 16)) {
this.entries.add(new DescriptionEntry((String) line, indent));
indent = 16;
}

for (String contributor : role.getValue()) {
indent = 16;

for (Object line : textRenderer.split(Text.literal(contributor).buildString(true), wrapWidth - 24)) {
for (Object line : textRenderer.split(contributor, wrapWidth - 24)) {
this.entries.add(new DescriptionEntry((String) line, indent));
indent = 24;
}
Expand Down Expand Up @@ -435,12 +435,12 @@ public void confirmResult(boolean result, int id) {
minecraft.openScreen(this.parent);
}

private Text creditsRoleText(String roleName) {
private String creditsRoleText(String roleName) {
// Replace spaces and dashes in role names with underscores if they exist
// Notably Quilted Fabric API does this with FabricMC as "Upstream Owner"
String translationKey = roleName.replaceAll("[\\s-]", "_").toLowerCase();

return Text.translatable("modmenu.credits.role." + translationKey).append(Text.literal(":"));
return I18n.translate("modmenu.credits.role." + translationKey) + ":";
}

protected class DescriptionEntry implements EntryListWidget.Entry {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/modmenu/lang/nn_NO.lang
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ category.modmenu.name=Mod Menu
key.modmenu.open_menu=Åpne moddmeny
modmenu.title=Modifikasjoner
modmenu.nameTranslation.modmenu=Modifikasjonsmeny
modmenu.descriptionTranslation.modmenu= "modmenu.descriptionTranslation.modmenu": "Legger til en meny for modifikasjoner, for å vise en liste over modder du har installert.
modmenu.descriptionTranslation.modmenu=Legger til en meny for modifikasjoner, for å vise en liste over modder du har installert.
modmenu.loaded=(%s Loaded)
modmenu.loaded.short=(%s)
modmenu.loaded.69.secret=(%s Lastet...nice)
Expand Down

0 comments on commit 9fd7396

Please sign in to comment.