From: Ian Lynagh Date: Sat, 19 May 2007 13:26:38 +0000 (+0000) Subject: System.Locale is now split out X-Git-Tag: 2007-09-13~86 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=1a293bde8704156dcc7edd01a67b6b38bf38f5f9;hp=25762c88856e4d1d53fb442f333399d904d6f152;p=ghc-base.git System.Locale is now split out --- diff --git a/System/Locale.hs b/System/Locale.hs deleted file mode 100644 index f2b21b7..0000000 --- a/System/Locale.hs +++ /dev/null @@ -1,85 +0,0 @@ ------------------------------------------------------------------------------ --- | --- Module : System.Locale --- Copyright : (c) The University of Glasgow 2001 --- License : BSD-style (see the file libraries/base/LICENSE) --- --- Maintainer : libraries@haskell.org --- Stability : stable --- Portability : portable --- --- This module provides the ability to adapt to local conventions. --- At present, it supports only time and date information as used by --- 'System.Time.calendarTimeToString' from the "System.Time" module. --- ------------------------------------------------------------------------------ - -module System.Locale ( - - TimeLocale(..) - - , defaultTimeLocale - - , iso8601DateFormat - , rfc822DateFormat - ) -where - -import Prelude - -data TimeLocale = TimeLocale { - -- |full and abbreviated week days - wDays :: [(String, String)], - -- |full and abbreviated months - months :: [(String, String)], - intervals :: [(String, String)], - -- |AM\/PM symbols - amPm :: (String, String), - -- |formatting strings - dateTimeFmt, dateFmt, - timeFmt, time12Fmt :: String - } deriving (Eq, Ord, Show) - -defaultTimeLocale :: TimeLocale -defaultTimeLocale = TimeLocale { - wDays = [("Sunday", "Sun"), ("Monday", "Mon"), - ("Tuesday", "Tue"), ("Wednesday", "Wed"), - ("Thursday", "Thu"), ("Friday", "Fri"), - ("Saturday", "Sat")], - - months = [("January", "Jan"), ("February", "Feb"), - ("March", "Mar"), ("April", "Apr"), - ("May", "May"), ("June", "Jun"), - ("July", "Jul"), ("August", "Aug"), - ("September", "Sep"), ("October", "Oct"), - ("November", "Nov"), ("December", "Dec")], - - intervals = [ ("year","years") - , ("month", "months") - , ("day","days") - , ("hour","hours") - , ("min","mins") - , ("sec","secs") - , ("usec","usecs") - ], - - amPm = ("AM", "PM"), - dateTimeFmt = "%a %b %e %H:%M:%S %Z %Y", - dateFmt = "%m/%d/%y", - timeFmt = "%H:%M:%S", - time12Fmt = "%I:%M:%S %p" - } - - --- |Normally, ISO-8601 just defines YYYY-MM-DD --- but we can add a time spec. - -iso8601DateFormat :: Maybe String -> String -iso8601DateFormat timeFmt = - "%Y-%m-%d" ++ case timeFmt of - Nothing -> "" - Just fmt -> ' ' : fmt - - -rfc822DateFormat :: String -rfc822DateFormat = "%a, %_d %b %Y %H:%M:%S %Z" diff --git a/base.cabal b/base.cabal index 10e7849..2e2ae36 100644 --- a/base.cabal +++ b/base.cabal @@ -144,7 +144,6 @@ exposed-modules: System.IO.Error, System.IO.Unsafe, System.Info, - System.Locale, System.Mem, System.Mem.StableName, System.Mem.Weak,