This closes qax-os#1885,add more langNumFmtFunc

Signed-off-by: wushiling50 <2531010934@qq.com>
wushiling50 · May 13, 2024 · 4ff2ffb · 4ff2ffb
1 parent cc1290b
commit 4ff2ffb
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/numfmt.go b/numfmt.go
@@ -4797,17 +4797,10 @@ func (f *File) langNumFmtFuncKoKR(numFmtID int) string {
 // langNumFmtFuncThTH returns number format code by given date and time pattern
 // for country code th-th.
 func (f *File) langNumFmtFuncThTH(numFmtID int) string {
-<<<<<<< HEAD
- if f.options.ShortDatePattern != "" {
- return f.options.ShortDatePattern
- }
- if f.options.LongTimePattern != "" {
-=======
  if numFmtID == 71 && f.options.ShortDatePattern != "" {
  return f.options.ShortDatePattern
  }
  if numFmtID == 76 && f.options.LongTimePattern != "" {
->>>>>>> f26dbfd (This closes #1885,add more langNumFmtFunc)
  return f.options.LongTimePattern
  }
  return langNumFmt["th-th"][numFmtID]