organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 17:01:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-20475 Japanese Calendar current era calculation should use local time instead of UTC.

Browse source
This commit is contained in:
Jeff Genovy 2019-03-16 14:25:33 -07:00
parent 3d19a928e7
commit e591af3fba
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
icu4c/source/i18n/erarules.cpp
View file

@ -11,6 +11,7 @@
#include "unicode/ucal.h"
#include "unicode/ures.h"
#include "unicode/ustring.h"
#include "unicode/timezone.h"
#include "cmemory.h"
#include "cstring.h"
#include "erarules.h"
@ -290,9 +291,22 @@ int32_t EraRules::getEraIndex(int32_t year, int32_t month, int32_t day, UErrorCo
}
void EraRules::initCurrentEra() {
UDate now = ucal_getNow();
// Compute local wall time in millis using ICU's default time zone.
UErrorCode ec = U_ZERO_ERROR;
UDate localMillis = ucal_getNow();
int32_t rawOffset, dstOffset;
TimeZone* zone = TimeZone::createDefault();
// If we failed to create the default time zone, we are in a bad state and don't
// really have many options. Carry on using UTC millis as a fallback.
if (zone != nullptr) {
zone->getOffset(localMillis, FALSE, rawOffset, dstOffset, ec);
delete zone;
localMillis += (rawOffset + dstOffset);
}
int year, month0, dom, dow, doy, mid;
Grego::timeToFields(now, year, month0, dom, dow, doy, mid);
Grego::timeToFields(localMillis, year, month0, dom, dow, doy, mid);
int currentEncodedDate = encodeDate(year, month0 + 1 /* changes to 1-base */, dom);
int eraIdx = numEras - 1;
while (eraIdx > 0) {
@ -303,7 +317,8 @@ void EraRules::initCurrentEra() {
}
// Note: current era could be before the first era.
// In this case, this implementation returns the first era index (0).
currentEra = eraIdx;}
currentEra = eraIdx;
}
U_NAMESPACE_END
#endif /* #if !UCONFIG_NO_FORMATTING */

3
icu4c/source/i18n/erarules.h
View file

@ -75,7 +75,8 @@ public:
/**
* Gets the current era index. This is calculated only once for an instance of
* EraRules.
* EraRules. The current era calculation is based on the default time zone at
* the time of instantiation.
*
* @return era index of current era (or 0, when current date is before the first era)
*/