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

Jump to bottom

Allow console name to be translated #3700

Merged
merged 8 commits into from Dec 11, 2020
Merged

Allow console name to be translated #3700

merged 8 commits into from Dec 11, 2020

Conversation

Haarolean
Copy link
Contributor

@Haarolean Haarolean commented Oct 3, 2020 •
edited

Fixes #2756.

Notes:

  • I've kept original name for internal purposes (storing bans, etc), just in case user wants to rename it to something unbearable;
  • User can message console via both names (since he can try both, duh);
  • Some refactoring. Just a little.

Octol1ttle
Octol1ttle suggested changes Oct 3, 2020
View reviewed changes
Copy link
Contributor

@Octol1ttle Octol1ttle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend you turn off auto-formatting while PR-ing something. We all have different codestyles, but it's best to keep the original one

@mdcfe mdcfe added status: needs manual rebase Needs a manual local rebase due to base changes (regardless of what GH says) type: enhancement Features and feature requests. labels Oct 5, 2020
@Haarolean
Merge remote-tracking branch 'upstream/2.x' into feature/2756
99aa104 
# Conflicts:
#	Essentials/src/com/earth2me/essentials/Console.java
#	Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
#	Essentials/src/com/earth2me/essentials/commands/Commandban.java
#	Essentials/src/com/earth2me/essentials/commands/Commandbanip.java
#	Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
#	Essentials/src/com/earth2me/essentials/commands/Commandtempbanip.java
@Haarolean Haarolean requested a review from pop4959 October 5, 2020 09:11
@Haarolean
Copy link
Contributor Author

@md678685 would you remove the rebase label please? I've rebased already.

@JRoy JRoy removed the status: needs manual rebase Needs a manual local rebase due to base changes (regardless of what GH says) label Oct 8, 2020
@Haarolean Haarolean requested a review from JRoy November 24, 2020 10:19
JRoy
JRoy requested changes Nov 24, 2020
View reviewed changes
Copy link
Member

@JRoy JRoy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops see above requested changes

@Haarolean @JRoy
Review fix++
8f33943 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
@Haarolean Haarolean requested a review from JRoy November 24, 2020 16:05
JRoy
JRoy approved these changes Nov 24, 2020
View reviewed changes
Copy link
Member

@JRoy JRoy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good for merge after gradle pr

@Chew Chew added status: needs manual rebase Needs a manual local rebase due to base changes (regardless of what GH says) and removed hacktoberfest-accepted labels Nov 26, 2020
@mdcfe mdcfe added this to the 2.19.0 milestone Nov 27, 2020
@mdcfe mdcfe removed the status: needs manual rebase Needs a manual local rebase due to base changes (regardless of what GH says) label Dec 11, 2020
@mdcfe mdcfe changed the title Console name i18n Allow console name to be translated Dec 11, 2020
@mdcfe mdcfe merged commit 450da59 into EssentialsX:2.x Dec 11, 2020
@Haarolean Haarolean deleted the feature/2756 branch December 16, 2020 12:35
DarkEyeDragon pushed a commit to DarkEyeDragon/Essentials that referenced this pull request Dec 24, 2020
@Haarolean @DarkEyeDragon
Allow console name to be translated (EssentialsX#3700)
d65498a 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>

Closes EssentialsX#2756. 

Notes:
- I've kept original name for internal purposes (storing bans, etc), just in case user wants to rename it to something unbearable;
- User can message console via both names (since he can try both, duh);
- Some refactoring. Just a little.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Octol1ttle Octol1ttle Octol1ttle requested changes

@mdcfe mdcfe mdcfe approved these changes

@JRoy JRoy JRoy approved these changes

@pop4959 pop4959 Awaiting requested review from pop4959

Assignees
No one assigned
Labels
type: enhancement Features and feature requests.
Projects
None yet
Milestone
2.19.0
Development

Successfully merging this pull request may close these issues.

"Console" title in locale file
6 participants
@Haarolean @mdcfe @JRoy @pop4959 @Octol1ttle @Chew