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.

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

[i18n] Remaining GlowServer messages #883

Merged
merged 13 commits into from Mar 27, 2018

Conversation

Projects
None yet
3 participants
@Pr0methean
Contributor

Pr0methean commented Mar 26, 2018

No description provided.

@@ -397,7 +397,7 @@
private WorldStorageProviderFactory storageProviderFactory = null;
/**
* Whether the server should just generate and load configuration files, then exit.
*
*

This comment has been minimized.

@momothereal
@@ -1306,7 +1324,7 @@ public void addAdvancement(Advancement advancement) {
/**
* Creates an {@link AdvancementsMessage} containing a list of advancements the server has,
* along with some extra actions.
*
*

This comment has been minimized.

@momothereal
@@ -1323,7 +1341,7 @@ public AdvancementsMessage createAdvancementsMessage(boolean clear, List<Namespa
/**
* Creates an {@link AdvancementsMessage} containing a given list of advancements, along with
* some extra actions.
*
*

This comment has been minimized.

@momothereal
* <p>Currently, this value is set to {@code VANILLA}.
*
* @return the server type.
*/
public String getServerType() {
return "VANILLA";
return strings.getString("glowstone.server-type.vanilla");

This comment has been minimized.

@momothereal

momothereal Mar 26, 2018

Member

I don't think this should be mutable

This comment has been minimized.

@mastercoms

mastercoms Mar 26, 2018

Member

It's used in packets, so yes, it should not be localized.

This comment has been minimized.

@Pr0methean

Pr0methean Mar 26, 2018

Contributor

Reverted.

Pr0methean added some commits Mar 26, 2018

@@ -2537,7 +2537,7 @@ public String getConsoleLogDateFormat() {
/**
* Gets the server type.
*
* <p>Currently, this value is set to {@code VANILLA}.
* <p>Currently, this value is set to {@code VANILLA} and is not localized.

This comment has been minimized.

@mastercoms

mastercoms Mar 27, 2018

Member

I don't like this doc addition. It's like specifying an enum's members are not localized, since this is essentially what the server type string is. It can be BUKKIT for Bukkit+Forge modded servers, VANILLA for non-Forge servers or FML for Forge servers. If you want, you can add that to the documentation.

This comment has been minimized.

@Pr0methean

Pr0methean Mar 27, 2018

Contributor

Rewritten.

This comment has been minimized.

@Pr0methean

Pr0methean Mar 27, 2018

Contributor

Note that StatusRequestHandler includes the server type in its output, in a form that AFAICT is likely to be displayed to players, so the explanation isn't as simple as for an enum value's name.

This comment has been minimized.

@mastercoms

mastercoms Mar 27, 2018

Member

Yes, the client takes the server type and then displays a name according to that type. For example, BUKKIT -> Bukkit modded server IIRC.

This comment has been minimized.

@Pr0methean

Pr0methean Mar 27, 2018

Contributor

So it can still be localized client-side? Rewritten accordingly.

This comment has been minimized.

@Pr0methean

Pr0methean Mar 27, 2018

Contributor

And I assume that localizing to client-side "Bukkit modded server" implies a modded client? I don't remember Mojang officially acknowledging the existence of Bukkit.

This comment has been minimized.

@mastercoms

mastercoms Mar 27, 2018

Member

Yes, this is not part of the standard protocol, it's for Forge clients.

Pr0methean added some commits Mar 27, 2018

@mastercoms mastercoms merged commit 363916c into GlowstoneMC:dev Mar 27, 2018

2 checks passed

ci/circleci: build Your tests passed on CircleCI!
Details
license/cla Contributor License Agreement is signed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment