Lines 533-541
Link Here
|
533 |
{ 21, NF_TIME_HHMMSS }, // hh:mm:ss |
533 |
{ 21, NF_TIME_HHMMSS }, // hh:mm:ss |
534 |
{ 22, NF_DATETIME_SYSTEM_SHORT_HHMM }, // DD.MM.YYYY hh:mm |
534 |
{ 22, NF_DATETIME_SYSTEM_SHORT_HHMM }, // DD.MM.YYYY hh:mm |
535 |
// 23...36 international formats |
535 |
// 23...36 international formats |
536 |
{ 30, NF_NUMBER_STANDARD, "[$-0411]D/M/YY", LANGUAGE_JAPANESE }, // ??? |
536 |
{ 30, NF_NUMBER_STANDARD, "[$-0411]M/D/YY", LANGUAGE_JAPANESE }, |
537 |
{ 31, NF_NUMBER_STANDARD, "[$-0411]YYYY年M月D日", LANGUAGE_JAPANESE }, |
537 |
{ 30, NF_NUMBER_STANDARD, "[$-0412]M-D-YY", LANGUAGE_KOREAN }, |
538 |
{ 33, NF_NUMBER_STANDARD, "[$-0411]hh時mm分ss秒", LANGUAGE_JAPANESE }, |
538 |
{ 30, NF_NUMBER_STANDARD, "[$-0404]M/D/YY", LANGUAGE_CHINESE_TRADITIONAL }, |
|
|
539 |
{ 30, NF_NUMBER_STANDARD, "[$-0804]M/D/YY", LANGUAGE_CHINESE_SIMPLIFIED }, |
540 |
|
541 |
{ 31, NF_NUMBER_STANDARD, "[$-0411]YYYY年M月D日", LANGUAGE_JAPANESE }, |
542 |
{ 31, NF_NUMBER_STANDARD, "[$-0412]YYYY년 M월 D일", LANGUAGE_KOREAN }, |
543 |
{ 31, NF_NUMBER_STANDARD, "[$-0404]YYYY年M月D日", LANGUAGE_CHINESE_TRADITIONAL }, |
544 |
{ 31, NF_NUMBER_STANDARD, "[$-0804]YYYY年M月D日", LANGUAGE_CHINESE_SIMPLIFIED }, |
545 |
|
546 |
{ 32, NF_NUMBER_STANDARD, "[$-0411]HH時MM分", LANGUAGE_JAPANESE }, |
547 |
{ 32, NF_NUMBER_STANDARD, "[$-0412]H시 MM분", LANGUAGE_KOREAN }, |
548 |
{ 32, NF_NUMBER_STANDARD, "[$-0404]HH時MM分", LANGUAGE_CHINESE_TRADITIONAL }, |
549 |
{ 32, NF_NUMBER_STANDARD, "[$-0804]HH时MM分" , LANGUAGE_CHINESE_SIMPLIFIED }, |
550 |
|
551 |
{ 33, NF_NUMBER_STANDARD, "[$-0411]HH時MM分SS秒", LANGUAGE_JAPANESE }, |
552 |
{ 33, NF_NUMBER_STANDARD, "[$-0412]H시 MM분 SS초", LANGUAGE_KOREAN }, |
553 |
{ 33, NF_NUMBER_STANDARD, "[$-0404]HH時MM分SS秒", LANGUAGE_CHINESE_TRADITIONAL }, |
554 |
{ 33, NF_NUMBER_STANDARD, "[$-0804]HH时MM分SS秒", LANGUAGE_CHINESE_SIMPLIFIED }, |
539 |
// --- |
555 |
// --- |
540 |
{ 37, NF_NUMBER_STANDARD, "#,##0 _$;-#,##0 _$", }, |
556 |
{ 37, NF_NUMBER_STANDARD, "#,##0 _$;-#,##0 _$", }, |
541 |
{ 38, NF_NUMBER_STANDARD, "#,##0 _$;[RED]-#,##0 _$" }, |
557 |
{ 38, NF_NUMBER_STANDARD, "#,##0 _$;[RED]-#,##0 _$" }, |
Lines 548-556
Link Here
|
548 |
{ 48, NF_NUMBER_STANDARD, "##0.0E+0" }, |
564 |
{ 48, NF_NUMBER_STANDARD, "##0.0E+0" }, |
549 |
{ 49, NF_TEXT }, // @ |
565 |
{ 49, NF_TEXT }, // @ |
550 |
// 50...??? international formats |
566 |
// 50...??? international formats |
551 |
{ 56, NF_NUMBER_STANDARD, "[$-0411]M月D日", LANGUAGE_JAPANESE }, |
567 |
{ 55, NF_NUMBER_STANDARD, "[$-0411]YYYY年M月", LANGUAGE_JAPANESE }, |
552 |
{ 57, NF_NUMBER_STANDARD, "[$-030411]GE.M.D", LANGUAGE_JAPANESE }, |
568 |
{ 55, NF_NUMBER_STANDARD, "[$-0412]YYYY-M-D", LANGUAGE_KOREAN }, |
553 |
{ 58, NF_NUMBER_STANDARD, "[$-030411]GGGE年M月D日",LANGUAGE_JAPANESE } |
569 |
{ 55, NF_NUMBER_STANDARD, "[$-0404]AM/PM HH時MM分", LANGUAGE_CHINESE_TRADITIONAL }, |
|
|
570 |
{ 55, NF_NUMBER_STANDARD, "[$-0804]AM/PM HH时MM分", LANGUAGE_CHINESE_SIMPLIFIED }, |
571 |
|
572 |
{ 56, NF_NUMBER_STANDARD, "[$-0411]M月D日", LANGUAGE_JAPANESE }, |
573 |
// unable to locate Korean |
574 |
{ 56, NF_NUMBER_STANDARD, "[$-0404]AM/PM HH時MM分SS秒", LANGUAGE_CHINESE_TRADITIONAL }, |
575 |
{ 56, NF_NUMBER_STANDARD, "[$-0804]AM/PM HH时MM分SS秒", LANGUAGE_CHINESE_SIMPLIFIED }, |
576 |
|
577 |
{ 57, NF_NUMBER_STANDARD, "[$-030411]GE.M.D", LANGUAGE_JAPANESE }, |
578 |
{ 57, NF_NUMBER_STANDARD, "[$-0412]YYYY年 M月 D日", LANGUAGE_KOREAN }, |
579 |
{ 57, NF_NUMBER_STANDARD, "[$-0404]YYYY/M/D", LANGUAGE_CHINESE_TRADITIONAL }, |
580 |
{ 57, NF_NUMBER_STANDARD, "[$-0804]YYYY年M日", LANGUAGE_CHINESE_SIMPLIFIED }, |
581 |
|
582 |
{ 58, NF_NUMBER_STANDARD, "[$-030411]GGGE年M月D日", LANGUAGE_JAPANESE }, |
583 |
{ 58, NF_NUMBER_STANDARD, "[$-0412]M-D", LANGUAGE_KOREAN }, |
584 |
{ 58, NF_NUMBER_STANDARD, "[$-0404]YYYY年M月D日", LANGUAGE_CHINESE_TRADITIONAL }, |
585 |
{ 58, NF_NUMBER_STANDARD, "[$-0804]M月D日", LANGUAGE_CHINESE_SIMPLIFIED } |
554 |
}; |
586 |
}; |
555 |
|
587 |
|
556 |
|
588 |
|
Lines 632-640
Link Here
|
632 |
{ |
664 |
{ |
633 |
if( pCurr->mpFormat ) |
665 |
if( pCurr->mpFormat ) |
634 |
{ |
666 |
{ |
635 |
aFormat = String( pCurr->mpFormat, RTL_TEXTENCODING_UTF8 ); |
667 |
if(pCurr->eLanguage == LANGUAGE_SYSTEM || pCurr->eLanguage == GetLanguage()) |
636 |
GetFormatter().PutandConvertEntry( aFormat, nCheckPos, nType, nKey, |
668 |
{ |
637 |
LANGUAGE_ENGLISH_US, pCurr->eLanguage ); |
669 |
aFormat = String( pCurr->mpFormat, RTL_TEXTENCODING_UTF8 ); |
|
|
670 |
GetFormatter().PutandConvertEntry( aFormat, nCheckPos, nType, |
671 |
nKey, LANGUAGE_ENGLISH_US, pCurr->eLanguage ); |
672 |
} |
673 |
else |
674 |
continue; |
638 |
} |
675 |
} |
639 |
else |
676 |
else |
640 |
nKey = GetFormatter().GetFormatIndex( pCurr->meOffset, pCurr->eLanguage ); |
677 |
nKey = GetFormatter().GetFormatIndex( pCurr->meOffset, pCurr->eLanguage ); |