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 |
{ 30, NF_DATE_SYS_DDMMYY }, // Default others to DD.MM.YY |
541 |
|
542 |
{ 31, NF_NUMBER_STANDARD, "[$-0411]YYYY年M月D日", LANGUAGE_JAPANESE }, |
543 |
{ 31, NF_NUMBER_STANDARD, "[$-0412]YYYY년 M월 D일", LANGUAGE_KOREAN }, |
544 |
{ 31, NF_NUMBER_STANDARD, "[$-0404]YYYY年M月D日", LANGUAGE_CHINESE_TRADITIONAL }, |
545 |
{ 31, NF_NUMBER_STANDARD, "[$-0804]YYYY年M月D日", LANGUAGE_CHINESE_SIMPLIFIED }, |
546 |
{ 31, NF_DATE_SYS_DDMMYYYY }, // Default others to DD.MM.YYYY |
547 |
|
548 |
{ 32, NF_NUMBER_STANDARD, "[$-0411]HH時MM分", LANGUAGE_JAPANESE }, |
549 |
{ 32, NF_NUMBER_STANDARD, "[$-0412]H시 MM분", LANGUAGE_KOREAN }, |
550 |
{ 32, NF_NUMBER_STANDARD, "[$-0404]HH時MM分", LANGUAGE_CHINESE_TRADITIONAL }, |
551 |
{ 32, NF_NUMBER_STANDARD, "[$-0804]HH时MM分" , LANGUAGE_CHINESE_SIMPLIFIED }, |
552 |
{ 32, NF_TIME_HHMM }, // Default others to hh:mm |
553 |
|
554 |
{ 33, NF_NUMBER_STANDARD, "[$-0411]HH時MM分SS秒", LANGUAGE_JAPANESE }, |
555 |
{ 33, NF_NUMBER_STANDARD, "[$-0412]H시 MM분 SS초", LANGUAGE_KOREAN }, |
556 |
{ 33, NF_NUMBER_STANDARD, "[$-0404]HH時MM分SS秒", LANGUAGE_CHINESE_TRADITIONAL }, |
557 |
{ 33, NF_NUMBER_STANDARD, "[$-0804]HH时MM分SS秒", LANGUAGE_CHINESE_SIMPLIFIED }, |
558 |
{ 33, NF_TIME_HHMMSS }, // Default others to hh:mm:ss |
539 |
// --- |
559 |
// --- |
540 |
{ 37, NF_NUMBER_STANDARD, "#,##0 _$;-#,##0 _$", }, |
560 |
{ 37, NF_NUMBER_STANDARD, "#,##0 _$;-#,##0 _$", }, |
541 |
{ 38, NF_NUMBER_STANDARD, "#,##0 _$;[RED]-#,##0 _$" }, |
561 |
{ 38, NF_NUMBER_STANDARD, "#,##0 _$;[RED]-#,##0 _$" }, |
Lines 548-556
Link Here
|
548 |
{ 48, NF_NUMBER_STANDARD, "##0.0E+0" }, |
568 |
{ 48, NF_NUMBER_STANDARD, "##0.0E+0" }, |
549 |
{ 49, NF_TEXT }, // @ |
569 |
{ 49, NF_TEXT }, // @ |
550 |
// 50...??? international formats |
570 |
// 50...??? international formats |
551 |
{ 56, NF_NUMBER_STANDARD, "[$-0411]M月D日", LANGUAGE_JAPANESE }, |
571 |
{ 55, NF_NUMBER_STANDARD, "[$-0411]YYYY年M月", LANGUAGE_JAPANESE }, |
552 |
{ 57, NF_NUMBER_STANDARD, "[$-030411]GE.M.D", LANGUAGE_JAPANESE }, |
572 |
{ 55, NF_NUMBER_STANDARD, "[$-0412]YYYY-M-D", LANGUAGE_KOREAN }, |
553 |
{ 58, NF_NUMBER_STANDARD, "[$-030411]GGGE年M月D日",LANGUAGE_JAPANESE } |
573 |
{ 55, NF_NUMBER_STANDARD, "[$-0404]AM/PM HH時MM分", LANGUAGE_CHINESE_TRADITIONAL }, |
|
|
574 |
{ 55, NF_NUMBER_STANDARD, "[$-0804]AM/PM HH时MM分", LANGUAGE_CHINESE_SIMPLIFIED }, |
575 |
{ 55, NF_DATE_SYS_DDMMYYYY }, // Default others to DD.MM.YYYY |
576 |
|
577 |
{ 56, NF_NUMBER_STANDARD, "[$-0411]M月D日", LANGUAGE_JAPANESE }, |
578 |
// unable to locate Korean |
579 |
{ 56, NF_NUMBER_STANDARD, "[$-0404]AM/PM HH時MM分SS秒", LANGUAGE_CHINESE_TRADITIONAL }, |
580 |
{ 56, NF_NUMBER_STANDARD, "[$-0804]AM/PM HH时MM分SS秒", LANGUAGE_CHINESE_SIMPLIFIED }, |
581 |
{ 56, NF_DATE_SYS_DDMMYYYY }, // Default others to DD.MM.YYYY |
582 |
|
583 |
{ 57, NF_NUMBER_STANDARD, "[$-030411]GE.M.D", LANGUAGE_JAPANESE }, |
584 |
{ 57, NF_NUMBER_STANDARD, "[$-0412]YYYY年 M月 D日", LANGUAGE_KOREAN }, |
585 |
{ 57, NF_NUMBER_STANDARD, "[$-0404]YYYY/M/D", LANGUAGE_CHINESE_TRADITIONAL }, |
586 |
{ 57, NF_NUMBER_STANDARD, "[$-0804]YYYY年M日", LANGUAGE_CHINESE_SIMPLIFIED }, |
587 |
{ 57, NF_DATE_SYS_DDMMYYYY }, // Default others to DD.MM.YYYY |
588 |
|
589 |
{ 58, NF_NUMBER_STANDARD, "[$-030411]GGGE年M月D日", LANGUAGE_JAPANESE }, |
590 |
{ 58, NF_NUMBER_STANDARD, "[$-0412]M-D", LANGUAGE_KOREAN }, |
591 |
{ 58, NF_NUMBER_STANDARD, "[$-0404]YYYY年M月D日", LANGUAGE_CHINESE_TRADITIONAL }, |
592 |
{ 58, NF_NUMBER_STANDARD, "[$-0804]M月D日", LANGUAGE_CHINESE_SIMPLIFIED } , |
593 |
{ 58, NF_DATE_SYS_DDMMYYYY } // Default others to DD.MM.YYYY |
554 |
}; |
594 |
}; |
555 |
|
595 |
|
556 |
|
596 |
|
Lines 632-640
Link Here
|
632 |
{ |
672 |
{ |
633 |
if( pCurr->mpFormat ) |
673 |
if( pCurr->mpFormat ) |
634 |
{ |
674 |
{ |
635 |
aFormat = String( pCurr->mpFormat, RTL_TEXTENCODING_UTF8 ); |
675 |
if(pCurr->eLanguage == LANGUAGE_SYSTEM || pCurr->eLanguage == GetLanguage()) |
636 |
GetFormatter().PutandConvertEntry( aFormat, nCheckPos, nType, nKey, |
676 |
{ |
637 |
LANGUAGE_ENGLISH_US, pCurr->eLanguage ); |
677 |
aFormat = String( pCurr->mpFormat, RTL_TEXTENCODING_UTF8 ); |
|
|
678 |
GetFormatter().PutandConvertEntry( aFormat, nCheckPos, nType, |
679 |
nKey, LANGUAGE_ENGLISH_US, pCurr->eLanguage ); |
680 |
} |
681 |
else |
682 |
continue; |
638 |
} |
683 |
} |
639 |
else |
684 |
else |
640 |
nKey = GetFormatter().GetFormatIndex( pCurr->meOffset, pCurr->eLanguage ); |
685 |
nKey = GetFormatter().GetFormatIndex( pCurr->meOffset, pCurr->eLanguage ); |