Add back the gettext fix in ViewHelpers. closes #391

Author: smpallen99

CHANGELOG.md

@@ -20,6 +20,7 @@ See these [0.5.x to 0.6.x upgrade instructions](https://gist.github.com/smpallen
   * Fixed detection of remember me checkbox on session new page
   * Fixed compiled gettext in view helpers
   * Fix new session screen issue on newly generated project #390
+  * Add back the gettext fix in ViewHelpers
 
 * Deprecations
   * Removed the coherence.make_templates task since its no longer needed with the new controller design

lib/mix/tasks/coh.install.ex

@@ -985,13 +985,19 @@ defmodule Mix.Tasks.Coh.Install do
     block = """
     You might want to add the following to your priv/repo/seeds.exs file.
 
-    #{repo}.delete_all #{user_schema}
-
-    #{user_schema}.changeset(%#{user_schema}{}, %{name: "Test User", email: "testuser@example.com", password: "secret", password_confirmation: "secret"})
-    |> #{repo}.insert!
+    #{repo}.delete_all(#{user_schema})
+
+    %#{user_schema}{}
+    |> #{user_schema}.changeset(%{
+      name: "Test User",
+      email: "testuser@example.com",
+      password: "secret",
+      password_confirmation: "secret"
+    })
+    |> #{repo}.insert!()
     """
 
-    confirm = if config[:confirmable], do: "|> Coherence.Controller.confirm!\n", else: ""
+    confirm = if config[:confirmable], do: "|> Coherence.Controller.confirm!()\n", else: ""
     block <> confirm
   end
 
@@ -1003,12 +1009,14 @@ defmodule Mix.Tasks.Coh.Install do
 
     defmodule #{base}.User do
       use Ecto.Schema
-      use Coherence.Schema     # Add this
+      # Add this
+      use Coherence.Schema
 
       schema "users" do
         field :name, :string
         field :email, :string
-        coherence_schema()       # Add this
+        # Add this
+        coherence_schema()
 
         timestamps()
       end
@@ -1018,12 +1026,16 @@ defmodule Mix.Tasks.Coh.Install do
         |> cast(params, [:name, :email] ++ coherence_fields)
         |> validate_required([:name, :email])
         |> unique_constraint(:email)
-        |> validate_coherence(params)             # Add this
+        # Add this
+        |> validate_coherence(params)
       end
 
       def changeset(model, params, :password) do
         model
-        |> cast(params, ~w(password password_confirmation reset_password_token reset_password_sent_at))
+        |> cast(
+          params,
+          ~w(password password_confirmation reset_password_token reset_password_sent_at)
+        )
         |> validate_coherence_password_reset(params)
       end
     end
@@ -1050,24 +1062,27 @@ defmodule Mix.Tasks.Coh.Install do
 
     defmodule #{router} do
       use #{web_base}, :router
-      use Coherence.Router         # Add this
+      # Add this
+      use Coherence.Router
 
       pipeline :browser do
         plug(:accepts, ["html"])
         plug(:fetch_session)
         plug(:fetch_flash)
         plug(:protect_from_forgery)
         plug(:put_secure_browser_headers)
-        plug(Coherence.Authentication.Session)  # Add this
+        # Add this
+        plug(Coherence.Authentication.Session)
       end
 
+      # Add this block
       pipeline :protected do
         plug(:accepts, ["html"])
         plug(:fetch_session)
         plug(:fetch_flash)
         plug(:protect_from_forgery)
         plug(:put_secure_browser_headers)
-        plug(Coherence.Authentication.Session, protected: true)  # Add this
+        plug(Coherence.Authentication.Session, protected: true)
       end
 
       # Add this block

priv/templates/coh.install/coherence_messages.ex

@@ -6,7 +6,7 @@ defmodule <%= web_base %>.Coherence.Messages do
   messages used in the coherence application except those in other generated
   files like the view and templates.
 
-  To assist in upgrading Coherence, the `Coherence.Messages behaviour will
+  To assist in upgrading Coherence, the `Coherence.Messages` behaviour will
   alway contain every message for the current version.  This will help in upgrades
   to ensure the user had added new the new messages from the current version.
   """

priv/templates/coh.install/models/coherence/invitation.ex

@@ -4,12 +4,10 @@ defmodule <%= base %>.Coherence.Invitation do
   """
   use Ecto.Schema
   import Ecto.Changeset
-
   <%= if use_binary_id? do %>
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
-  <% end %>
-
+  <% else %><% end %>
   schema "invitations" do
     field(:name, :string)
     field(:email, :string)
@@ -24,7 +22,7 @@ defmodule <%= base %>.Coherence.Invitation do
   If no params are provided, an invalid changeset is returned
   with no validation performed.
   """
-  @spec changeset(Ecto.Schema.t, Map.t) :: Ecto.Changeset.t
+  @spec changeset(Ecto.Schema.t(), Map.t()) :: Ecto.Changeset.t()
   def changeset(model, params \\ %{}) do
     model
     |> cast(params, ~w(name email token))
@@ -36,7 +34,7 @@ defmodule <%= base %>.Coherence.Invitation do
   @doc """
   Creates a changeset for a new schema
   """
-  @spec new_changeset(Map.t) :: Ecto.Changeset.t
+  @spec new_changeset(Map.t()) :: Ecto.Changeset.t()
   def new_changeset(params \\ %{}) do
     changeset(%__MODULE__{}, params)
   end

priv/templates/coh.install/models/coherence/rememberable.ex

@@ -6,12 +6,10 @@ defmodule <%= base %>.Coherence.Rememberable do
   import Ecto.Query
 
   alias Coherence.Config
-
   <%= if use_binary_id? do %>
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
-  <% end %>
-
+  <% else %><% end %>
   schema "rememberables" do
     field(:series_hash, :string)
     field(:token_hash, :string)
@@ -29,7 +27,7 @@ defmodule <%= base %>.Coherence.Rememberable do
   If no params are provided, an invalid changeset is returned
   with no validation performed.
   """
-  @spec changeset(Ecto.Schema.t, Map.t) :: Ecto.Changeset.t
+  @spec changeset(Ecto.Schema.t(), Map.t()) :: Ecto.Changeset.t()
   def changeset(model, params \\ %{}) do
     model
     |> cast(params, ~w(series_hash token_hash token_created_at user_id))
@@ -39,7 +37,7 @@ defmodule <%= base %>.Coherence.Rememberable do
   @doc """
   Creates a changeset for a new schema
   """
-  @spec new_changeset(Map.t) :: Ecto.Changeset.t
+  @spec new_changeset(Map.t()) :: Ecto.Changeset.t()
   def new_changeset(params \\ %{}) do
     changeset(%Rememberable{}, params)
   end

priv/templates/coh.install/models/coherence/trackable.ex

@@ -8,12 +8,10 @@ defmodule <%= base %>.Coherence.Trackable do
   alias Coherence.Config
 
   @fields ~w(action sign_in_count current_sign_in_ip current_sign_in_at last_sign_in_ip last_sign_in_at user_id)a
-
   <%= if use_binary_id? do %>
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
-  <% end %>
-
+  <% else %><% end %>
   schema "trackables" do
     field(:action, :string, null: false)
     field(:sign_in_count, :integer, default: 0)
@@ -32,7 +30,7 @@ defmodule <%= base %>.Coherence.Trackable do
   If no params are provided, an invalid changeset is returned
   with no validation performed.
   """
-  @spec changeset(Ecto.Schema.t, Map.t) :: Ecto.Changeset.t
+  @spec changeset(Ecto.Schema.t(), Map.t()) :: Ecto.Changeset.t()
   def changeset(model, params \\ %{}) do
     model
     |> cast(params, @fields)
@@ -42,7 +40,7 @@ defmodule <%= base %>.Coherence.Trackable do
   @doc """
   Creates a changeset for a new schema
   """
-  @spec new_changeset(Map.t) :: Ecto.Changeset.t
+  @spec new_changeset(Map.t()) :: Ecto.Changeset.t()
   def new_changeset(params \\ %{}) do
     changeset(%__MODULE__{}, params)
   end

priv/templates/coh.install/models/coherence/user.ex

@@ -2,12 +2,10 @@ defmodule <%= user_schema %> do
   @moduledoc false
   use Ecto.Schema
   use Coherence.Schema
-
   <%= if use_binary_id? do %>
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
-  <% end %>
-
+  <% else %><% end %>
   schema "<%= user_table_name %>" do
     field(:name, :string)
     field(:email, :string)
@@ -16,6 +14,8 @@ defmodule <%= user_schema %> do
     timestamps()
   end
 
+  @doc false
+  @spec changeset(Ecto.Schema.t(), Map.t()) :: Ecto.Changeset.t()
   def changeset(model, params \\ %{}) do
     model
     |> cast(params, [:name, :email] ++ coherence_fields())
@@ -25,6 +25,8 @@ defmodule <%= user_schema %> do
     |> validate_coherence(params)
   end
 
+  @doc false
+  @spec changeset(Ecto.Schema.t(), Map.t(), atom) :: Ecto.Changeset.t()
   def changeset(model, params, :password) do
     model
     |> cast(

priv/templates/coh.install/templates/coherence/password/new.html.eex

@@ -1,6 +1,6 @@
 <br \>
 
-<h3><%%= dgettext "coherence", "Send reset password link" %></h3>
+<h3><%%= dgettext "coherence", "Send Reset Password Instructions" %></h3>
 
 <%%= form_for @changeset, password_path(@conn, :create), [as: :password], fn f  -> %>