From 4737f820e435aabbb9b2d058017efa86c61cfa5c Mon Sep 17 00:00:00 2001 From: Adrian Kumpf Date: Thu, 5 Nov 2020 11:13:51 +0100 Subject: [PATCH] Fix cldr deprecation warning --- lib/teslamate_web/plugs/accept_language.ex | 8 +++++++- mix.lock | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/teslamate_web/plugs/accept_language.ex b/lib/teslamate_web/plugs/accept_language.ex index 027ba571..fec6df3b 100644 --- a/lib/teslamate_web/plugs/accept_language.ex +++ b/lib/teslamate_web/plugs/accept_language.ex @@ -3,21 +3,27 @@ defmodule TeslaMateWeb.Plugs.AcceptLanguage do Parses the accept-language header if one is available and sets `conn.private[:cldr_locale]` accordingly. The locale can be later retrieved by `Cldr.Plug.AcceptLanguage.get_cldr_locale/1` + ## Options + * `:cldr_backend` is any backend module. The default is `Cldr.default_backend/0`. If no `:cldr_backend` option is provided and no default backend is configured then an exception will be raised. + ## Example + # Using a specific backend to validate # and match locales plug Cldr.Plug.AcceptLanguage, cldr_backend: MyApp.Cldr + # Using the default backend to validate # and match locales plug Cldr.Plug.AcceptLanguage Based on: https://github.com/elixir-cldr/cldr/blob/master/lib/cldr/plug/plug_accept_language.ex + """ import Plug.Conn @@ -27,7 +33,7 @@ defmodule TeslaMateWeb.Plugs.AcceptLanguage do @doc false def init(options \\ []) do - Keyword.get_lazy(options, :cldr_backend, &Cldr.default_backend/0) + Keyword.get_lazy(options, :cldr_backend, &Cldr.default_backend!/0) end @doc false diff --git a/mix.lock b/mix.lock index 4dd1757a..be0ce2f1 100644 --- a/mix.lock +++ b/mix.lock @@ -9,7 +9,7 @@ "cowlib": {:hex, :cowlib, "2.9.1", "61a6c7c50cf07fdd24b2f45b89500bb93b6686579b069a89f88cb211e1125c78", [:rebar3], [], "hexpm", "e4175dc240a70d996156160891e1c62238ede1729e45740bdd38064dad476170"}, "db_connection": {:hex, :db_connection, "2.3.0", "d56ef906956a37959bcb385704fc04035f4f43c0f560dd23e00740daf8028c49", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm", "dcc082b8f723de9a630451b49fdbd7a59b065c4b38176fb147aaf773574d4520"}, "decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"}, - "ecto": {:hex, :ecto, "3.5.3", "64aa70c6a64b8ee6a28ee186083b317b082beac8fed4d55bcc3f23199667a2f3", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c481b220bb080e94fd1ab528c3b62bdfdd29188c74aef44fc2b204efa8769532"}, + "ecto": {:hex, :ecto, "3.5.4", "73ee115deb10769c73fd2d27e19e36bc4af7c56711ad063616a86aec44f80f6f", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7f13f9c9c071bd2ca04652373ff3edd1d686364de573255096872a4abc471807"}, "ecto_enum": {:hex, :ecto_enum, "1.4.0", "d14b00e04b974afc69c251632d1e49594d899067ee2b376277efd8233027aec8", [:mix], [{:ecto, ">= 3.0.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "> 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:mariaex, ">= 0.0.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "8fb55c087181c2b15eee406519dc22578fa60dd82c088be376d0010172764ee4"}, "ecto_sql": {:hex, :ecto_sql, "3.5.3", "1964df0305538364b97cc4661a2bd2b6c89d803e66e5655e4e55ff1571943efd", [:mix], [{:db_connection, "~> 2.2", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.5.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.3.0 or ~> 0.4.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d2f53592432ce17d3978feb8f43e8dc0705e288b0890caf06d449785f018061c"}, "ex_cldr": {:hex, :ex_cldr, "2.18.0", "bc8d533be547bf9e5d196661ea370a64ed2b039c3d38cfdce4be05cc15a26d3d", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:cldr_utils, "~> 2.12", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.13", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "7bdfe6c81d35b605c21d511323efde7923cbd850650149f6d8d1f09544fba6bc"},