Merge pull request #193 from eikek/translate-date

Translate date

modules/webapp/src/main/elm/Comp/AccountTable.elm

@@ -12,7 +12,6 @@ import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
 import Messages.AccountTable exposing (Texts)
 import Util.Html
-import Util.Time
 
 
 type alias Model =
@@ -53,7 +52,7 @@ view texts accounts model =
                 ]
             ]
         , tbody []
-            (List.map (viewTableLine model) accounts)
+            (List.map (viewTableLine texts model) accounts)
         ]
 
 
@@ -64,8 +63,8 @@ isSelected model acc =
         |> Maybe.withDefault False
 
 
-viewTableLine : Model -> AccountDetail -> Html Msg
-viewTableLine model acc =
+viewTableLine : Texts -> Model -> AccountDetail -> Html Msg
+viewTableLine texts model acc =
     tr
         [ onClick (Select acc)
         , classList [ ( "active", isSelected model acc ) ]
@@ -79,12 +78,12 @@ viewTableLine model acc =
             ]
         , td [] [ String.fromInt acc.loginCount |> text ]
         , td []
-            [ Maybe.map Util.Time.formatIsoDateTime acc.lastLogin
+            [ Maybe.map texts.dateTime acc.lastLogin
                 |> Maybe.withDefault ""
                 |> text
             ]
         , td []
-            [ Util.Time.formatIsoDateTime acc.created
+            [ texts.dateTime acc.created
                 |> text
             ]
         ]

modules/webapp/src/main/elm/Comp/AliasTable.elm

@@ -13,7 +13,6 @@ import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
 import Messages.AliasTable exposing (Texts)
 import Util.Html
-import Util.Time
 
 
 type alias Model =
@@ -77,7 +76,7 @@ viewTableLine texts model alias_ =
                 |> text
             ]
         , td []
-            [ Util.Time.formatIsoDateTime alias_.created
+            [ texts.dateTime alias_.created
                 |> text
             ]
         ]

modules/webapp/src/main/elm/Comp/LanguageChoose.elm

@@ -10,7 +10,8 @@ module Comp.LanguageChoose exposing
 import Comp.FixedDropdown exposing (Item)
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages exposing (Language)
+import Language exposing (Language)
+import Messages
 import Messages.FixedDropdown exposing (Texts)
 
 
@@ -24,7 +25,7 @@ type alias Msg =
 
 init : Model
 init =
-    List.map mkLanguageItem Messages.allLanguages
+    List.map mkLanguageItem Language.allLanguages
         |> Comp.FixedDropdown.init
 
 

modules/webapp/src/main/elm/Comp/ShareTable.elm

@@ -14,7 +14,6 @@ import Messages.ShareTable exposing (Texts)
 import Util.Html
 import Util.Size
 import Util.String
-import Util.Time
 
 
 type alias Model =
@@ -54,7 +53,7 @@ view texts accounts model =
                 ]
             ]
         , tbody []
-            (List.map (viewTableLine model) accounts)
+            (List.map (viewTableLine texts model) accounts)
         ]
 
 
@@ -65,8 +64,8 @@ isSelected model item =
         |> Maybe.withDefault False
 
 
-viewTableLine : Model -> ShareListItem -> Html Msg
-viewTableLine model item =
+viewTableLine : Texts -> Model -> ShareListItem -> Html Msg
+viewTableLine texts model item =
     tr
         [ onClick (Select item)
         , classList [ ( "active", isSelected model item ) ]
@@ -86,8 +85,7 @@ viewTableLine model item =
                 |> text
             ]
         , td [ class "collapsing" ]
-            [ Util.Time.formatDateTime item.created
-                |> text
+            [ texts.dateTime item.created |> text
             ]
         ]
 

modules/webapp/src/main/elm/Language.elm

@@ -0,0 +1,18 @@
+module Language exposing
+    ( Language(..)
+    , allLanguages
+    )
+
+
+type Language
+    = English
+    | German
+    | French
+
+
+allLanguages : List Language
+allLanguages =
+    [ English
+    , German
+    , French
+    ]

modules/webapp/src/main/elm/Messages.elm

@@ -1,13 +1,12 @@
 module Messages exposing
-    ( Language(..)
-    , Messages
-    , allLanguages
+    ( Messages
     , fromFlags
     , get
     , toIso2
     )
 
 import Data.Flags exposing (Flags)
+import Language exposing (Language(..), allLanguages)
 import Messages.AccountPage
 import Messages.AliasPage
 import Messages.App
@@ -21,53 +20,6 @@ import Messages.SharePage
 import Messages.UploadPage
 
 
-type Language
-    = English
-    | German
-    | French
-
-
-allLanguages : List Language
-allLanguages =
-    [ English
-    , German
-    , French
-    ]
-
-
-{-| Get a ISO-3166-1 code of the given lanugage.
--}
-toIso2 : Language -> String
-toIso2 lang =
-    get lang |> .iso2
-
-
-{-| Return the Language from given iso2 code. If the iso2 code is not
-known, return Nothing.
--}
-readIso2 : String -> Maybe Language
-readIso2 iso =
-    let
-        isIso lang =
-            iso == toIso2 lang
-    in
-    List.filter isIso allLanguages
-        |> List.head
-
-
-{-| Return the Language from the given iso2 code. If the iso2 code is
-not known, return English as a default.
--}
-fromIso2 : String -> Language
-fromIso2 iso =
-    readIso2 iso
-        |> Maybe.withDefault English
-
-
-
--- Messages
-
-
 {-| The messages record contains all strings used in the application.
 -}
 type alias Messages =
@@ -102,6 +54,35 @@ get lang =
             fr
 
 
+{-| Get a ISO-3166-1 code of the given lanugage.
+-}
+toIso2 : Language -> String
+toIso2 lang =
+    get lang |> .iso2
+
+
+{-| Return the Language from given iso2 code. If the iso2 code is not
+known, return Nothing.
+-}
+readIso2 : String -> Maybe Language
+readIso2 iso =
+    let
+        isIso lang =
+            iso == toIso2 lang
+    in
+    List.filter isIso allLanguages
+        |> List.head
+
+
+{-| Return the Language from the given iso2 code. If the iso2 code is
+not known, return English as a default.
+-}
+fromIso2 : String -> Language
+fromIso2 iso =
+    readIso2 iso
+        |> Maybe.withDefault English
+
+
 fromFlags : Flags -> Messages
 fromFlags flags =
     let
@@ -117,6 +98,10 @@ fromFlags flags =
         |> get
 
 
+
+--- Messages Definitions
+
+
 gb : Messages
 gb =
     { lang = English
@@ -156,6 +141,7 @@ de =
     , settings = Messages.SettingsPage.de
     }
 
+
 fr : Messages
 fr =
     { lang = French

modules/webapp/src/main/elm/Messages/AccountTable.elm

@@ -1,10 +1,15 @@
 module Messages.AccountTable exposing
     ( Texts
     , de
-    , gb
     , fr
+    , gb
     )
 
+import Language
+import Messages.DateFormat exposing (formatDateTime)
+
+
+
 -- AccountTable component texts
 
 
@@ -17,6 +22,7 @@ type alias Texts =
     , nrLogins : String
     , lastLogin : String
     , created : String
+    , dateTime : Int -> String
     }
 
 
@@ -30,6 +36,7 @@ gb =
     , nrLogins = "#Logins"
     , lastLogin = "Last Login"
     , created = "Created"
+    , dateTime = formatDateTime Language.English
     }
 
 
@@ -43,8 +50,10 @@ de =
     , nrLogins = "#Anmeldungen"
     , lastLogin = "Letzte Anmeldung"
     , created = "Erstellt"
+    , dateTime = formatDateTime Language.German
     }
 
+
 fr : Texts
 fr =
     { login = "Identifiant"
@@ -55,4 +64,5 @@ fr =
     , nrLogins = "#Connexions"
     , lastLogin = "Dernière connexion"
     , created = "Créé"
+    , dateTime = formatDateTime Language.French
     }

modules/webapp/src/main/elm/Messages/AliasTable.elm

@@ -1,10 +1,12 @@
 module Messages.AliasTable exposing
     ( Texts
     , de
-    , gb
     , fr
+    , gb
     )
 
+import Language
+import Messages.DateFormat
 import Messages.ValidityField
 
 
@@ -14,6 +16,7 @@ type alias Texts =
     , validity : String
     , created : String
     , validityField : Messages.ValidityField.Texts
+    , dateTime : Int -> String
     }
 
 
@@ -24,6 +27,7 @@ gb =
     , validity = "Validity"
     , created = "Created"
     , validityField = Messages.ValidityField.gb
+    , dateTime = Messages.DateFormat.formatDateTime Language.English
     }
 
 
@@ -34,13 +38,16 @@ de =
     , validity = "Gültigkeit"
     , created = "Erstellt"
     , validityField = Messages.ValidityField.de
+    , dateTime = Messages.DateFormat.formatDateTime Language.German
     }
 
+
 fr : Texts
 fr =
     { name = "Nom"
     , enabled = "Activé"
     , validity = "Validité"
     , created = "Créé"
     , validityField = Messages.ValidityField.fr
+    , dateTime = Messages.DateFormat.formatDateTime Language.French
     }