Merge branch 'features/categories' into 'master'

Features/categories

See merge request !1

1 files changed, 8 insertions, 8 deletions

diff --git a/src/client/elm/Init.elm b/src/client/elm/Init.elm
index 9c6fc3b..d87e870 100644
--- a/src/client/elm/Init.elm
+++ b/src/client/elm/Init.elm
@@ -5,7 +5,7 @@ module Init exposing
 
 import Time exposing (..)
 
-import Json.Decode as Json exposing ((:=))
+import Json.Decode as Decode exposing (Decoder)
 
 import Model.Translations exposing (..)
 import Model.Conf exposing (..)
@@ -20,11 +20,11 @@ type alias Init =
   , windowSize : Size
   }
 
-decoder : Json.Decoder Init
+decoder : Decoder Init
 decoder =
-  Json.object5 Init
-    ("time" := Json.float)
-    ("translations" := translationsDecoder)
-    ("conf" := confDecoder)
-    ("result" := initResultDecoder)
-    ("windowSize" := sizeDecoder)
+  Decode.map5 Init
+    (Decode.field "time" Decode.float)
+    (Decode.field "translations" translationsDecoder)
+    (Decode.field "conf" confDecoder)
+    (Decode.field "result" initResultDecoder)
+    (Decode.field "windowSize" sizeDecoder)