diff options
| author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2007-08-25 22:10:37 +0000 |
|---|---|---|
| committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2007-08-25 22:10:37 +0000 |
| commit | d848bb68f5decd453c17d787cd1adaf8b2cbddce (patch) | |
| tree | 377097a08b7faee0060e38da9ce90d4dc3ea2f10 | |
| parent | c3f988f4e914d2579a5fb068695e18078c4a0b9f (diff) | |
| download | fpc-d848bb68f5decd453c17d787cd1adaf8b2cbddce.tar.gz | |
Merged revisions 8288 via svnmerge from
svn+ssh://joost@svn.freepascal.org/FPC/svn/fpc/trunk
........
r8288 | Almindor | 2007-08-16 11:58:35 +0200 (do, 16 aug 2007) | 2 lines
* fix bug 9438
........
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_2@8309 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | rtl/objpas/sysutils/dati.inc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/rtl/objpas/sysutils/dati.inc b/rtl/objpas/sysutils/dati.inc index e4bebe20b0..6173e60951 100644 --- a/rtl/objpas/sysutils/dati.inc +++ b/rtl/objpas/sysutils/dati.inc @@ -371,9 +371,16 @@ begin n := 0; for i := 1 to length(s) do begin - if (s[i] in ['0'..'9']) then + if s[i] in ['0'..'9'] then s1 := s1 + s[i]; - if (s[i] in [dateseparator,' ']) or ((i = length(s)) and (s[i] in ['0'..'9'])) then + + { space can be part of the shortdateformat, and is defaultly in slovak + windows, therefor it shouldn't be taken as separator (unless so specified) + and ignored } + if (DateSeparator <> ' ') and (s[i] = ' ') then + Continue; + + if (s[i] = dateseparator) or ((i = length(s)) and (s[i] in ['0'..'9'])) then begin inc(n); if n>3 then |