Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 152260

Browse Source 
AMPM order needs to be cared in time format
UNIX/Linux only: check AMPM order at strftime("%X")
r=yokoyama,sr=blizzard
This commit is contained in:
katakai%japan.sun.com 2002-06-19 02:32:43 +00:00
parent 51485e7f9d
commit 98912adc03
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
intl/locale/src/unix/nsDateTimeFormatUnix.cpp
View File

@ -135,12 +135,12 @@ nsresult nsDateTimeFormatUnix::Initialize(nsILocale* locale)
}
}
mLocalePreferred24hour = LocalePreferred24hour();
LocalePreferred24hour();
return res;
}
PRBool nsDateTimeFormatUnix::LocalePreferred24hour()
void nsDateTimeFormatUnix::LocalePreferred24hour()
{
char str[100];
time_t tt;
@ -156,14 +156,24 @@ PRBool nsDateTimeFormatUnix::LocalePreferred24hour()
char *temp = setlocale(LC_TIME, mPlatformLocale);
strftime(str, (size_t)99, "%X", (struct tm *)tmc);
(void) setlocale(LC_TIME, temp);
for (i=0; str[i]; i++)
mLocalePreferred24hour = PR_FALSE;
for (i=0; str[i]; i++) {
if (str[i] == '2') { // if there is any '2', that locale use 0-23 time format
return PR_TRUE;
mLocalePreferred24hour = PR_TRUE;
break;
}
}
return PR_FALSE;
mLocaleAMPMfirst = PR_TRUE;
if (mLocalePreferred24hour == PR_FALSE) {
if (str[0] && str[0] == '1') { // if the first character is '1' of 10:00,
// AMPM string is located after 10:00
mLocaleAMPMfirst = PR_FALSE;
}
}
}
nsresult nsDateTimeFormatUnix::FormatTime(nsILocale* locale,
@ -219,12 +229,12 @@ nsresult nsDateTimeFormatUnix::FormatTMTime(nsILocale* locale,
break;
case kTimeFormatSeconds:
PL_strncpy(fmtT,
mLocalePreferred24hour ? "%H:%M:%S" : "%I:%M:%S %p",
mLocalePreferred24hour ? "%H:%M:%S" : mLocaleAMPMfirst ? "%p %I:%M:%S" : "%I:%M:%S %p",
NSDATETIME_FORMAT_BUFFER_LEN);
break;
case kTimeFormatNoSeconds:
PL_strncpy(fmtT,
mLocalePreferred24hour ? "%H:%M" : "%I:%M %p",
mLocalePreferred24hour ? "%H:%M" : mLocaleAMPMfirst ? "%p %I:%M" : "%I:%M %p",
NSDATETIME_FORMAT_BUFFER_LEN);
break;
case kTimeFormatSecondsForce24Hour:

3
intl/locale/src/unix/nsDateTimeFormatUnix.h
View File

@ -74,13 +74,14 @@ private:
// init this interface to a specified locale
NS_IMETHOD Initialize(nsILocale* locale);
PRBool LocalePreferred24hour();
void LocalePreferred24hour();
nsString mLocale;
nsString mAppLocale;
nsString mCharset; // in order to convert API result to unicode
char mPlatformLocale[kPlatformLocaleLength+1]; // for setlocale
PRBool mLocalePreferred24hour; // true if 24 hour format is preferred by current locale
PRBool mLocaleAMPMfirst; // true if AM/PM string is preferred before the time
nsCOMPtr <nsIUnicodeDecoder> mDecoder;
};