haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed missing i18n

Browse Source
This commit is contained in:
Michael Snoyman 2011-08-03 08:13:58 +03:00
parent 1cd722fe40
commit 9ea93589e3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yesod-form/Yesod/Form/Fields.hs
View File

@ -88,6 +88,7 @@ data FormMessage = MsgInvalidInteger Text
| MsgInvalidBool Text | MsgInvalidBool Text
| MsgBoolYes | MsgBoolYes
| MsgBoolNo | MsgBoolNo
| MsgDelete
defaultFormMessage :: FormMessage -> Text defaultFormMessage :: FormMessage -> Text
defaultFormMessage (MsgInvalidInteger t) = "Invalid integer: " `mappend` t defaultFormMessage (MsgInvalidInteger t) = "Invalid integer: " `mappend` t
@ -107,6 +108,7 @@ defaultFormMessage MsgSelectNone = "<None>"
defaultFormMessage (MsgInvalidBool t) = "Invalid boolean: " `mappend` t defaultFormMessage (MsgInvalidBool t) = "Invalid boolean: " `mappend` t
defaultFormMessage MsgBoolYes = "Yes" defaultFormMessage MsgBoolYes = "Yes"
defaultFormMessage MsgBoolNo = "No" defaultFormMessage MsgBoolNo = "No"
defaultFormMessage MsgDelete = "Delete?"
blank :: (Monad m, RenderMessage master FormMessage) blank :: (Monad m, RenderMessage master FormMessage)
=> (Text -> Either FormMessage a) -> [Text] -> m (Either (SomeMessage master) (Maybe a)) => (Text -> Either FormMessage a) -> [Text] -> m (Either (SomeMessage master) (Maybe a))

8
yesod-form/Yesod/Form/MassInput.hs
View File

@ -11,7 +11,7 @@ module Yesod.Form.MassInput
import Yesod.Form.Types import Yesod.Form.Types
import Yesod.Form.Functions import Yesod.Form.Functions
import Yesod.Form.Fields (boolField, FormMessage) import Yesod.Form.Fields (boolField, FormMessage (MsgDelete))
import Yesod.Widget (GWidget, GGWidget, whamlet) import Yesod.Widget (GWidget, GGWidget, whamlet)
import Yesod.Message (RenderMessage) import Yesod.Message (RenderMessage)
import Yesod.Handler (newIdent, GHandler, GGHandler) import Yesod.Handler (newIdent, GHandler, GGHandler)
@ -106,13 +106,13 @@ withDelete af = do
Just ("yes":_) -> return $ Left [WHAMLET|<input type=hidden name=#{deleteName} value=yes>|] Just ("yes":_) -> return $ Left [WHAMLET|<input type=hidden name=#{deleteName} value=yes>|]
_ -> do _ -> do
(_, xml2) <- aFormToForm $ areq boolField FieldSettings (_, xml2) <- aFormToForm $ areq boolField FieldSettings
{ fsLabel = "Delete?" :: Text -- FIXME { fsLabel = MsgDelete
, fsTooltip = Nothing , fsTooltip = Nothing
, fsName = Just deleteName , fsName = Just deleteName
, fsId = Nothing , fsId = Nothing
} $ Just False -- TRANS } $ Just False
(res, xml) <- aFormToForm af (res, xml) <- aFormToForm af
return $ Right (res, xml [] ++ xml2 []) -- FIXME shouldn't need ++ return $ Right (res, xml $ xml2 [])
up 1 up 1
return res return res