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

New Campaign Project: Adding Separate New Campaign Initialization Messages #3507

Merged
merged 1 commit into from
Nov 26, 2022
+4 −2
Merged

New Campaign Project: Adding Separate New Campaign Initialization Messages #3507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions MekHQ/resources/mekhq/resources/GUI.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,9 @@ loadingNameData.text=Loading Name Data...
loadingPlanetaryData.text=Loading Planetary Data...
loadingImageData.text=Loading Image Data...
loadingUnits.text=Loading Unit Data...
initializingNewCampaign.text=Initializing New Campaign...
loadingCampaign.text=Loading Campaign...
applyingNewCampaign.text=Applying New Campaign...
applyingLoadedCampaign.text=Applying Loaded Campaign...
DataLoadingDialog.progress.accessibleDescription=%s Please Wait.
## Exception Messages
Expand Down
4 changes: 2 additions & 2 deletions MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,10 @@ public void propertyChange(final PropertyChangeEvent evt) {
progressBar.setString(resources.getString("loadingUnits.text"));
break;
case 6:
progressBar.setString(resources.getString("loadingCampaign.text"));
progressBar.setString(resources.getString((getCampaignFile() == null) ? "initializingNewCampaign.text" : "loadingCampaign.text"));
break;
case 7:
progressBar.setString(resources.getString("applyingLoadedCampaign.text"));
progressBar.setString(resources.getString((getCampaignFile() == null) ? "applyingNewCampaign.text" : "applyingLoadedCampaign.text"));
break;
default:
progressBar.setString(resources.getString("Error.text"));
Expand Down