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

2.5.0.1 #29

Merged
merged 2 commits into from
Jul 11, 2024
Merged

2.5.0.1 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
227c052
fix(gui): fix the issue where the console cannot be opened
Zmax0 Jul 11, 2024
7de9df7
build(gui): update locales package
Zmax0 Jul 11, 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
4 changes: 3 additions & 1 deletion urban-spork-client-gui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@
<directory>resource</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include><!-- i18n -->
<include>application.properties</include>
</includes>
</resource>
<resource>
<directory>resource</directory>
<targetPath>resource</targetPath>
<excludes>
<exclude>**/*.xml</exclude>
<exclude>**/*.cmd</exclude>
<exclude>application.properties</exclude>
</excludes>
</resource>
</resources>
Expand Down
2 changes: 1 addition & 1 deletion ...lient-gui/resource/language_en.properties → ...ui/resource/locales/console_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ console.label.cipher=Cipher
console.label.protocol=Protocol
console.label.remark=Remark
console.label.proxy.port=Proxy Port
console.validator.required.field.message=Can not be blank
console.validator.required.field.message=Cannot be blank
0 ...lient-gui/resource/language_zh.properties → ...ui/resource/locales/console_zh.properties
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion urban-spork-client-gui/resource/startup.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off
set server="urban-spork-client-gui"
start javaw --add-opens java.base/java.lang.reflect=com.jfoenix --add-opens javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix --add-opens javafx.controls/com.sun.javafx.scene.control=com.jfoenix -jar %server%.jar
start javaw --module-path lib --add-modules javafx.controls --add-modules com.jfoenix --add-opens java.base/java.lang.reflect=com.jfoenix --add-opens javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix --add-opens javafx.controls/com.sun.javafx.scene.control=com.jfoenix -jar %server%.jar
exit
2 changes: 1 addition & 1 deletion urban-spork-client-gui/src/com/urbanspork/client/gui/Resource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class Resource {
}
String language = config.getLanguage();
ResourceBundle bundle;
String baseName = "language";
String baseName = "resource.locales.console";
try {
if (language == null) {
Locale locale = Locale.getDefault();
Expand Down
Loading