konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.4.1: fixed date formats varying by locale

Browse Source
This commit is contained in:
Evan Debenham
2022-10-06 17:12:01 -04:00
parent f03deaa11c
commit b105e10ca0
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java
+2 -1
View File
@@ -83,6 +83,7 @@ import com.watabou.utils.SparseArray;
import java.io.IOException; import java.io.IOException;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
@@ -207,7 +208,7 @@ public class Dungeon {
if (daily) { if (daily) {
//Ensures that daily seeds are not in the range of user-enterable seeds //Ensures that daily seeds are not in the range of user-enterable seeds
seed = SPDSettings.lastDaily() + DungeonSeed.TOTAL_SEEDS; seed = SPDSettings.lastDaily() + DungeonSeed.TOTAL_SEEDS;
DateFormat format = DateFormat.getDateInstance(DateFormat.SHORT, Locale.ROOT); DateFormat format = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
format.setTimeZone(TimeZone.getTimeZone("UTC")); format.setTimeZone(TimeZone.getTimeZone("UTC"));
customSeedText = format.format(new Date(SPDSettings.lastDaily())); customSeedText = format.format(new Date(SPDSettings.lastDaily()));
} else if (!SPDSettings.customSeed().isEmpty()){ } else if (!SPDSettings.customSeed().isEmpty()){
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Rankings.java
+2 -1
View File
@@ -45,6 +45,7 @@ import com.watabou.utils.FileUtils;
import java.io.IOException; import java.io.IOException;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@@ -91,7 +92,7 @@ public enum Rankings {
rec.version = ""; rec.version = "";
} }
DateFormat format = DateFormat.getDateInstance(DateFormat.SHORT, Locale.ROOT); DateFormat format = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
rec.date = format.format(new Date(Game.realTime)); rec.date = format.format(new Date(Game.realTime));
rec.cause = cause; rec.cause = cause;
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndDailies.java
+2 -1
View File
@@ -35,6 +35,7 @@ import com.watabou.noosa.ui.Component;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
@@ -95,7 +96,7 @@ public class WndDailies extends Window {
top = (int) score.bottom() + 6; top = (int) score.bottom() + 6;
NumberFormat num = NumberFormat.getInstance(Locale.US); NumberFormat num = NumberFormat.getInstance(Locale.US);
DateFormat format = DateFormat.getDateInstance(DateFormat.SHORT, Locale.ROOT); DateFormat format = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
format.setTimeZone(TimeZone.getTimeZone("UTC")); format.setTimeZone(TimeZone.getTimeZone("UTC"));
Date date = new Date(); Date date = new Date();