Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI text #4648

Closed
wants to merge 16 commits into from
Closed

UI text #4648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8fca18e
Added tooltips for Campaign Properties dialog import/export button gr…
bubblobill Jan 11, 2024
ea32960
Removed debugging locale check.
bubblobill Jan 11, 2024
e96374d
Test should now pass
bubblobill Jan 12, 2024
7c7e29a
Merge branch 'RPTools:develop' into UI_Text
bubblobill Jan 13, 2024
05a60b4
Trying again from the top.
bubblobill Jan 13, 2024
1582804
String cleaning
bubblobill Jan 13, 2024
560cae3
Spelling, Grammar, and key camel case fixes
bubblobill Jan 13, 2024
72b3cca
spottified
bubblobill Jan 13, 2024
77fca35
Added a i18n key that is not used anywhere, yet its absence causes th…
bubblobill Jan 13, 2024
3959c18
I will beat this
bubblobill Jan 13, 2024
5e0731d
Spelling, Grammar, and key camel case fixes
bubblobill Jan 13, 2024
e8f6829
spottified
bubblobill Jan 13, 2024
5ca8f1f
Campaign Properties Dialog:
bubblobill Jan 13, 2024
8b17c0e
Merge branch 'UI_Text' of https://github.com/bubblobill/maptool into …
bubblobill Jan 13, 2024
ace8ce6
Scavenger hunt for typos, ellipsis, trailing colons
bubblobill Jan 17, 2024
aae04d6
Scavenger hunt for typos, ellipsis, trailing colons
bubblobill Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/main/java/net/rptools/maptool/client/macro/impl/AddTokenStateMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
@MacroDefinition(
name = "addtokenstate",
aliases = {"tsa"},
description = "addtokenstate.description")
description = "addTokenState.description")
public class AddTokenStateMacro implements Macro {

/** The element that contains the token state name */
Expand Down Expand Up @@ -77,7 +77,7 @@ public void execute(MacroContext context, String aMacro, MapToolMacroContext exe
// Split the command line into an array and get the tokens
String[] tokens = aMacro.split("\\s");
if (tokens.length < 2) {
MapTool.addLocalMessage(I18N.getText("addtokenstate.param"));
MapTool.addLocalMessage(I18N.getText("addTokenState.param"));
return;
} // endif
String name = tokens[NAME];
Expand All @@ -87,7 +87,7 @@ public void execute(MacroContext context, String aMacro, MapToolMacroContext exe

// Check for a duplicate name
if (MapTool.getCampaign().getTokenStatesMap().get(name) != null) {
MapTool.addLocalMessage(I18N.getText("addtokenstate.exists"));
MapTool.addLocalMessage(I18N.getText("addTokenState.exists"));
return;
} // endif

Expand All @@ -111,15 +111,15 @@ public void execute(MacroContext context, String aMacro, MapToolMacroContext exe
} else if (overlay.equals("triangle")) {
tokenOverlay = createTriangleOverlay(name, param1, param2);
} else {
MapTool.addLocalMessage(I18N.getText("addtokenstate.noOverlyType", overlay));
MapTool.addLocalMessage(I18N.getText("addTokenState.noOverlayType", overlay));
return;
} // endif
} catch (IllegalArgumentException e) {
MapTool.addLocalMessage(e.getMessage());
return;
}
MapTool.getCampaign().getTokenStatesMap().put(tokenOverlay.getName(), tokenOverlay);
MapTool.addLocalMessage(I18N.getText("addtokenstate.added", tokenOverlay.getName()));
MapTool.addLocalMessage(I18N.getText("addTokenState.added", tokenOverlay.getName()));
}

/**
Expand Down Expand Up @@ -245,7 +245,7 @@ private Color findColor(String name) {
return Color.decode(name);
} catch (NumberFormatException e) {
if (!MapToolUtil.isValidColor(name.toLowerCase())) {
throw new IllegalArgumentException(I18N.getText("addtokenstate.invalidColor", name), e);
throw new IllegalArgumentException(I18N.getText("addTokenState.invalidColor", name), e);
} // endif
return MapToolUtil.getColor(name);
} // endtry
Expand All @@ -264,7 +264,7 @@ private int findInteger(String name, int defaultValue) {
try {
return Integer.parseInt(name);
} catch (NumberFormatException e) {
throw new IllegalArgumentException(I18N.getText("addtokenstate.invalidNumber", name), e);
throw new IllegalArgumentException(I18N.getText("addTokenState.invalidNumber", name), e);
} // endtry
}

Expand All @@ -281,7 +281,7 @@ private Quadrant findCorner(String name) {
return Quadrant.valueOf(name.toUpperCase());
} catch (IllegalArgumentException e) {
if (!CORNER_MAP.containsKey(name.toLowerCase())) {
throw new IllegalArgumentException(I18N.getText("addtokenstate.invalidCorner", name), e);
throw new IllegalArgumentException(I18N.getText("addTokenState.invalidCorner", name), e);
} // endif
return CORNER_MAP.get(name);
} // endtry
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/macro/impl/UndefinedMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
public class UndefinedMacro implements Macro {

public void execute(MacroContext context, String macro, MapToolMacroContext executionContext) {
MapTool.addLocalMessage(I18N.getText("undefinedmacro.unknownCommand", macro));
MapTool.addLocalMessage(I18N.getText("undefinedMacro.unknownCommand", macro));
}
}
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/macro/impl/WhisperReplyMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
@MacroDefinition(
name = "reply",
aliases = {"rep"},
description = "whisperreply.description")
description = "whisperReply.description")
public class WhisperReplyMacro extends AbstractMacro {
public void execute(MacroContext context, String message, MapToolMacroContext executionContext) {
String playerName = MapTool.getLastWhisperer();
if (playerName == null) {
MapTool.addMessage(
TextMessage.me(
context.getTransformationHistory(), I18N.getString("whisperreply.noTarget")));
context.getTransformationHistory(), I18N.getString("whisperReply.noTarget")));
return;
}
// Validate
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/swing/TextFieldEditorButtonTableCellEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public TextFieldEditorButtonTableCellEditor() {
}
})
.show(
I18N.getText("campaignProperties.macroEditDialog.default.title"),
I18N.getText("CampaignProperties.macroEditDialog.default.title"),
textField.getText()));
panel.add(button);
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/rptools/maptool/client/swing/TopologyModeSelectionPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@ public TopologyModeSelectionPanel() {
Zone.TopologyType.WALL_VBL,
Icons.TOOLBAR_TOPOLOGY_TYPE_VBL_ON,
Icons.TOOLBAR_TOPOLOGY_TYPE_VBL_OFF,
"tools.topology_mode_selection.vbl.tooltip",
"tools.topology_mode_selection.vb.tooltip",
initiallySelectedTypes);
createAndAddModeButton(
Zone.TopologyType.HILL_VBL,
Icons.TOOLBAR_TOPOLOGY_TYPE_HILL_ON,
Icons.TOOLBAR_TOPOLOGY_TYPE_HILL_OFF,
"tools.topology_mode_selection.hill_vbl.tooltip",
"tools.topology_mode_selection.hill_vb.tooltip",
initiallySelectedTypes);
createAndAddModeButton(
Zone.TopologyType.PIT_VBL,
Icons.TOOLBAR_TOPOLOGY_TYPE_PIT_ON,
Icons.TOOLBAR_TOPOLOGY_TYPE_PIT_OFF,
"tools.topology_mode_selection.pit_vbl.tooltip",
"tools.topology_mode_selection.pit_vb.tooltip",
initiallySelectedTypes);
createAndAddModeButton(
Zone.TopologyType.COVER_VBL,
Expand All @@ -78,7 +78,7 @@ public TopologyModeSelectionPanel() {
Zone.TopologyType.MBL,
Icons.TOOLBAR_TOPOLOGY_TYPE_MBL_ON,
Icons.TOOLBAR_TOPOLOGY_TYPE_MBL_OFF,
"tools.topology_mode_selection.mbl.tooltip",
"tools.topology_mode_selection.mb.tooltip",
initiallySelectedTypes);

this.add(Box.createHorizontalStrut(5));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/tool/AI_UseVblTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void updateButtonState() {

@Override
public String getTooltip() {
return "tools.ignore_vbl_on_move.tooltip";
return "tools.ignore_vb_on_move.tooltip";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/tool/drawing/DiamondExposeTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public boolean isAvailable() {

@Override
public String getInstructions() {
return "tool.rectexpose.instructions";
return "tool.rectExpose.instructions";
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/tool/drawing/DiamondTopologyTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ public boolean isAvailable() {

@Override
public String getInstructions() {
return "tool.isorectangletopology.instructions";
return "tool.isoRectangleTopology.instructions";
}

@Override
public String getTooltip() {
return "tool.isorectangletopology.tooltip";
return "tool.isoRectangleTopology.tooltip";
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/tool/drawing/HollowDiamondTopologyTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ public boolean isAvailable() {

@Override
public String getInstructions() {
return "tool.isorectangletopology.instructions";
return "tool.isoRectangleTopology.instructions";
}

@Override
public String getTooltip() {
return "tool.isorectangletopologyhollow.tooltip";
return "tool.isoRectangleTopologyHollow.tooltip";
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/tool/drawing/HollowRectangleTopologyTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ public boolean isAvailable() {

@Override
public String getInstructions() {
return "tool.recttopology.instructions";
return "tool.rectTopology.instructions";
}

@Override
public String getTooltip() {
return "tool.recttopologyhollow.tooltip";
return "tool.rectTopologyHollow.tooltip";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/tool/drawing/PolyLineTopologyTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public PolyLineTopologyTool() {}

@Override
public String getTooltip() {
return "tool.polylinetopo.tooltip";
return "tool.polylineTopology.tooltip";
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/tool/drawing/PolygonExposeTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ public boolean isAvailable() {

@Override
public String getTooltip() {
return "tool.polyexpose.tooltip";
return "tool.polygonExpose.tooltip";
}

@Override
public String getInstructions() {
return "tool.polyexpose.instructions";
return "tool.polylineExpose.instructions";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/tool/drawing/RadiusCellTemplateTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ public String getTooltip() {
*/
@Override
public String getInstructions() {
return "tool.radiustemplate.instructions";
return "tool.radiusTemplate.instructions";
}

/*---------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/tool/drawing/RadiusTemplateTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,15 +376,15 @@ protected void attachTo(ZoneRenderer renderer) {
*/
@Override
public String getTooltip() {
return "tool.radiustemplate.tooltip";
return "tool.radiusTemplate.tooltip";
}

/**
* @see Tool#getInstructions()
*/
@Override
public String getInstructions() {
return "tool.radiustemplate.instructions";
return "tool.radiusTemplate.instructions";
}

/*---------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/tool/drawing/RectangleExposeTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public boolean isAvailable() {

@Override
public String getInstructions() {
return "tool.rectexpose.instructions";
return "tool.rectExpose.instructions";
}

@Override
Expand Down Expand Up @@ -86,6 +86,6 @@ protected void completeDrawable(GUID zoneId, Pen pen, Drawable drawable) {

@Override
public String getTooltip() {
return "tool.rectexpose.tooltip";
return "tool.rectExpose.tooltip";
}
}
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/tool/drawing/RectangleTopologyTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ public boolean isAvailable() {

@Override
public String getInstructions() {
return "tool.recttopology.instructions";
return "tool.rectTopology.instructions";
}

@Override
public String getTooltip() {
return "tool.recttopology.tooltip";
return "tool.rectTopology.tooltip";
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/tool/drawing/WallTemplateTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ protected AbstractTemplate createBaseTemplate() {
*/
@Override
public String getTooltip() {
return "tool.walltemplate.tooltip";
return "tool.wallTemplate.tooltip";
}

/**
* @see Tool#getInstructions()
*/
@Override
public String getInstructions() {
return "tool.walltemplate.instructions";
return "tool.wallTemplate.instructions";
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/tool/gridtool/AdjustGridControlPanelView.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="net/rptools/maptool/language/i18n" key="GridControlPanel.sizeInPixels"/>
<text resource-bundle="net/rptools/maptool/language/i18n" key="GridControlPanel.size"/>
<toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.maps.gridSize.tooltip"/>
</properties>
</component>
Expand All @@ -32,7 +32,7 @@
<properties>
<horizontalAlignment value="4"/>
<name value="gridSecondDimensionLabel"/>
<text resource-bundle="net/rptools/maptool/language/i18n" key="GridControlPanel.sizeInPixels.second"/>
<text resource-bundle="net/rptools/maptool/language/i18n" key="GridControlPanel.size.second"/>
</properties>
</component>
<component id="fc376" class="javax.swing.JTextField">
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/ui/AbstractTokenPopupMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,9 +1001,9 @@ public void actionPerformed(ActionEvent e) {
public JMenuItem asJMenuItem() {
JMenuItem jMenuItem = new JMenuItem(this);
if (selectedTokenSet.size() > 1) {
jMenuItem.setToolTipText(I18N.getText("token.popup.menu.edit.toomany.tooltip"));
jMenuItem.setToolTipText(I18N.getText("token.popup.menu.edit.tooMany.tooltip"));
} else if (!MapTool.getPlayer().isGM() && MapTool.getServerPolicy().isTokenEditorLocked()) {
jMenuItem.setToolTipText(I18N.getText("token.popup.menu.edit.notallowed.tooltip"));
jMenuItem.setToolTipText(I18N.getText("token.popup.menu.edit.notAllowed.tooltip"));
}
return jMenuItem;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/ui/AppMenuBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public AppMenuBar() {
createMinimizeButton(
Icons.TOOLBAR_HIDE_ON,
Icons.TOOLBAR_HIDE_OFF,
I18N.getText("tools.hidetoolbar.tooltip"),
I18N.getText("tools.unhidetoolbar.tooltip")));
I18N.getText("tools.hideToolbar.tooltip"),
I18N.getText("tools.unhideToolbar.tooltip")));
}

// This is a hack to allow the menubar shortcut keys to still work even
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rptools/maptool/client/ui/ToolbarPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public ToolbarPanel(Toolbox tbox) {
Icons.TOOLBAR_TOPOLOGY_ON,
Icons.TOOLBAR_TOPOLOGY_OFF,
createTopologyPanel(),
I18N.getText("tools.topo.tooltip"));
I18N.getText("tools.topology.tooltip"));
add(topologyButton);

optionPanelSeparator = addSeparator(this, 21);
Expand Down Expand Up @@ -239,7 +239,7 @@ private JToggleButton createPointerGroupButton() {
}

public JButton createZoneSelectionButton() {
String title = I18N.getText("tools.zoneselector.tooltip");
String title = I18N.getText("tools.zoneSelector.tooltip");

final JButton button = new JButton(title, RessourceManager.getBigIcon(Icons.TOOLBAR_ZONE));
button.setToolTipText(title);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/ui/addon/AddOnLibrariesDialogView.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
<properties>
<enabled value="true"/>
<font style="1"/>
<text resource-bundle="net/rptools/maptool/language/i18n" key="library.dialog.addon.giturl"/>
<text resource-bundle="net/rptools/maptool/language/i18n" key="library.dialog.addon.gitURL"/>
</properties>
</component>
<component id="bce02" class="javax.swing.JLabel" binding="addOnGitUrlLabel">
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/ui/addresource/AddResourcesDialogView.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
</constraints>
<properties>
<font name="SansSerif" size="11" style="1"/>
<text resource-bundle="net/rptools/maptool/language/i18n" key="Label.url2"/>
<text resource-bundle="net/rptools/maptool/language/i18n" key="Label.url"/>
</properties>
</component>
<component id="dc371" class="javax.swing.JTextField">
Expand Down
Loading