merge: updates from upstream

Conflicts:
  mix.exs
  mix.lock

lib/wabanex_web.ex

@@ -19,10 +19,10 @@ defmodule WabanexWeb do
 
   def controller do
     quote do
+      use Gettext, backend: WabanexWeb.Gettext
       use Phoenix.Controller, namespace: WabanexWeb
 
       import Plug.Conn
-      import WabanexWeb.Gettext
       alias WabanexWeb.Router.Helpers, as: Routes
     end
   end
@@ -54,17 +54,18 @@ defmodule WabanexWeb do
   def channel do
     quote do
       use Phoenix.Channel
-      import WabanexWeb.Gettext
+      use Gettext, backend: WabanexWeb.Gettext
     end
   end
 
   defp view_helpers do
     quote do
+      use Gettext, backend: WabanexWeb.Gettext
+
       # Import basic rendering functionality (render, render_layout, etc)
       import Phoenix.View
 
       import WabanexWeb.ErrorHelpers
-      import WabanexWeb.Gettext
       alias WabanexWeb.Router.Helpers, as: Routes
     end
   end

lib/wabanex_web/gettext.ex

@@ -5,7 +5,7 @@ defmodule WabanexWeb.Gettext do
   By using [Gettext](https://hexdocs.pm/gettext),
   your module gains a set of macros for translations, for example:
 
-      import WabanexWeb.Gettext
+      use Gettext, backend: WabanexWeb.Gettext
 
       # Simple translation
       gettext("Here is the string to translate")
@@ -20,5 +20,5 @@ defmodule WabanexWeb.Gettext do
 
   See the [Gettext Docs](https://hexdocs.pm/gettext) for detailed usage.
   """
-  use Gettext, otp_app: :wabanex
+  use Gettext.Backend, otp_app: :wabanex
 end