MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-69425 (era format specifier substitution for Windows)

Browse Source
This commit is contained in:
Roman Shevchenko
2015-06-29 12:45:15 +03:00
parent deb0741b48
commit d7d064799e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/text/DateFormatUtil.java
+10 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -424,15 +424,15 @@ public class DateFormatUtil {
rv = kernel32.GetLocaleInfoEx(Kernel32.LOCALE_NAME_USER_DEFAULT, Kernel32.LOCALE_SSHORTDATE, data, dataSize);
assert rv > 1 : kernel32.GetLastError();
String shortDate = new String(data.getCharArray(0, rv - 1));
String shortDate = fixWindowsFormat(new String(data.getCharArray(0, rv - 1)));
rv = kernel32.GetLocaleInfoEx(Kernel32.LOCALE_NAME_USER_DEFAULT, Kernel32.LOCALE_SSHORTTIME, data, dataSize);
assert rv > 1 : kernel32.GetLastError();
String shortTime = StringUtil.replace(new String(data.getCharArray(0, rv - 1)), "tt", "a");
String shortTime = fixWindowsFormat(new String(data.getCharArray(0, rv - 1)));
rv = kernel32.GetLocaleInfoEx(Kernel32.LOCALE_NAME_USER_DEFAULT, Kernel32.LOCALE_STIMEFORMAT, data, dataSize);
assert rv > 1 : kernel32.GetLastError();
String mediumTime = StringUtil.replace(new String(data.getCharArray(0, rv - 1)), "tt", "a");
String mediumTime = fixWindowsFormat(new String(data.getCharArray(0, rv - 1)));
formats[0] = new SimpleDateFormat(shortDate);
formats[1] = new SimpleDateFormat(shortTime);
@@ -441,4 +441,10 @@ public class DateFormatUtil {
return true;
}
private static String fixWindowsFormat(String format) {
format = format.replaceAll("g+", "G");
format = StringUtil.replace(format, "tt", "a");
return format;
}
}