mirror of
https://github.com/HMCL-dev/HMCL.git
synced 2025-08-04 03:46:57 -04:00
localized some items in English.
This commit is contained in:
parent
626cc2f6ed
commit
73a9fbb1c4
@ -4,6 +4,7 @@ public class RefreshRequest {
|
|||||||
|
|
||||||
public String clientToken;
|
public String clientToken;
|
||||||
public String accessToken;
|
public String accessToken;
|
||||||
|
public GameProfile selectedProfile;
|
||||||
public boolean requestUser = true;
|
public boolean requestUser = true;
|
||||||
|
|
||||||
public RefreshRequest(String accessToken, String clientToken) {
|
public RefreshRequest(String accessToken, String clientToken) {
|
||||||
|
@ -106,7 +106,7 @@ public class YggdrasilAuthentication {
|
|||||||
|
|
||||||
if (StrUtils.isNotBlank(getAuthenticatedToken())) {
|
if (StrUtils.isNotBlank(getAuthenticatedToken())) {
|
||||||
if (StrUtils.isBlank(getUserId()))
|
if (StrUtils.isBlank(getUserId()))
|
||||||
if (StrUtils.isNotBlank(username))
|
if (StrUtils.isBlank(username))
|
||||||
userid = username;
|
userid = username;
|
||||||
else
|
else
|
||||||
throw new AuthenticationException(C.i18n("login.invalid_uuid_and_username"));
|
throw new AuthenticationException(C.i18n("login.invalid_uuid_and_username"));
|
||||||
@ -125,9 +125,8 @@ public class YggdrasilAuthentication {
|
|||||||
|
|
||||||
if (StrUtils.isNotBlank(response.error)) {
|
if (StrUtils.isNotBlank(response.error)) {
|
||||||
HMCLog.err("Failed to log in, the auth server returned an error: " + response.error + ", message: " + response.errorMessage + ", cause: " + response.cause);
|
HMCLog.err("Failed to log in, the auth server returned an error: " + response.error + ", message: " + response.errorMessage + ", cause: " + response.cause);
|
||||||
if (response.errorMessage.contains("Invalid token")) {
|
if (response.errorMessage.contains("Invalid token"))
|
||||||
response.errorMessage = C.i18n("login.invalid_token");
|
response.errorMessage = C.i18n("login.invalid_token");
|
||||||
}
|
|
||||||
throw new AuthenticationException("Request error: " + response.errorMessage);
|
throw new AuthenticationException("Request error: " + response.errorMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -617,7 +617,9 @@
|
|||||||
</Container>
|
</Container>
|
||||||
<Component class="javax.swing.JButton" name="btnAddMod">
|
<Component class="javax.swing.JButton" name="btnAddMod">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="text" type="java.lang.String" value="添加"/>
|
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||||
|
<ResourceString bundle="org/jackhuang/hellominecraft/launcher/I18N.properties" key="mods.add" replaceFormat="C.i18n("{key}")"/>
|
||||||
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
<Events>
|
<Events>
|
||||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnAddModActionPerformed"/>
|
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnAddModActionPerformed"/>
|
||||||
@ -625,7 +627,9 @@
|
|||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JButton" name="btnRemoveMod">
|
<Component class="javax.swing.JButton" name="btnRemoveMod">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="text" type="java.lang.String" value="删除"/>
|
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||||
|
<ResourceString bundle="org/jackhuang/hellominecraft/launcher/I18N.properties" key="mods.remove" replaceFormat="C.i18n("{key}")"/>
|
||||||
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
<Events>
|
<Events>
|
||||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnRemoveModActionPerformed"/>
|
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnRemoveModActionPerformed"/>
|
||||||
|
@ -677,14 +677,14 @@ public class GameSettingsPanel extends javax.swing.JPanel implements DropTargetL
|
|||||||
jScrollPane1.setViewportView(lstExternalMods);
|
jScrollPane1.setViewportView(lstExternalMods);
|
||||||
lstExternalMods.getColumnModel().getSelectionModel().setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
|
lstExternalMods.getColumnModel().getSelectionModel().setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
|
||||||
|
|
||||||
btnAddMod.setText("添加");
|
btnAddMod.setText(C.i18n("mods.add")); // NOI18N
|
||||||
btnAddMod.addActionListener(new java.awt.event.ActionListener() {
|
btnAddMod.addActionListener(new java.awt.event.ActionListener() {
|
||||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||||
btnAddModActionPerformed(evt);
|
btnAddModActionPerformed(evt);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
btnRemoveMod.setText("删除");
|
btnRemoveMod.setText(C.i18n("mods.remove")); // NOI18N
|
||||||
btnRemoveMod.addActionListener(new java.awt.event.ActionListener() {
|
btnRemoveMod.addActionListener(new java.awt.event.ActionListener() {
|
||||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||||
btnRemoveModActionPerformed(evt);
|
btnRemoveModActionPerformed(evt);
|
||||||
|
@ -51,6 +51,7 @@ public final class NetUtils {
|
|||||||
|
|
||||||
public static String getStreamContent(InputStream is, String encoding)
|
public static String getStreamContent(InputStream is, String encoding)
|
||||||
throws IOException {
|
throws IOException {
|
||||||
|
if (is == null) return null;
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
try (InputStreamReader br = new InputStreamReader(is, encoding)) {
|
try (InputStreamReader br = new InputStreamReader(is, encoding)) {
|
||||||
int len;
|
int len;
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
package org.jackhuang.hellominecraft.version;
|
package org.jackhuang.hellominecraft.version;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import org.jackhuang.hellominecraft.C;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@ -28,8 +27,4 @@ public class MinecraftRemoteVersions {
|
|||||||
public ArrayList<MinecraftRemoteVersion> versions;
|
public ArrayList<MinecraftRemoteVersion> versions;
|
||||||
public MinecraftRemoteLatestVersion latest;
|
public MinecraftRemoteLatestVersion latest;
|
||||||
|
|
||||||
public static MinecraftRemoteVersions fromJson(String s) {
|
|
||||||
return C.gson.fromJson(s, MinecraftRemoteVersions.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -210,6 +210,8 @@ settings.failed_load=\u8bbe\u7f6e\u6587\u4ef6\u52a0\u8f7d\u5931\u8d25\uff0c\u53e
|
|||||||
mods=Mod\u7ba1\u7406
|
mods=Mod\u7ba1\u7406
|
||||||
mods.choose_mod=\u9009\u62e9\u6a21\u7ec4
|
mods.choose_mod=\u9009\u62e9\u6a21\u7ec4
|
||||||
mods.failed=\u6dfb\u52a0\u5931\u8d25
|
mods.failed=\u6dfb\u52a0\u5931\u8d25
|
||||||
|
mods.add=\u6dfb\u52a0
|
||||||
|
mods.remove=\u5220\u9664
|
||||||
mods.default_information=<html><font color=#c0392b>\u5b89\u88c5Mod\u524d\u4f60\u9700\u8981\u786e\u4fdd\u5df2\u5b89\u88c5Forge\u6216LiteLoader!<br>\u60a8\u53ef\u4ee5\u4ece\u8d44\u6e90\u7ba1\u7406\u5668\u62d6\u52a8mod\u6587\u4ef6\u5230\u5217\u8868\u4e2d\u6765\u6dfb\u52a0mod\uff0c\u540c\u65f6\u4f7f\u7528\u5220\u9664\u952e\u53ef\u5feb\u901f\u5220\u9664\u9009\u4e2dmod<br>\u70b9\u6389mod\u524d\u9762\u7684\u52fe\u53ef\u7981\u7528mod\uff0c\u4e0d\u4f1a\u52a0\u8f7d\uff1b\u9009\u62e9mod\u53ef\u4ee5\u83b7\u53d6mod\u4fe1\u606f</font></html>
|
mods.default_information=<html><font color=#c0392b>\u5b89\u88c5Mod\u524d\u4f60\u9700\u8981\u786e\u4fdd\u5df2\u5b89\u88c5Forge\u6216LiteLoader!<br>\u60a8\u53ef\u4ee5\u4ece\u8d44\u6e90\u7ba1\u7406\u5668\u62d6\u52a8mod\u6587\u4ef6\u5230\u5217\u8868\u4e2d\u6765\u6dfb\u52a0mod\uff0c\u540c\u65f6\u4f7f\u7528\u5220\u9664\u952e\u53ef\u5feb\u901f\u5220\u9664\u9009\u4e2dmod<br>\u70b9\u6389mod\u524d\u9762\u7684\u52fe\u53ef\u7981\u7528mod\uff0c\u4e0d\u4f1a\u52a0\u8f7d\uff1b\u9009\u62e9mod\u53ef\u4ee5\u83b7\u53d6mod\u4fe1\u606f</font></html>
|
||||||
|
|
||||||
advancedsettings=\u9ad8\u7ea7\u8bbe\u7f6e
|
advancedsettings=\u9ad8\u7ea7\u8bbe\u7f6e
|
||||||
|
@ -210,6 +210,8 @@ settings.failed_load=Failed to load settings file. Remove it?
|
|||||||
mods=Mods
|
mods=Mods
|
||||||
mods.choose_mod=Choose your mods
|
mods.choose_mod=Choose your mods
|
||||||
mods.failed=Failed to add mods
|
mods.failed=Failed to add mods
|
||||||
|
mods.add=Add
|
||||||
|
mods.remove=Remove
|
||||||
mods.default_information=<html><font color=#c0392b>Please ensure that you have installed Forge or LiteLoader before installing mods!<br>You can drop your mod files from explorer/finder, and delete mods by the delete button.<br>Disable a mod by leaving the check box unchecked; Choose an item to get the information.</font></html>
|
mods.default_information=<html><font color=#c0392b>Please ensure that you have installed Forge or LiteLoader before installing mods!<br>You can drop your mod files from explorer/finder, and delete mods by the delete button.<br>Disable a mod by leaving the check box unchecked; Choose an item to get the information.</font></html>
|
||||||
|
|
||||||
advancedsettings=Advanced
|
advancedsettings=Advanced
|
||||||
|
@ -210,6 +210,8 @@ settings.failed_load=\u8a2d\u5b9a\u6587\u4ef6\u52a0\u8f09\u5931\u6557\uff0c\u53e
|
|||||||
mods=Mod\u7ba1\u7406
|
mods=Mod\u7ba1\u7406
|
||||||
mods.choose_mod=\u9009\u62e9\u6a21\u7ec4
|
mods.choose_mod=\u9009\u62e9\u6a21\u7ec4
|
||||||
mods.failed=\u6dfb\u52a0\u5931\u8d25
|
mods.failed=\u6dfb\u52a0\u5931\u8d25
|
||||||
|
mods.add=\u6dfb\u52a0
|
||||||
|
mods.remove=\u522a\u9664
|
||||||
mods.default_information=<html>\u60a8\u53ef\u4ee5\u62d6\u52a8mod\u5230\u5217\u8868\u4e2d\u6765\u6dfb\u52a0mod\uff0c\u540c\u65f6\u4f7f\u7528\u5220\u9664\u952e\u53ef\u5feb\u901f\u5220\u9664\u9009\u4e2dmod<br>\u9009\u62e9mod\u53ef\u4ee5\u83b7\u53d6mod\u4fe1\u606f</html>
|
mods.default_information=<html>\u60a8\u53ef\u4ee5\u62d6\u52a8mod\u5230\u5217\u8868\u4e2d\u6765\u6dfb\u52a0mod\uff0c\u540c\u65f6\u4f7f\u7528\u5220\u9664\u952e\u53ef\u5feb\u901f\u5220\u9664\u9009\u4e2dmod<br>\u9009\u62e9mod\u53ef\u4ee5\u83b7\u53d6mod\u4fe1\u606f</html>
|
||||||
|
|
||||||
advancedsettings=\u9ad8\u7d1a\u8a2d\u5b9a
|
advancedsettings=\u9ad8\u7d1a\u8a2d\u5b9a
|
@ -3164,7 +3164,7 @@ implements MonitorThread.MonitorThreadListener, Event<Integer> {
|
|||||||
javax.swing.JTable table = MainWindow.this.lstDownloads;
|
javax.swing.JTable table = MainWindow.this.lstDownloads;
|
||||||
DefaultTableModel model = (DefaultTableModel) table.getModel();
|
DefaultTableModel model = (DefaultTableModel) table.getModel();
|
||||||
|
|
||||||
MinecraftRemoteVersions v = MinecraftRemoteVersions.fromJson(task.getResult());
|
MinecraftRemoteVersions v = C.gson.fromJson(task.getResult(), MinecraftRemoteVersions.class);
|
||||||
for (MinecraftRemoteVersion ver : v.versions) {
|
for (MinecraftRemoteVersion ver : v.versions) {
|
||||||
String[] line = new String[4];
|
String[] line = new String[4];
|
||||||
line[0] = ver.id;
|
line[0] = ver.id;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user