From 668e4c611b8b41ed200f9975a3b46791bcd4b2fc Mon Sep 17 00:00:00 2001 From: shibao Date: Sat, 26 Oct 2024 15:36:12 -0400 Subject: [PATCH] update gettext schema and use macros for cannery app --- lib/cannery.ex | 30 +++++++++++++ lib/cannery/accounts.ex | 7 ++-- lib/cannery/accounts/invite.ex | 7 +--- lib/cannery/accounts/invites.ex | 6 +-- lib/cannery/accounts/user.ex | 9 +--- lib/cannery/accounts/user_token.ex | 7 +--- lib/cannery/activity_log.ex | 6 +-- lib/cannery/activity_log/shot_record.ex | 7 +--- lib/cannery/ammo.ex | 6 +-- lib/cannery/ammo/pack.ex | 10 +---- lib/cannery/ammo/type.ex | 7 +--- lib/cannery/containers.ex | 6 +-- lib/cannery/containers/container.ex | 8 +--- lib/cannery/containers/container_tag.ex | 6 +-- lib/cannery/containers/tag.ex | 7 +--- lib/cannery/email.ex | 2 +- lib/cannery_web.ex | 6 ++- lib/cannery_web/components/core_components.ex | 3 +- lib/cannery_web/controllers/error_json.ex | 2 +- lib/cannery_web/controllers/user_auth.ex | 2 +- .../user_confirmation_controller.ex | 2 - .../user_registration_controller.ex | 1 - .../controllers/user_settings_controller.ex | 1 - lib/cannery_web/gettext.ex | 4 +- priv/gettext/de/LC_MESSAGES/default.po | 6 +-- priv/gettext/de/LC_MESSAGES/errors.po | 42 +++++++++---------- priv/gettext/de/LC_MESSAGES/prompts.po | 16 +++---- priv/gettext/default.pot | 6 +-- priv/gettext/en/LC_MESSAGES/default.po | 6 +-- priv/gettext/en/LC_MESSAGES/errors.po | 42 +++++++++---------- priv/gettext/en/LC_MESSAGES/prompts.po | 16 +++---- priv/gettext/errors.pot | 42 +++++++++---------- priv/gettext/es/LC_MESSAGES/default.po | 6 +-- priv/gettext/es/LC_MESSAGES/errors.po | 42 +++++++++---------- priv/gettext/es/LC_MESSAGES/prompts.po | 16 +++---- priv/gettext/fr/LC_MESSAGES/default.po | 6 +-- priv/gettext/fr/LC_MESSAGES/errors.po | 42 +++++++++---------- priv/gettext/fr/LC_MESSAGES/prompts.po | 16 +++---- priv/gettext/ga/LC_MESSAGES/default.po | 6 +-- priv/gettext/ga/LC_MESSAGES/errors.po | 42 +++++++++---------- priv/gettext/ga/LC_MESSAGES/prompts.po | 16 +++---- priv/gettext/it/LC_MESSAGES/default.po | 6 +-- priv/gettext/it/LC_MESSAGES/errors.po | 42 +++++++++---------- priv/gettext/it/LC_MESSAGES/prompts.po | 16 +++---- priv/gettext/prompts.pot | 16 +++---- 45 files changed, 289 insertions(+), 311 deletions(-) diff --git a/lib/cannery.ex b/lib/cannery.ex index c36d0017..b4668e2c 100644 --- a/lib/cannery.ex +++ b/lib/cannery.ex @@ -6,4 +6,34 @@ defmodule Cannery do Contexts are also responsible for managing your data, regardless if it comes from the database, an external API or others. """ + + def context do + quote do + use Gettext, backend: CanneryWeb.Gettext + import Ecto.Query + alias Cannery.Accounts.User + alias Cannery.Repo + alias Ecto.{Changeset, Multi, Queryable, UUID} + end + end + + def schema do + quote do + use Ecto.Schema + use Gettext, backend: CanneryWeb.Gettext + import Ecto.{Changeset, Query} + alias Cannery.Accounts.User + alias Ecto.{Association, Changeset, Queryable, UUID} + + @primary_key {:id, :binary_id, autogenerate: true} + @foreign_key_type :binary_id + end + end + + @doc """ + When used, dispatch to the appropriate context/schema/etc. + """ + defmacro __using__(which) when is_atom(which) do + apply(__MODULE__, which, []) + end end diff --git a/lib/cannery/accounts.ex b/lib/cannery/accounts.ex index ccac0322..bf3899cf 100644 --- a/lib/cannery/accounts.ex +++ b/lib/cannery/accounts.ex @@ -3,10 +3,9 @@ defmodule Cannery.Accounts do The Accounts context. """ - import Ecto.Query, warn: false - alias Cannery.{Mailer, Repo} - alias Cannery.Accounts.{Invite, Invites, User, UserToken} - alias Ecto.{Changeset, Multi} + use Cannery, :context + alias Cannery.Mailer + alias Cannery.Accounts.{Invite, Invites, UserToken} alias Oban.Job ## Database getters diff --git a/lib/cannery/accounts/invite.ex b/lib/cannery/accounts/invite.ex index 1af997e3..427e426a 100644 --- a/lib/cannery/accounts/invite.ex +++ b/lib/cannery/accounts/invite.ex @@ -5,13 +5,8 @@ defmodule Cannery.Accounts.Invite do `:uses_left` is defined. """ - use Ecto.Schema - import Ecto.Changeset - alias Cannery.Accounts.User - alias Ecto.{Association, Changeset, UUID} + use Cannery, :schema - @primary_key {:id, :binary_id, autogenerate: true} - @foreign_key_type :binary_id schema "invites" do field :name, :string field :token, :string diff --git a/lib/cannery/accounts/invites.ex b/lib/cannery/accounts/invites.ex index 93c0f303..26eb41a1 100644 --- a/lib/cannery/accounts/invites.ex +++ b/lib/cannery/accounts/invites.ex @@ -3,10 +3,8 @@ defmodule Cannery.Accounts.Invites do The Invites context. """ - import Ecto.Query, warn: false - alias Ecto.Multi - alias Cannery.Accounts.{Invite, User} - alias Cannery.Repo + use Cannery, :context + alias Cannery.Accounts.Invite @invite_token_length 20 diff --git a/lib/cannery/accounts/user.ex b/lib/cannery/accounts/user.ex index dae98fe6..18e77ff9 100644 --- a/lib/cannery/accounts/user.ex +++ b/lib/cannery/accounts/user.ex @@ -3,11 +3,8 @@ defmodule Cannery.Accounts.User do A Cannery user """ - use Ecto.Schema - import Ecto.Changeset - import CanneryWeb.Gettext - alias Ecto.{Association, Changeset, UUID} - alias Cannery.Accounts.{Invite, User} + use Cannery, :schema + alias Cannery.Accounts.Invite @derive {Jason.Encoder, only: [ @@ -20,8 +17,6 @@ defmodule Cannery.Accounts.User do :updated_at ]} @derive {Inspect, except: [:password]} - @primary_key {:id, :binary_id, autogenerate: true} - @foreign_key_type :binary_id schema "users" do field :email, :string field :password, :string, virtual: true diff --git a/lib/cannery/accounts/user_token.ex b/lib/cannery/accounts/user_token.ex index 9d4ebb28..89c03c21 100644 --- a/lib/cannery/accounts/user_token.ex +++ b/lib/cannery/accounts/user_token.ex @@ -3,10 +3,7 @@ defmodule Cannery.Accounts.UserToken do Schema for a user's session token """ - use Ecto.Schema - import Ecto.Query - alias Cannery.Accounts.User - alias Ecto.{Association, UUID} + use Cannery, :schema @hash_algorithm :sha256 @rand_size 32 @@ -18,8 +15,6 @@ defmodule Cannery.Accounts.UserToken do @change_email_validity_in_days 7 @session_validity_in_days 60 - @primary_key {:id, :binary_id, autogenerate: true} - @foreign_key_type :binary_id schema "users_tokens" do field :token, :binary field :context, :string diff --git a/lib/cannery/activity_log.ex b/lib/cannery/activity_log.ex index c91253a9..59d81903 100644 --- a/lib/cannery/activity_log.ex +++ b/lib/cannery/activity_log.ex @@ -3,10 +3,8 @@ defmodule Cannery.ActivityLog do The ActivityLog context. """ - import Ecto.Query, warn: false - alias Cannery.Ammo.{Pack, Type} - alias Cannery.{Accounts.User, ActivityLog.ShotRecord, Repo} - alias Ecto.{Multi, Queryable} + use Cannery, :context + alias Cannery.{ActivityLog.ShotRecord, Ammo.Pack, Ammo.Type} @type list_shot_records_option :: {:search, String.t() | nil} diff --git a/lib/cannery/activity_log/shot_record.ex b/lib/cannery/activity_log/shot_record.ex index 9a405d1e..df14b3c6 100644 --- a/lib/cannery/activity_log/shot_record.ex +++ b/lib/cannery/activity_log/shot_record.ex @@ -3,11 +3,8 @@ defmodule Cannery.ActivityLog.ShotRecord do A shot record records a group of ammo shot during a range trip """ - use Ecto.Schema - import CanneryWeb.Gettext - import Ecto.Changeset - alias Cannery.{Accounts.User, Ammo, Ammo.Pack} - alias Ecto.{Changeset, UUID} + use Cannery, :schema + alias Cannery.{Ammo, Ammo.Pack} @derive {Jason.Encoder, only: [ diff --git a/lib/cannery/ammo.ex b/lib/cannery/ammo.ex index aaee4fae..bffcd02b 100644 --- a/lib/cannery/ammo.ex +++ b/lib/cannery/ammo.ex @@ -3,13 +3,11 @@ defmodule Cannery.Ammo do The Ammo context. """ - import CanneryWeb.Gettext - import Ecto.Query, warn: false - alias Cannery.{Accounts.User, Containers, Repo} + use Cannery, :context + alias Cannery.Containers alias Cannery.Containers.{Container, ContainerTag, Tag} alias Cannery.{ActivityLog, ActivityLog.ShotRecord} alias Cannery.Ammo.{Pack, Type} - alias Ecto.{Changeset, Queryable} @pack_create_limit 10_000 @pack_preloads [:type] diff --git a/lib/cannery/ammo/pack.ex b/lib/cannery/ammo/pack.ex index b88c38e2..f215b74b 100644 --- a/lib/cannery/ammo/pack.ex +++ b/lib/cannery/ammo/pack.ex @@ -6,12 +6,8 @@ defmodule Cannery.Ammo.Pack do amount paid for that ammunition, or what condition it is in """ - use Ecto.Schema - import CanneryWeb.Gettext - import Ecto.Changeset - alias Cannery.Ammo.Type - alias Cannery.{Accounts.User, Containers, Containers.Container} - alias Ecto.{Changeset, UUID} + use Cannery, :schema + alias Cannery.{Ammo.Type, Containers, Containers.Container} @derive {Jason.Encoder, only: [ @@ -24,8 +20,6 @@ defmodule Cannery.Ammo.Pack do :type_id, :container_id ]} - @primary_key {:id, :binary_id, autogenerate: true} - @foreign_key_type :binary_id schema "packs" do field :count, :integer field :notes, :string diff --git a/lib/cannery/ammo/type.ex b/lib/cannery/ammo/type.ex index dc9ea9a3..3ab1d3b7 100644 --- a/lib/cannery/ammo/type.ex +++ b/lib/cannery/ammo/type.ex @@ -5,11 +5,8 @@ defmodule Cannery.Ammo.Type do Contains statistical information about the ammunition. """ - use Ecto.Schema - import Ecto.Changeset - alias Cannery.Accounts.User + use Cannery, :schema alias Cannery.Ammo.Pack - alias Ecto.{Changeset, UUID} @derive {Jason.Encoder, only: [ @@ -46,8 +43,6 @@ defmodule Cannery.Ammo.Type do :shot_charge_weight, :dram_equivalent ]} - @primary_key {:id, :binary_id, autogenerate: true} - @foreign_key_type :binary_id schema "types" do field :name, :string field :desc, :string diff --git a/lib/cannery/containers.ex b/lib/cannery/containers.ex index c0a24a24..69c66153 100644 --- a/lib/cannery/containers.ex +++ b/lib/cannery/containers.ex @@ -3,11 +3,9 @@ defmodule Cannery.Containers do The Containers context. """ - import CanneryWeb.Gettext - import Ecto.Query, warn: false - alias Cannery.{Accounts.User, Ammo.Pack, Repo} + use Cannery, :context + alias Cannery.Ammo.Pack alias Cannery.Containers.{Container, ContainerTag, Tag} - alias Ecto.{Changeset, Queryable} @container_preloads [:tags] diff --git a/lib/cannery/containers/container.ex b/lib/cannery/containers/container.ex index b6232047..904b9403 100644 --- a/lib/cannery/containers/container.ex +++ b/lib/cannery/containers/container.ex @@ -3,10 +3,8 @@ defmodule Cannery.Containers.Container do A container that holds ammunition and belongs to a user. """ - use Ecto.Schema - import Ecto.Changeset - alias Ecto.{Changeset, UUID} - alias Cannery.{Accounts.User, Containers.ContainerTag, Containers.Tag} + use Cannery, :schema + alias Cannery.{Containers.ContainerTag, Containers.Tag} @derive {Jason.Encoder, only: [ @@ -17,8 +15,6 @@ defmodule Cannery.Containers.Container do :type, :tags ]} - @primary_key {:id, :binary_id, autogenerate: true} - @foreign_key_type :binary_id schema "containers" do field :name, :string field :desc, :string diff --git a/lib/cannery/containers/container_tag.ex b/lib/cannery/containers/container_tag.ex index 8a61cc09..bb24a493 100644 --- a/lib/cannery/containers/container_tag.ex +++ b/lib/cannery/containers/container_tag.ex @@ -4,13 +4,9 @@ defmodule Cannery.Containers.ContainerTag do Cannery.Containers.Tag. """ - use Ecto.Schema - import Ecto.Changeset + use Cannery, :schema alias Cannery.Containers.{Container, Tag} - alias Ecto.{Changeset, UUID} - @primary_key {:id, :binary_id, autogenerate: true} - @foreign_key_type :binary_id schema "container_tags" do belongs_to :container, Container belongs_to :tag, Tag diff --git a/lib/cannery/containers/tag.ex b/lib/cannery/containers/tag.ex index 0b70cdc6..cf6fc52a 100644 --- a/lib/cannery/containers/tag.ex +++ b/lib/cannery/containers/tag.ex @@ -4,10 +4,7 @@ defmodule Cannery.Containers.Tag do text and bg colors. """ - use Ecto.Schema - import Ecto.Changeset - alias Cannery.Accounts.User - alias Ecto.{Changeset, UUID} + use Cannery, :schema @derive {Jason.Encoder, only: [ @@ -16,8 +13,6 @@ defmodule Cannery.Containers.Tag do :bg_color, :text_color ]} - @primary_key {:id, :binary_id, autogenerate: true} - @foreign_key_type :binary_id schema "tags" do field :name, :string field :bg_color, :string diff --git a/lib/cannery/email.ex b/lib/cannery/email.ex index bf52af76..3da528ca 100644 --- a/lib/cannery/email.ex +++ b/lib/cannery/email.ex @@ -7,8 +7,8 @@ defmodule Cannery.Email do `lib/cannery_web/components/layouts/email_text.txt.eex` for text emails. """ + use Gettext, backend: CanneryWeb.Gettext import Swoosh.Email - import CanneryWeb.Gettext import Phoenix.Template alias Cannery.Accounts.User alias CanneryWeb.{EmailHTML, Layouts} diff --git a/lib/cannery_web.ex b/lib/cannery_web.ex index 00166f67..5b0a1f7d 100644 --- a/lib/cannery_web.ex +++ b/lib/cannery_web.ex @@ -42,9 +42,10 @@ defmodule CanneryWeb do formats: [:html, :json], layouts: [html: CanneryWeb.Layouts] + use Gettext, backend: CanneryWeb.Gettext + # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse import Plug.Conn - import CanneryWeb.Gettext unquote(verified_routes()) end @@ -84,8 +85,9 @@ defmodule CanneryWeb do defp html_helpers do quote do use PhoenixHTMLHelpers + use Gettext, backend: CanneryWeb.Gettext import Phoenix.{Component, HTML, HTML.Form} - import CanneryWeb.{ErrorHelpers, Gettext, CoreComponents, HTMLHelpers} + import CanneryWeb.{ErrorHelpers, CoreComponents, HTMLHelpers} # Shortcut for generating JS commands alias Phoenix.LiveView.JS diff --git a/lib/cannery_web/components/core_components.ex b/lib/cannery_web/components/core_components.ex index 64aa6df0..d221d32d 100644 --- a/lib/cannery_web/components/core_components.ex +++ b/lib/cannery_web/components/core_components.ex @@ -4,7 +4,8 @@ defmodule CanneryWeb.CoreComponents do """ use Phoenix.Component use CanneryWeb, :verified_routes - import CanneryWeb.{Gettext, HTMLHelpers} + use Gettext, backend: CanneryWeb.Gettext + import CanneryWeb.HTMLHelpers alias Cannery.{Accounts, Accounts.Invite, Accounts.User} alias Cannery.{Ammo, Ammo.Pack} alias Cannery.{Containers.Container, Containers.Tag} diff --git a/lib/cannery_web/controllers/error_json.ex b/lib/cannery_web/controllers/error_json.ex index d1eb70ea..876f7594 100644 --- a/lib/cannery_web/controllers/error_json.ex +++ b/lib/cannery_web/controllers/error_json.ex @@ -1,5 +1,5 @@ defmodule CanneryWeb.ErrorJSON do - import CanneryWeb.Gettext + use Gettext, backend: CanneryWeb.Gettext def render(template, _assigns) do error_string = diff --git a/lib/cannery_web/controllers/user_auth.ex b/lib/cannery_web/controllers/user_auth.ex index cc9d3a38..5b68e465 100644 --- a/lib/cannery_web/controllers/user_auth.ex +++ b/lib/cannery_web/controllers/user_auth.ex @@ -4,9 +4,9 @@ defmodule CanneryWeb.UserAuth do """ use CanneryWeb, :verified_routes + use Gettext, backend: CanneryWeb.Gettext import Plug.Conn import Phoenix.Controller - import CanneryWeb.Gettext alias Cannery.{Accounts, Accounts.User} # Make the remember me cookie valid for 60 days. diff --git a/lib/cannery_web/controllers/user_confirmation_controller.ex b/lib/cannery_web/controllers/user_confirmation_controller.ex index ed3e2f41..429f6bac 100644 --- a/lib/cannery_web/controllers/user_confirmation_controller.ex +++ b/lib/cannery_web/controllers/user_confirmation_controller.ex @@ -1,7 +1,5 @@ defmodule CanneryWeb.UserConfirmationController do use CanneryWeb, :controller - - import CanneryWeb.Gettext alias Cannery.Accounts def new(conn, _params) do diff --git a/lib/cannery_web/controllers/user_registration_controller.ex b/lib/cannery_web/controllers/user_registration_controller.ex index 554a88eb..43e374ef 100644 --- a/lib/cannery_web/controllers/user_registration_controller.ex +++ b/lib/cannery_web/controllers/user_registration_controller.ex @@ -1,6 +1,5 @@ defmodule CanneryWeb.UserRegistrationController do use CanneryWeb, :controller - import CanneryWeb.Gettext alias Cannery.{Accounts, Accounts.Invites} alias Ecto.Changeset diff --git a/lib/cannery_web/controllers/user_settings_controller.ex b/lib/cannery_web/controllers/user_settings_controller.ex index 2f2f0d7b..8c4462c1 100644 --- a/lib/cannery_web/controllers/user_settings_controller.ex +++ b/lib/cannery_web/controllers/user_settings_controller.ex @@ -1,6 +1,5 @@ defmodule CanneryWeb.UserSettingsController do use CanneryWeb, :controller - import CanneryWeb.Gettext alias Cannery.Accounts alias CanneryWeb.UserAuth diff --git a/lib/cannery_web/gettext.ex b/lib/cannery_web/gettext.ex index 062b92b1..75c49889 100644 --- a/lib/cannery_web/gettext.ex +++ b/lib/cannery_web/gettext.ex @@ -5,7 +5,7 @@ defmodule CanneryWeb.Gettext do By using [Gettext](https://hexdocs.pm/gettext), your module gains a set of macros for translations, for example: - import CanneryWeb.Gettext + use Gettext, backend: CanneryWeb.Gettext # Simple translation gettext("Here is the string to translate") @@ -20,5 +20,5 @@ defmodule CanneryWeb.Gettext do See the [Gettext Docs](https://hexdocs.pm/gettext) for detailed usage. """ - use Gettext, otp_app: :cannery + use Gettext.Backend, otp_app: :cannery end diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 342126c8..155edd24 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -338,7 +338,7 @@ msgstr "" "Hosten Sie Ihre eigene Instanz oder verwenden Sie eine Instanz, der Sie " "vertrauen." -#: lib/cannery_web/controllers/user_settings_controller.ex:10 +#: lib/cannery_web/controllers/user_settings_controller.ex:9 #: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3 #, elixir-autogen, elixir-format msgid "Settings" @@ -621,7 +621,7 @@ msgstr "Prozent verbleibend:" msgid "Rounds used" msgstr "Patronen verbraucht" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:8 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:6 #, elixir-autogen, elixir-format msgid "Confirm your account" msgstr "Bestätigen Sie ihr Nutzerkonto" @@ -636,7 +636,7 @@ msgstr "Passwort vergessen?" msgid "Log in" msgstr "Einloggen" -#: lib/cannery_web/controllers/user_registration_controller.ex:32 +#: lib/cannery_web/controllers/user_registration_controller.ex:31 #, elixir-autogen, elixir-format msgid "Register" msgstr "Registrieren" diff --git a/priv/gettext/de/LC_MESSAGES/errors.po b/priv/gettext/de/LC_MESSAGES/errors.po index 2f6c11c4..b5fc159f 100644 --- a/priv/gettext/de/LC_MESSAGES/errors.po +++ b/priv/gettext/de/LC_MESSAGES/errors.po @@ -23,7 +23,7 @@ msgstr "" ## Run "mix gettext.extract" to bring this file up to ## date. Leave "msgstr"s empty as changing them here has no ## effect: edit them in PO (.po) files instead. -#: lib/cannery/containers.ex:224 +#: lib/cannery/containers.ex:222 #, elixir-autogen, elixir-format msgid "Container must be empty before deleting" msgstr "Behälter muss vor dem Löschen leer sein" @@ -39,7 +39,7 @@ msgstr "Konnte %{name} nicht löschen: %{error}" msgid "Could not find that container" msgstr "Konnte Behälter nicht finden" -#: lib/cannery_web/controllers/user_settings_controller.ex:84 +#: lib/cannery_web/controllers/user_settings_controller.ex:83 #, elixir-autogen, elixir-format msgid "Email change link is invalid or it has expired." msgstr "Mailadressenänderungs-Link ist ungültig oder abgelaufen." @@ -80,21 +80,21 @@ msgstr "Oops, etwas ist schiefgegangen. Bitte beachten Sie den Fehler unten." msgid "Reset password link is invalid or it has expired." msgstr "Link zum Passwort zurücksetzen ist ungültig oder abgelaufen." -#: lib/cannery_web/controllers/user_registration_controller.ex:22 -#: lib/cannery_web/controllers/user_registration_controller.ex:51 +#: lib/cannery_web/controllers/user_registration_controller.ex:21 +#: lib/cannery_web/controllers/user_registration_controller.ex:50 #, elixir-autogen, elixir-format msgid "Sorry, public registration is disabled" msgstr "Entschuldigung, aber öffentliche Registrierung ist deaktiviert" -#: lib/cannery_web/controllers/user_registration_controller.ex:12 -#: lib/cannery_web/controllers/user_registration_controller.ex:41 -#: lib/cannery_web/controllers/user_registration_controller.ex:70 +#: lib/cannery_web/controllers/user_registration_controller.ex:11 +#: lib/cannery_web/controllers/user_registration_controller.ex:40 +#: lib/cannery_web/controllers/user_registration_controller.ex:69 #, elixir-autogen, elixir-format msgid "Sorry, this invite was not found or expired" msgstr "" "Entschuldigung, aber diese Einladung wurde nicht gefunden oder ist abgelaufen" -#: lib/cannery_web/controllers/user_settings_controller.ex:99 +#: lib/cannery_web/controllers/user_settings_controller.ex:98 #, elixir-autogen, elixir-format msgid "Unable to delete user" msgstr "Dieser Nutzer konnte nicht gelöscht werden" @@ -105,7 +105,7 @@ msgstr "Dieser Nutzer konnte nicht gelöscht werden" msgid "Unauthorized" msgstr "Unbefugt" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:53 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:51 #, elixir-autogen, elixir-format msgid "User confirmation link is invalid or it has expired." msgstr "Nutzerkonto Bestätigungslink ist ungültig oder abgelaufen." @@ -115,22 +115,22 @@ msgstr "Nutzerkonto Bestätigungslink ist ungültig oder abgelaufen." msgid "You are not authorized to view this page." msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen." -#: lib/cannery/accounts/user.ex:145 +#: lib/cannery/accounts/user.ex:140 #, elixir-autogen, elixir-format msgid "did not change" msgstr "hat sich nicht geändert" -#: lib/cannery/accounts/user.ex:166 +#: lib/cannery/accounts/user.ex:161 #, elixir-autogen, elixir-format msgid "does not match password" msgstr "Passwort stimmt nicht überein" -#: lib/cannery/accounts/user.ex:203 +#: lib/cannery/accounts/user.ex:198 #, elixir-autogen, elixir-format msgid "is not valid" msgstr "ist nicht gültig" -#: lib/cannery/accounts/user.ex:100 +#: lib/cannery/accounts/user.ex:95 #, elixir-autogen, elixir-format msgid "must have the @ sign and no spaces" msgstr "Muss ein @ Zeichen und keine Leerzeichen haben" @@ -163,7 +163,7 @@ msgstr "Tag konnte nicht gelöscht werden" msgid "Could not parse number of copies" msgstr "Konnte die Anzahl der Kopien nicht verstehen" -#: lib/cannery/ammo.ex:1028 +#: lib/cannery/ammo.ex:1026 #, elixir-autogen, elixir-format msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}" msgstr "" @@ -175,27 +175,27 @@ msgstr "" msgid "Your browser does not support the canvas element." msgstr "" -#: lib/cannery/activity_log/shot_record.ex:74 +#: lib/cannery/activity_log/shot_record.ex:71 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid user and ammo pack" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:88 +#: lib/cannery/activity_log/shot_record.ex:85 #, elixir-autogen, elixir-format msgid "Ammo left can be at most %{count} rounds" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:84 +#: lib/cannery/activity_log/shot_record.ex:81 #, elixir-autogen, elixir-format msgid "Ammo left must be at least 0" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:119 +#: lib/cannery/activity_log/shot_record.ex:116 #, elixir-autogen, elixir-format, fuzzy msgid "Count can be at most %{count} shots" msgstr "Anzahl muss weniger als %{count} betragen" -#: lib/cannery/activity_log/shot_record.ex:80 +#: lib/cannery/activity_log/shot_record.ex:77 #, elixir-autogen, elixir-format msgid "can't be blank" msgstr "" @@ -216,12 +216,12 @@ msgstr "" msgid "You must log in to access this page." msgstr "" -#: lib/cannery/ammo/pack.ex:104 +#: lib/cannery/ammo/pack.ex:98 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid container" msgstr "" -#: lib/cannery/ammo/pack.ex:102 +#: lib/cannery/ammo/pack.ex:96 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid type" msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/prompts.po b/priv/gettext/de/LC_MESSAGES/prompts.po index b56daedc..087c8a80 100644 --- a/priv/gettext/de/LC_MESSAGES/prompts.po +++ b/priv/gettext/de/LC_MESSAGES/prompts.po @@ -52,7 +52,7 @@ msgstr "%{name} wurde gelöscht" msgid "%{name} updated successfully" msgstr "%{name} erfolgreich aktualisiert" -#: lib/cannery_web/controllers/user_settings_controller.ex:29 +#: lib/cannery_web/controllers/user_settings_controller.ex:28 #, elixir-autogen, elixir-format msgid "A link to confirm your email change has been sent to the new address." msgstr "Eine Mail zum Bestätigen ihre Mailadresse wurde Ihnen zugesandt." @@ -89,12 +89,12 @@ msgstr "Sind Sie sicher, dass sie Ihren Account löschen möchten?" msgid "Are you sure you want to log out?" msgstr "Wirklich ausloggen?" -#: lib/cannery_web/controllers/user_settings_controller.ex:77 +#: lib/cannery_web/controllers/user_settings_controller.ex:76 #, elixir-autogen, elixir-format msgid "Email changed successfully." msgstr "Mailadresse erfolgreich geändert." -#: lib/cannery_web/controllers/user_confirmation_controller.ex:23 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:21 #, elixir-autogen, elixir-format msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly." msgstr "" @@ -118,12 +118,12 @@ msgstr "Erfolgreich ausgeloggt." msgid "Password reset successfully." msgstr "Passwort erfolgreich zurückgesetzt." -#: lib/cannery_web/controllers/user_settings_controller.ex:49 +#: lib/cannery_web/controllers/user_settings_controller.ex:48 #, elixir-autogen, elixir-format msgid "Password updated successfully." msgstr "Passwort erfolgreich geändert." -#: lib/cannery_web/controllers/user_registration_controller.ex:65 +#: lib/cannery_web/controllers/user_registration_controller.ex:64 #, elixir-autogen, elixir-format msgid "Please check your email to verify your account" msgstr "Bitte überprüfen Sie ihre Mailbox und bestätigen Sie das Nutzerkonto" @@ -139,7 +139,7 @@ msgstr "Bitte überprüfen Sie ihre Mailbox und bestätigen Sie das Nutzerkonto" msgid "Saving..." msgstr "Speichere..." -#: lib/cannery_web/controllers/user_settings_controller.ex:95 +#: lib/cannery_web/controllers/user_settings_controller.ex:94 #, elixir-autogen, elixir-format msgid "Your account has been deleted" msgstr "Ihr Nutzerkonto wurde gelöscht" @@ -193,7 +193,7 @@ msgstr "Schießkladde erfolgreich gelöscht" msgid "Shot records updated successfully" msgstr "Schießkladde erfolgreich aktualisiert" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:37 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:35 #, elixir-autogen, elixir-format msgid "%{email} confirmed successfully." msgstr "%{email} erfolgreich bestätigt." @@ -229,7 +229,7 @@ msgstr "Erstellen..." msgid "Are you sure you want to change your language?" msgstr "Möchten Sie die Sprache wechseln?" -#: lib/cannery_web/controllers/user_settings_controller.ex:65 +#: lib/cannery_web/controllers/user_settings_controller.ex:64 #, elixir-autogen, elixir-format msgid "Language updated successfully." msgstr "Spracheinstellung gespeichert." diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 3d5f6422..4c3468c2 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -332,7 +332,7 @@ msgstr "" msgid "Self-host your own instance, or use an instance from someone you trust." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:10 +#: lib/cannery_web/controllers/user_settings_controller.ex:9 #: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3 #, elixir-autogen, elixir-format msgid "Settings" @@ -615,7 +615,7 @@ msgstr "" msgid "Rounds used" msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:8 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:6 #, elixir-autogen, elixir-format msgid "Confirm your account" msgstr "" @@ -630,7 +630,7 @@ msgstr "" msgid "Log in" msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:32 +#: lib/cannery_web/controllers/user_registration_controller.ex:31 #, elixir-autogen, elixir-format msgid "Register" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 3853795e..4bc46603 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -332,7 +332,7 @@ msgstr "" msgid "Self-host your own instance, or use an instance from someone you trust." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:10 +#: lib/cannery_web/controllers/user_settings_controller.ex:9 #: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3 #, elixir-autogen, elixir-format msgid "Settings" @@ -615,7 +615,7 @@ msgstr "" msgid "Rounds used" msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:8 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:6 #, elixir-autogen, elixir-format msgid "Confirm your account" msgstr "" @@ -630,7 +630,7 @@ msgstr "" msgid "Log in" msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:32 +#: lib/cannery_web/controllers/user_registration_controller.ex:31 #, elixir-autogen, elixir-format msgid "Register" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/errors.po b/priv/gettext/en/LC_MESSAGES/errors.po index bbad3623..262af30a 100644 --- a/priv/gettext/en/LC_MESSAGES/errors.po +++ b/priv/gettext/en/LC_MESSAGES/errors.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Language: en\n" -#: lib/cannery/containers.ex:224 +#: lib/cannery/containers.ex:222 #, elixir-autogen, elixir-format msgid "Container must be empty before deleting" msgstr "" @@ -26,7 +26,7 @@ msgstr "" msgid "Could not find that container" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:84 +#: lib/cannery_web/controllers/user_settings_controller.ex:83 #, elixir-autogen, elixir-format msgid "Email change link is invalid or it has expired." msgstr "" @@ -67,20 +67,20 @@ msgstr "" msgid "Reset password link is invalid or it has expired." msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:22 -#: lib/cannery_web/controllers/user_registration_controller.ex:51 +#: lib/cannery_web/controllers/user_registration_controller.ex:21 +#: lib/cannery_web/controllers/user_registration_controller.ex:50 #, elixir-autogen, elixir-format msgid "Sorry, public registration is disabled" msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:12 -#: lib/cannery_web/controllers/user_registration_controller.ex:41 -#: lib/cannery_web/controllers/user_registration_controller.ex:70 +#: lib/cannery_web/controllers/user_registration_controller.ex:11 +#: lib/cannery_web/controllers/user_registration_controller.ex:40 +#: lib/cannery_web/controllers/user_registration_controller.ex:69 #, elixir-autogen, elixir-format msgid "Sorry, this invite was not found or expired" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:99 +#: lib/cannery_web/controllers/user_settings_controller.ex:98 #, elixir-autogen, elixir-format msgid "Unable to delete user" msgstr "" @@ -91,7 +91,7 @@ msgstr "" msgid "Unauthorized" msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:53 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:51 #, elixir-autogen, elixir-format msgid "User confirmation link is invalid or it has expired." msgstr "" @@ -101,23 +101,23 @@ msgstr "" msgid "You are not authorized to view this page." msgstr "" -#: lib/cannery/accounts/user.ex:145 +#: lib/cannery/accounts/user.ex:140 #, elixir-autogen, elixir-format msgid "did not change" msgstr "" -#: lib/cannery/accounts/user.ex:166 +#: lib/cannery/accounts/user.ex:161 #, elixir-autogen, elixir-format msgid "does not match password" msgstr "" ## From Ecto.Changeset.put_change/3 -#: lib/cannery/accounts/user.ex:203 +#: lib/cannery/accounts/user.ex:198 #, elixir-autogen, elixir-format, fuzzy msgid "is not valid" msgstr "" -#: lib/cannery/accounts/user.ex:100 +#: lib/cannery/accounts/user.ex:95 #, elixir-autogen, elixir-format msgid "must have the @ sign and no spaces" msgstr "" @@ -148,7 +148,7 @@ msgstr "" msgid "Could not parse number of copies" msgstr "" -#: lib/cannery/ammo.ex:1028 +#: lib/cannery/ammo.ex:1026 #, elixir-autogen, elixir-format msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}" msgstr "" @@ -158,27 +158,27 @@ msgstr "" msgid "Your browser does not support the canvas element." msgstr "" -#: lib/cannery/activity_log/shot_record.ex:74 +#: lib/cannery/activity_log/shot_record.ex:71 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid user and ammo pack" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:88 +#: lib/cannery/activity_log/shot_record.ex:85 #, elixir-autogen, elixir-format msgid "Ammo left can be at most %{count} rounds" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:84 +#: lib/cannery/activity_log/shot_record.ex:81 #, elixir-autogen, elixir-format msgid "Ammo left must be at least 0" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:119 +#: lib/cannery/activity_log/shot_record.ex:116 #, elixir-autogen, elixir-format, fuzzy msgid "Count can be at most %{count} shots" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:80 +#: lib/cannery/activity_log/shot_record.ex:77 #, elixir-autogen, elixir-format msgid "can't be blank" msgstr "" @@ -199,12 +199,12 @@ msgstr "" msgid "You must log in to access this page." msgstr "" -#: lib/cannery/ammo/pack.ex:104 +#: lib/cannery/ammo/pack.ex:98 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid container" msgstr "" -#: lib/cannery/ammo/pack.ex:102 +#: lib/cannery/ammo/pack.ex:96 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid type" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/prompts.po b/priv/gettext/en/LC_MESSAGES/prompts.po index 0566fa79..aeaa2afc 100644 --- a/priv/gettext/en/LC_MESSAGES/prompts.po +++ b/priv/gettext/en/LC_MESSAGES/prompts.po @@ -39,7 +39,7 @@ msgstr "" msgid "%{name} updated successfully" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:29 +#: lib/cannery_web/controllers/user_settings_controller.ex:28 #, elixir-autogen, elixir-format msgid "A link to confirm your email change has been sent to the new address." msgstr "" @@ -74,12 +74,12 @@ msgstr "" msgid "Are you sure you want to log out?" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:77 +#: lib/cannery_web/controllers/user_settings_controller.ex:76 #, elixir-autogen, elixir-format msgid "Email changed successfully." msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:23 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:21 #, elixir-autogen, elixir-format msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly." msgstr "" @@ -99,12 +99,12 @@ msgstr "" msgid "Password reset successfully." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:49 +#: lib/cannery_web/controllers/user_settings_controller.ex:48 #, elixir-autogen, elixir-format msgid "Password updated successfully." msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:65 +#: lib/cannery_web/controllers/user_registration_controller.ex:64 #, elixir-autogen, elixir-format msgid "Please check your email to verify your account" msgstr "" @@ -120,7 +120,7 @@ msgstr "" msgid "Saving..." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:95 +#: lib/cannery_web/controllers/user_settings_controller.ex:94 #, elixir-autogen, elixir-format msgid "Your account has been deleted" msgstr "" @@ -172,7 +172,7 @@ msgstr "" msgid "Shot records updated successfully" msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:37 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:35 #, elixir-autogen, elixir-format msgid "%{email} confirmed successfully." msgstr "" @@ -208,7 +208,7 @@ msgstr "" msgid "Are you sure you want to change your language?" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:65 +#: lib/cannery_web/controllers/user_settings_controller.ex:64 #, elixir-autogen, elixir-format msgid "Language updated successfully." msgstr "" diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot index 0383ff87..46429aa1 100644 --- a/priv/gettext/errors.pot +++ b/priv/gettext/errors.pot @@ -10,7 +10,7 @@ msgid "" msgstr "" -#: lib/cannery/containers.ex:224 +#: lib/cannery/containers.ex:222 #, elixir-autogen, elixir-format msgid "Container must be empty before deleting" msgstr "" @@ -26,7 +26,7 @@ msgstr "" msgid "Could not find that container" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:84 +#: lib/cannery_web/controllers/user_settings_controller.ex:83 #, elixir-autogen, elixir-format msgid "Email change link is invalid or it has expired." msgstr "" @@ -67,20 +67,20 @@ msgstr "" msgid "Reset password link is invalid or it has expired." msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:22 -#: lib/cannery_web/controllers/user_registration_controller.ex:51 +#: lib/cannery_web/controllers/user_registration_controller.ex:21 +#: lib/cannery_web/controllers/user_registration_controller.ex:50 #, elixir-autogen, elixir-format msgid "Sorry, public registration is disabled" msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:12 -#: lib/cannery_web/controllers/user_registration_controller.ex:41 -#: lib/cannery_web/controllers/user_registration_controller.ex:70 +#: lib/cannery_web/controllers/user_registration_controller.ex:11 +#: lib/cannery_web/controllers/user_registration_controller.ex:40 +#: lib/cannery_web/controllers/user_registration_controller.ex:69 #, elixir-autogen, elixir-format msgid "Sorry, this invite was not found or expired" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:99 +#: lib/cannery_web/controllers/user_settings_controller.ex:98 #, elixir-autogen, elixir-format msgid "Unable to delete user" msgstr "" @@ -91,7 +91,7 @@ msgstr "" msgid "Unauthorized" msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:53 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:51 #, elixir-autogen, elixir-format msgid "User confirmation link is invalid or it has expired." msgstr "" @@ -101,22 +101,22 @@ msgstr "" msgid "You are not authorized to view this page." msgstr "" -#: lib/cannery/accounts/user.ex:145 +#: lib/cannery/accounts/user.ex:140 #, elixir-autogen, elixir-format msgid "did not change" msgstr "" -#: lib/cannery/accounts/user.ex:166 +#: lib/cannery/accounts/user.ex:161 #, elixir-autogen, elixir-format msgid "does not match password" msgstr "" -#: lib/cannery/accounts/user.ex:203 +#: lib/cannery/accounts/user.ex:198 #, elixir-autogen, elixir-format msgid "is not valid" msgstr "" -#: lib/cannery/accounts/user.ex:100 +#: lib/cannery/accounts/user.ex:95 #, elixir-autogen, elixir-format msgid "must have the @ sign and no spaces" msgstr "" @@ -147,7 +147,7 @@ msgstr "" msgid "Could not parse number of copies" msgstr "" -#: lib/cannery/ammo.ex:1028 +#: lib/cannery/ammo.ex:1026 #, elixir-autogen, elixir-format msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}" msgstr "" @@ -157,27 +157,27 @@ msgstr "" msgid "Your browser does not support the canvas element." msgstr "" -#: lib/cannery/activity_log/shot_record.ex:74 +#: lib/cannery/activity_log/shot_record.ex:71 #, elixir-autogen, elixir-format msgid "Please select a valid user and ammo pack" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:88 +#: lib/cannery/activity_log/shot_record.ex:85 #, elixir-autogen, elixir-format msgid "Ammo left can be at most %{count} rounds" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:84 +#: lib/cannery/activity_log/shot_record.ex:81 #, elixir-autogen, elixir-format msgid "Ammo left must be at least 0" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:119 +#: lib/cannery/activity_log/shot_record.ex:116 #, elixir-autogen, elixir-format msgid "Count can be at most %{count} shots" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:80 +#: lib/cannery/activity_log/shot_record.ex:77 #, elixir-autogen, elixir-format msgid "can't be blank" msgstr "" @@ -198,12 +198,12 @@ msgstr "" msgid "You must log in to access this page." msgstr "" -#: lib/cannery/ammo/pack.ex:104 +#: lib/cannery/ammo/pack.ex:98 #, elixir-autogen, elixir-format msgid "Please select a valid container" msgstr "" -#: lib/cannery/ammo/pack.ex:102 +#: lib/cannery/ammo/pack.ex:96 #, elixir-autogen, elixir-format msgid "Please select a valid type" msgstr "" diff --git a/priv/gettext/es/LC_MESSAGES/default.po b/priv/gettext/es/LC_MESSAGES/default.po index 4a229f61..fd8ceed2 100644 --- a/priv/gettext/es/LC_MESSAGES/default.po +++ b/priv/gettext/es/LC_MESSAGES/default.po @@ -338,7 +338,7 @@ msgstr "" "Autogestiona tu propia instancia, o usa una instancia de alguién de quien te " "fíes." -#: lib/cannery_web/controllers/user_settings_controller.ex:10 +#: lib/cannery_web/controllers/user_settings_controller.ex:9 #: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3 #, elixir-autogen, elixir-format msgid "Settings" @@ -622,7 +622,7 @@ msgstr "Pocentaje restante:" msgid "Rounds used" msgstr "Balas usadas" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:8 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:6 #, elixir-autogen, elixir-format msgid "Confirm your account" msgstr "Confirmar su cuenta" @@ -637,7 +637,7 @@ msgstr "¿Olvidó su contraseña?" msgid "Log in" msgstr "Entrar" -#: lib/cannery_web/controllers/user_registration_controller.ex:32 +#: lib/cannery_web/controllers/user_registration_controller.ex:31 #, elixir-autogen, elixir-format msgid "Register" msgstr "Registrarse" diff --git a/priv/gettext/es/LC_MESSAGES/errors.po b/priv/gettext/es/LC_MESSAGES/errors.po index 50237946..03bad2bf 100644 --- a/priv/gettext/es/LC_MESSAGES/errors.po +++ b/priv/gettext/es/LC_MESSAGES/errors.po @@ -23,7 +23,7 @@ msgstr "" ## Run "mix gettext.extract" to bring this file up to ## date. Leave "msgstr"s empty as changing them here has no ## effect: edit them in PO (.po) files instead. -#: lib/cannery/containers.ex:224 +#: lib/cannery/containers.ex:222 #, elixir-autogen, elixir-format msgid "Container must be empty before deleting" msgstr "El contenedor debe estar vacío antes de ser borrado" @@ -39,7 +39,7 @@ msgstr "No se pudo eliminar %{name}: %{error}" msgid "Could not find that container" msgstr "No se pudo encontrar el contenedor" -#: lib/cannery_web/controllers/user_settings_controller.ex:84 +#: lib/cannery_web/controllers/user_settings_controller.ex:83 #, elixir-autogen, elixir-format msgid "Email change link is invalid or it has expired." msgstr "El enlace de cambio de correo es inválido o ha expirado." @@ -83,20 +83,20 @@ msgid "Reset password link is invalid or it has expired." msgstr "" "El enlace de reestablecimiento de la contraseña es inválido o ha caducado." -#: lib/cannery_web/controllers/user_registration_controller.ex:22 -#: lib/cannery_web/controllers/user_registration_controller.ex:51 +#: lib/cannery_web/controllers/user_registration_controller.ex:21 +#: lib/cannery_web/controllers/user_registration_controller.ex:50 #, elixir-autogen, elixir-format msgid "Sorry, public registration is disabled" msgstr "Lo sentimos, el registro público no está habilitado" -#: lib/cannery_web/controllers/user_registration_controller.ex:12 -#: lib/cannery_web/controllers/user_registration_controller.ex:41 -#: lib/cannery_web/controllers/user_registration_controller.ex:70 +#: lib/cannery_web/controllers/user_registration_controller.ex:11 +#: lib/cannery_web/controllers/user_registration_controller.ex:40 +#: lib/cannery_web/controllers/user_registration_controller.ex:69 #, elixir-autogen, elixir-format msgid "Sorry, this invite was not found or expired" msgstr "Lo sentimos, esta invitación no es válida o ha caducado" -#: lib/cannery_web/controllers/user_settings_controller.ex:99 +#: lib/cannery_web/controllers/user_settings_controller.ex:98 #, elixir-autogen, elixir-format msgid "Unable to delete user" msgstr "No se ha podido eliminar el usuario" @@ -107,7 +107,7 @@ msgstr "No se ha podido eliminar el usuario" msgid "Unauthorized" msgstr "No autorizado" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:53 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:51 #, elixir-autogen, elixir-format msgid "User confirmation link is invalid or it has expired." msgstr "El enlace de confirmación de usuario no es válido o ha caducado." @@ -117,22 +117,22 @@ msgstr "El enlace de confirmación de usuario no es válido o ha caducado." msgid "You are not authorized to view this page." msgstr "No está autorizado a ver esta página." -#: lib/cannery/accounts/user.ex:145 +#: lib/cannery/accounts/user.ex:140 #, elixir-autogen, elixir-format msgid "did not change" msgstr "no cambió" -#: lib/cannery/accounts/user.ex:166 +#: lib/cannery/accounts/user.ex:161 #, elixir-autogen, elixir-format msgid "does not match password" msgstr "no coincide con la contraseña" -#: lib/cannery/accounts/user.ex:203 +#: lib/cannery/accounts/user.ex:198 #, elixir-autogen, elixir-format msgid "is not valid" msgstr "no es válido" -#: lib/cannery/accounts/user.ex:100 +#: lib/cannery/accounts/user.ex:95 #, elixir-autogen, elixir-format msgid "must have the @ sign and no spaces" msgstr "debe tener el signo @ y no contener espacios" @@ -163,7 +163,7 @@ msgstr "La etiqueta no pudo ser eliminada" msgid "Could not parse number of copies" msgstr "No se ha podido procesar el número de copias" -#: lib/cannery/ammo.ex:1028 +#: lib/cannery/ammo.ex:1026 #, elixir-autogen, elixir-format msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}" msgstr "Número inválido de copias, debe ser entre 1 y %{max}. Fue %{multiplier" @@ -173,27 +173,27 @@ msgstr "Número inválido de copias, debe ser entre 1 y %{max}. Fue %{multiplier msgid "Your browser does not support the canvas element." msgstr "Su navegador no es compatible con el elemento lienzo." -#: lib/cannery/activity_log/shot_record.ex:74 +#: lib/cannery/activity_log/shot_record.ex:71 #, elixir-autogen, elixir-format msgid "Please select a valid user and ammo pack" msgstr "Por favor escoja un usuario y tipo de munición valido" -#: lib/cannery/activity_log/shot_record.ex:88 +#: lib/cannery/activity_log/shot_record.ex:85 #, elixir-autogen, elixir-format msgid "Ammo left can be at most %{count} rounds" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:84 +#: lib/cannery/activity_log/shot_record.ex:81 #, elixir-autogen, elixir-format msgid "Ammo left must be at least 0" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:119 +#: lib/cannery/activity_log/shot_record.ex:116 #, elixir-autogen, elixir-format, fuzzy msgid "Count can be at most %{count} shots" msgstr "El recuento debe ser menos de %{count}" -#: lib/cannery/activity_log/shot_record.ex:80 +#: lib/cannery/activity_log/shot_record.ex:77 #, elixir-autogen, elixir-format msgid "can't be blank" msgstr "" @@ -214,12 +214,12 @@ msgstr "" msgid "You must log in to access this page." msgstr "" -#: lib/cannery/ammo/pack.ex:104 +#: lib/cannery/ammo/pack.ex:98 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid container" msgstr "Por favor escoja un tipo de munición y un contenedor" -#: lib/cannery/ammo/pack.ex:102 +#: lib/cannery/ammo/pack.ex:96 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid type" msgstr "Por favor escoja un usuario y tipo de munición valido" diff --git a/priv/gettext/es/LC_MESSAGES/prompts.po b/priv/gettext/es/LC_MESSAGES/prompts.po index 88216f2a..10cde9ad 100644 --- a/priv/gettext/es/LC_MESSAGES/prompts.po +++ b/priv/gettext/es/LC_MESSAGES/prompts.po @@ -52,7 +52,7 @@ msgstr "%{name} ha sido borrado" msgid "%{name} updated successfully" msgstr "%{name} actualizado exitosamente" -#: lib/cannery_web/controllers/user_settings_controller.ex:29 +#: lib/cannery_web/controllers/user_settings_controller.ex:28 #, elixir-autogen, elixir-format msgid "A link to confirm your email change has been sent to the new address." msgstr "" @@ -89,12 +89,12 @@ msgstr "Está seguro que desea eliminar su cuenta?" msgid "Are you sure you want to log out?" msgstr "Está seguro que desea cerrar sesión?" -#: lib/cannery_web/controllers/user_settings_controller.ex:77 +#: lib/cannery_web/controllers/user_settings_controller.ex:76 #, elixir-autogen, elixir-format msgid "Email changed successfully." msgstr "Correo electrónico cambiado exitosamente." -#: lib/cannery_web/controllers/user_confirmation_controller.ex:23 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:21 #, elixir-autogen, elixir-format msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly." msgstr "" @@ -118,12 +118,12 @@ msgstr "Sesión cerrada exitosamente." msgid "Password reset successfully." msgstr "Contraseña reiniciada exitosamente." -#: lib/cannery_web/controllers/user_settings_controller.ex:49 +#: lib/cannery_web/controllers/user_settings_controller.ex:48 #, elixir-autogen, elixir-format msgid "Password updated successfully." msgstr "Contraseña cambiada exitosamente." -#: lib/cannery_web/controllers/user_registration_controller.ex:65 +#: lib/cannery_web/controllers/user_registration_controller.ex:64 #, elixir-autogen, elixir-format msgid "Please check your email to verify your account" msgstr "Por favor chequea el correo para verificar tu cuenta" @@ -139,7 +139,7 @@ msgstr "Por favor chequea el correo para verificar tu cuenta" msgid "Saving..." msgstr "Guardando..." -#: lib/cannery_web/controllers/user_settings_controller.ex:95 +#: lib/cannery_web/controllers/user_settings_controller.ex:94 #, elixir-autogen, elixir-format msgid "Your account has been deleted" msgstr "Su cuenta ha sido eliminada" @@ -192,7 +192,7 @@ msgstr "Récord de disparos borrado exitosamente" msgid "Shot records updated successfully" msgstr "Récord de disparos actualizado exitosamente" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:37 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:35 #, elixir-autogen, elixir-format msgid "%{email} confirmed successfully." msgstr "%{email} confirmado exitosamente." @@ -228,7 +228,7 @@ msgstr "Creando..." msgid "Are you sure you want to change your language?" msgstr "¿Está segure de que quiere cambiar el idioma?" -#: lib/cannery_web/controllers/user_settings_controller.ex:65 +#: lib/cannery_web/controllers/user_settings_controller.ex:64 #, elixir-autogen, elixir-format msgid "Language updated successfully." msgstr "Idioma cambiado exitosamente." diff --git a/priv/gettext/fr/LC_MESSAGES/default.po b/priv/gettext/fr/LC_MESSAGES/default.po index 27bbf8b4..bc8fb835 100644 --- a/priv/gettext/fr/LC_MESSAGES/default.po +++ b/priv/gettext/fr/LC_MESSAGES/default.po @@ -338,7 +338,7 @@ msgstr "" "Auto-hébergez votre propre instance ou utilisez celle d’une personne à " "laquelle vous faîtes confiance." -#: lib/cannery_web/controllers/user_settings_controller.ex:10 +#: lib/cannery_web/controllers/user_settings_controller.ex:9 #: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3 #, elixir-autogen, elixir-format msgid "Settings" @@ -623,7 +623,7 @@ msgstr "Pourcentage restant :" msgid "Rounds used" msgstr "Cartouches utilisées" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:8 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:6 #, elixir-autogen, elixir-format msgid "Confirm your account" msgstr "Confirmez votre compte" @@ -638,7 +638,7 @@ msgstr "Mot de passe oublié ?" msgid "Log in" msgstr "Se connecter" -#: lib/cannery_web/controllers/user_registration_controller.ex:32 +#: lib/cannery_web/controllers/user_registration_controller.ex:31 #, elixir-autogen, elixir-format msgid "Register" msgstr "S’enregistrer" diff --git a/priv/gettext/fr/LC_MESSAGES/errors.po b/priv/gettext/fr/LC_MESSAGES/errors.po index e529a34a..c1de16d6 100644 --- a/priv/gettext/fr/LC_MESSAGES/errors.po +++ b/priv/gettext/fr/LC_MESSAGES/errors.po @@ -23,7 +23,7 @@ msgstr "" # # Run "mix gettext.extract" to bring this file up to # # date. Leave "msgstr"s empty as changing them here has no # # effect: edit them in PO (.po) files instead. -#: lib/cannery/containers.ex:224 +#: lib/cannery/containers.ex:222 #, elixir-autogen, elixir-format msgid "Container must be empty before deleting" msgstr "Le conteneur doit être vide pour être supprimé" @@ -39,7 +39,7 @@ msgstr "Impossible de supprimer %{name} : %{error}" msgid "Could not find that container" msgstr "Impossible de trouver ce conteneur" -#: lib/cannery_web/controllers/user_settings_controller.ex:84 +#: lib/cannery_web/controllers/user_settings_controller.ex:83 #, elixir-autogen, elixir-format msgid "Email change link is invalid or it has expired." msgstr "Le lien de changement de mél est invalide ou a expiré." @@ -82,20 +82,20 @@ msgstr "" msgid "Reset password link is invalid or it has expired." msgstr "Le lien de réinitialisation de mot de passe est invalide ou expiré." -#: lib/cannery_web/controllers/user_registration_controller.ex:22 -#: lib/cannery_web/controllers/user_registration_controller.ex:51 +#: lib/cannery_web/controllers/user_registration_controller.ex:21 +#: lib/cannery_web/controllers/user_registration_controller.ex:50 #, elixir-autogen, elixir-format msgid "Sorry, public registration is disabled" msgstr "Désolé, l’enregistrement public est désactivé" -#: lib/cannery_web/controllers/user_registration_controller.ex:12 -#: lib/cannery_web/controllers/user_registration_controller.ex:41 -#: lib/cannery_web/controllers/user_registration_controller.ex:70 +#: lib/cannery_web/controllers/user_registration_controller.ex:11 +#: lib/cannery_web/controllers/user_registration_controller.ex:40 +#: lib/cannery_web/controllers/user_registration_controller.ex:69 #, elixir-autogen, elixir-format msgid "Sorry, this invite was not found or expired" msgstr "Désolé, cette invitation n’est pas trouvée ou est expirée" -#: lib/cannery_web/controllers/user_settings_controller.ex:99 +#: lib/cannery_web/controllers/user_settings_controller.ex:98 #, elixir-autogen, elixir-format msgid "Unable to delete user" msgstr "Impossible de supprimer l’utilisateur·ice" @@ -106,7 +106,7 @@ msgstr "Impossible de supprimer l’utilisateur·ice" msgid "Unauthorized" msgstr "Non autorisé·e" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:53 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:51 #, elixir-autogen, elixir-format msgid "User confirmation link is invalid or it has expired." msgstr "Le lien de confirmation d’utilisateur·ice est invalide ou a expiré." @@ -116,22 +116,22 @@ msgstr "Le lien de confirmation d’utilisateur·ice est invalide ou a expiré." msgid "You are not authorized to view this page." msgstr "Vous n’êtes pas autorisé·e à voir cette page." -#: lib/cannery/accounts/user.ex:145 +#: lib/cannery/accounts/user.ex:140 #, elixir-autogen, elixir-format msgid "did not change" msgstr "est inchangé" -#: lib/cannery/accounts/user.ex:166 +#: lib/cannery/accounts/user.ex:161 #, elixir-autogen, elixir-format msgid "does not match password" msgstr "le mot de passe ne correspond pas" -#: lib/cannery/accounts/user.ex:203 +#: lib/cannery/accounts/user.ex:198 #, elixir-autogen, elixir-format msgid "is not valid" msgstr "n’est pas valide" -#: lib/cannery/accounts/user.ex:100 +#: lib/cannery/accounts/user.ex:95 #, elixir-autogen, elixir-format msgid "must have the @ sign and no spaces" msgstr "doit contenir le symbole @ et aucune espace" @@ -164,7 +164,7 @@ msgstr "Le tag n’a pas pu être retiré" msgid "Could not parse number of copies" msgstr "Impossible d'analyser le nombre de copies" -#: lib/cannery/ammo.ex:1028 +#: lib/cannery/ammo.ex:1026 #, elixir-autogen, elixir-format msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}" msgstr "Nombre de copies invalide, doit être 1 et %{max}. Été %{multiplier}" @@ -174,27 +174,27 @@ msgstr "Nombre de copies invalide, doit être 1 et %{max}. Été %{multiplier}" msgid "Your browser does not support the canvas element." msgstr "" -#: lib/cannery/activity_log/shot_record.ex:74 +#: lib/cannery/activity_log/shot_record.ex:71 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid user and ammo pack" msgstr "Veuillez choisir un utilisateur valide et un groupe de munitions" -#: lib/cannery/activity_log/shot_record.ex:88 +#: lib/cannery/activity_log/shot_record.ex:85 #, elixir-autogen, elixir-format msgid "Ammo left can be at most %{count} rounds" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:84 +#: lib/cannery/activity_log/shot_record.ex:81 #, elixir-autogen, elixir-format msgid "Ammo left must be at least 0" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:119 +#: lib/cannery/activity_log/shot_record.ex:116 #, elixir-autogen, elixir-format, fuzzy msgid "Count can be at most %{count} shots" msgstr "La quantité doit être inférieur à %{count}" -#: lib/cannery/activity_log/shot_record.ex:80 +#: lib/cannery/activity_log/shot_record.ex:77 #, elixir-autogen, elixir-format msgid "can't be blank" msgstr "" @@ -215,12 +215,12 @@ msgstr "" msgid "You must log in to access this page." msgstr "" -#: lib/cannery/ammo/pack.ex:104 +#: lib/cannery/ammo/pack.ex:98 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid container" msgstr "Veuillez choisir un type de munitions et un conteneur" -#: lib/cannery/ammo/pack.ex:102 +#: lib/cannery/ammo/pack.ex:96 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid type" msgstr "Veuillez choisir un utilisateur valide et un groupe de munitions" diff --git a/priv/gettext/fr/LC_MESSAGES/prompts.po b/priv/gettext/fr/LC_MESSAGES/prompts.po index 4835e26a..86f68662 100644 --- a/priv/gettext/fr/LC_MESSAGES/prompts.po +++ b/priv/gettext/fr/LC_MESSAGES/prompts.po @@ -52,7 +52,7 @@ msgstr "%{name} a été supprimé·e" msgid "%{name} updated successfully" msgstr "%{name} mis à jour avec succès" -#: lib/cannery_web/controllers/user_settings_controller.ex:29 +#: lib/cannery_web/controllers/user_settings_controller.ex:28 #, elixir-autogen, elixir-format msgid "A link to confirm your email change has been sent to the new address." msgstr "" @@ -90,12 +90,12 @@ msgstr "Êtes-vous certain·e de supprimer votre compte ?" msgid "Are you sure you want to log out?" msgstr "Êtes-vous certain·e de vouloir vous déconnecter ?" -#: lib/cannery_web/controllers/user_settings_controller.ex:77 +#: lib/cannery_web/controllers/user_settings_controller.ex:76 #, elixir-autogen, elixir-format msgid "Email changed successfully." msgstr "Mél changé avec succès." -#: lib/cannery_web/controllers/user_confirmation_controller.ex:23 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:21 #, elixir-autogen, elixir-format msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly." msgstr "" @@ -119,12 +119,12 @@ msgstr "Déconnecté avec succès." msgid "Password reset successfully." msgstr "Mot de passe réinitialiser avec succès." -#: lib/cannery_web/controllers/user_settings_controller.ex:49 +#: lib/cannery_web/controllers/user_settings_controller.ex:48 #, elixir-autogen, elixir-format msgid "Password updated successfully." msgstr "Mot de passe mis à jour avec succès." -#: lib/cannery_web/controllers/user_registration_controller.ex:65 +#: lib/cannery_web/controllers/user_registration_controller.ex:64 #, elixir-autogen, elixir-format msgid "Please check your email to verify your account" msgstr "Veuillez vérifier votre mél pour confirmer votre compte" @@ -140,7 +140,7 @@ msgstr "Veuillez vérifier votre mél pour confirmer votre compte" msgid "Saving..." msgstr "Sauvegarde en cours…" -#: lib/cannery_web/controllers/user_settings_controller.ex:95 +#: lib/cannery_web/controllers/user_settings_controller.ex:94 #, elixir-autogen, elixir-format msgid "Your account has been deleted" msgstr "Votre compte a été supprimé" @@ -194,7 +194,7 @@ msgstr "Enregistrements de tir supprimés avec succès" msgid "Shot records updated successfully" msgstr "Enregistrements de tir mis à jour avec succès" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:37 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:35 #, elixir-autogen, elixir-format msgid "%{email} confirmed successfully." msgstr "%{email} confirmé avec succès." @@ -230,7 +230,7 @@ msgstr "Création en cours…" msgid "Are you sure you want to change your language?" msgstr "Êtes-vous certain·e de vouloir changer votre langue ?" -#: lib/cannery_web/controllers/user_settings_controller.ex:65 +#: lib/cannery_web/controllers/user_settings_controller.ex:64 #, elixir-autogen, elixir-format msgid "Language updated successfully." msgstr "Langue mise à jour avec succès." diff --git a/priv/gettext/ga/LC_MESSAGES/default.po b/priv/gettext/ga/LC_MESSAGES/default.po index 2c36d19d..3f57a6dd 100644 --- a/priv/gettext/ga/LC_MESSAGES/default.po +++ b/priv/gettext/ga/LC_MESSAGES/default.po @@ -334,7 +334,7 @@ msgstr "" msgid "Self-host your own instance, or use an instance from someone you trust." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:10 +#: lib/cannery_web/controllers/user_settings_controller.ex:9 #: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3 #, elixir-autogen, elixir-format msgid "Settings" @@ -617,7 +617,7 @@ msgstr "" msgid "Rounds used" msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:8 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:6 #, elixir-autogen, elixir-format msgid "Confirm your account" msgstr "" @@ -632,7 +632,7 @@ msgstr "" msgid "Log in" msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:32 +#: lib/cannery_web/controllers/user_registration_controller.ex:31 #, elixir-autogen, elixir-format msgid "Register" msgstr "" diff --git a/priv/gettext/ga/LC_MESSAGES/errors.po b/priv/gettext/ga/LC_MESSAGES/errors.po index 161538d3..e9de5c91 100644 --- a/priv/gettext/ga/LC_MESSAGES/errors.po +++ b/priv/gettext/ga/LC_MESSAGES/errors.po @@ -24,7 +24,7 @@ msgstr "" ## Run "mix gettext.extract" to bring this file up to ## date. Leave "msgstr"s empty as changing them here has no ## effect: edit them in PO (.po) files instead. -#: lib/cannery/containers.ex:224 +#: lib/cannery/containers.ex:222 #, elixir-autogen, elixir-format msgid "Container must be empty before deleting" msgstr "Caithfidh an coimeádán a bheidh follamh roimh scriosadh" @@ -40,7 +40,7 @@ msgstr "Ní feidir %{name} a scriosadh: %{error}" msgid "Could not find that container" msgstr "Ní feidir an coimeádán sin a fáil" -#: lib/cannery_web/controllers/user_settings_controller.ex:84 +#: lib/cannery_web/controllers/user_settings_controller.ex:83 #, elixir-autogen, elixir-format msgid "Email change link is invalid or it has expired." msgstr "Tá an nasc chun an seoladh email a athrú neamhbhailí nó as dáta." @@ -83,20 +83,20 @@ msgstr "" msgid "Reset password link is invalid or it has expired." msgstr "Tá nasc an pasfhocail a athrú neamhbailí nó as dáta." -#: lib/cannery_web/controllers/user_registration_controller.ex:22 -#: lib/cannery_web/controllers/user_registration_controller.ex:51 +#: lib/cannery_web/controllers/user_registration_controller.ex:21 +#: lib/cannery_web/controllers/user_registration_controller.ex:50 #, elixir-autogen, elixir-format msgid "Sorry, public registration is disabled" msgstr "Tá brón orainn, tá clarú póiblí bactha" -#: lib/cannery_web/controllers/user_registration_controller.ex:12 -#: lib/cannery_web/controllers/user_registration_controller.ex:41 -#: lib/cannery_web/controllers/user_registration_controller.ex:70 +#: lib/cannery_web/controllers/user_registration_controller.ex:11 +#: lib/cannery_web/controllers/user_registration_controller.ex:40 +#: lib/cannery_web/controllers/user_registration_controller.ex:69 #, elixir-autogen, elixir-format msgid "Sorry, this invite was not found or expired" msgstr "Tá brón orainn, ní feidir an cuireadh seo a fáil nó tá sé as dáta" -#: lib/cannery_web/controllers/user_settings_controller.ex:99 +#: lib/cannery_web/controllers/user_settings_controller.ex:98 #, elixir-autogen, elixir-format msgid "Unable to delete user" msgstr "Ní feidir an úsáideoir a scriosadh" @@ -107,7 +107,7 @@ msgstr "Ní feidir an úsáideoir a scriosadh" msgid "Unauthorized" msgstr "Níl cead agaibh" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:53 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:51 #, elixir-autogen, elixir-format msgid "User confirmation link is invalid or it has expired." msgstr "Tá nasc an úsáideoir a deimhnigh neamhbailí nó as dáta." @@ -117,22 +117,22 @@ msgstr "Tá nasc an úsáideoir a deimhnigh neamhbailí nó as dáta." msgid "You are not authorized to view this page." msgstr "Níl cead agaibh féachaint ar an leathanach seo." -#: lib/cannery/accounts/user.ex:145 +#: lib/cannery/accounts/user.ex:140 #, elixir-autogen, elixir-format msgid "did not change" msgstr "Níor athraigh sé" -#: lib/cannery/accounts/user.ex:166 +#: lib/cannery/accounts/user.ex:161 #, elixir-autogen, elixir-format msgid "does not match password" msgstr "" -#: lib/cannery/accounts/user.ex:203 +#: lib/cannery/accounts/user.ex:198 #, elixir-autogen, elixir-format msgid "is not valid" msgstr "" -#: lib/cannery/accounts/user.ex:100 +#: lib/cannery/accounts/user.ex:95 #, elixir-autogen, elixir-format msgid "must have the @ sign and no spaces" msgstr "" @@ -163,7 +163,7 @@ msgstr "" msgid "Could not parse number of copies" msgstr "" -#: lib/cannery/ammo.ex:1028 +#: lib/cannery/ammo.ex:1026 #, elixir-autogen, elixir-format msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}" msgstr "" @@ -173,27 +173,27 @@ msgstr "" msgid "Your browser does not support the canvas element." msgstr "" -#: lib/cannery/activity_log/shot_record.ex:74 +#: lib/cannery/activity_log/shot_record.ex:71 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid user and ammo pack" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:88 +#: lib/cannery/activity_log/shot_record.ex:85 #, elixir-autogen, elixir-format msgid "Ammo left can be at most %{count} rounds" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:84 +#: lib/cannery/activity_log/shot_record.ex:81 #, elixir-autogen, elixir-format msgid "Ammo left must be at least 0" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:119 +#: lib/cannery/activity_log/shot_record.ex:116 #, elixir-autogen, elixir-format, fuzzy msgid "Count can be at most %{count} shots" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:80 +#: lib/cannery/activity_log/shot_record.ex:77 #, elixir-autogen, elixir-format msgid "can't be blank" msgstr "" @@ -214,12 +214,12 @@ msgstr "" msgid "You must log in to access this page." msgstr "" -#: lib/cannery/ammo/pack.ex:104 +#: lib/cannery/ammo/pack.ex:98 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid container" msgstr "" -#: lib/cannery/ammo/pack.ex:102 +#: lib/cannery/ammo/pack.ex:96 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid type" msgstr "" diff --git a/priv/gettext/ga/LC_MESSAGES/prompts.po b/priv/gettext/ga/LC_MESSAGES/prompts.po index eed7920c..88048ed4 100644 --- a/priv/gettext/ga/LC_MESSAGES/prompts.po +++ b/priv/gettext/ga/LC_MESSAGES/prompts.po @@ -50,7 +50,7 @@ msgstr "" msgid "%{name} updated successfully" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:29 +#: lib/cannery_web/controllers/user_settings_controller.ex:28 #, elixir-autogen, elixir-format msgid "A link to confirm your email change has been sent to the new address." msgstr "" @@ -85,12 +85,12 @@ msgstr "" msgid "Are you sure you want to log out?" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:77 +#: lib/cannery_web/controllers/user_settings_controller.ex:76 #, elixir-autogen, elixir-format msgid "Email changed successfully." msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:23 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:21 #, elixir-autogen, elixir-format msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly." msgstr "" @@ -110,12 +110,12 @@ msgstr "" msgid "Password reset successfully." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:49 +#: lib/cannery_web/controllers/user_settings_controller.ex:48 #, elixir-autogen, elixir-format msgid "Password updated successfully." msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:65 +#: lib/cannery_web/controllers/user_registration_controller.ex:64 #, elixir-autogen, elixir-format msgid "Please check your email to verify your account" msgstr "" @@ -131,7 +131,7 @@ msgstr "" msgid "Saving..." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:95 +#: lib/cannery_web/controllers/user_settings_controller.ex:94 #, elixir-autogen, elixir-format msgid "Your account has been deleted" msgstr "" @@ -183,7 +183,7 @@ msgstr "" msgid "Shot records updated successfully" msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:37 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:35 #, elixir-autogen, elixir-format msgid "%{email} confirmed successfully." msgstr "" @@ -219,7 +219,7 @@ msgstr "" msgid "Are you sure you want to change your language?" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:65 +#: lib/cannery_web/controllers/user_settings_controller.ex:64 #, elixir-autogen, elixir-format msgid "Language updated successfully." msgstr "" diff --git a/priv/gettext/it/LC_MESSAGES/default.po b/priv/gettext/it/LC_MESSAGES/default.po index 120e7c12..e11fd2af 100644 --- a/priv/gettext/it/LC_MESSAGES/default.po +++ b/priv/gettext/it/LC_MESSAGES/default.po @@ -343,7 +343,7 @@ msgstr "" msgid "Self-host your own instance, or use an instance from someone you trust." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:10 +#: lib/cannery_web/controllers/user_settings_controller.ex:9 #: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3 #, elixir-autogen, elixir-format msgid "Settings" @@ -626,7 +626,7 @@ msgstr "" msgid "Rounds used" msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:8 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:6 #, elixir-autogen, elixir-format msgid "Confirm your account" msgstr "" @@ -641,7 +641,7 @@ msgstr "" msgid "Log in" msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:32 +#: lib/cannery_web/controllers/user_registration_controller.ex:31 #, elixir-autogen, elixir-format msgid "Register" msgstr "" diff --git a/priv/gettext/it/LC_MESSAGES/errors.po b/priv/gettext/it/LC_MESSAGES/errors.po index 63602670..631fce2e 100644 --- a/priv/gettext/it/LC_MESSAGES/errors.po +++ b/priv/gettext/it/LC_MESSAGES/errors.po @@ -21,7 +21,7 @@ msgstr "" ## Run "mix gettext.extract" to bring this file up to ## date. Leave "msgstr"s empty as changing them here has no ## effect: edit them in PO (.po) files instead. -#: lib/cannery/containers.ex:224 +#: lib/cannery/containers.ex:222 #, elixir-autogen, elixir-format msgid "Container must be empty before deleting" msgstr "" @@ -37,7 +37,7 @@ msgstr "" msgid "Could not find that container" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:84 +#: lib/cannery_web/controllers/user_settings_controller.ex:83 #, elixir-autogen, elixir-format msgid "Email change link is invalid or it has expired." msgstr "" @@ -78,20 +78,20 @@ msgstr "" msgid "Reset password link is invalid or it has expired." msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:22 -#: lib/cannery_web/controllers/user_registration_controller.ex:51 +#: lib/cannery_web/controllers/user_registration_controller.ex:21 +#: lib/cannery_web/controllers/user_registration_controller.ex:50 #, elixir-autogen, elixir-format msgid "Sorry, public registration is disabled" msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:12 -#: lib/cannery_web/controllers/user_registration_controller.ex:41 -#: lib/cannery_web/controllers/user_registration_controller.ex:70 +#: lib/cannery_web/controllers/user_registration_controller.ex:11 +#: lib/cannery_web/controllers/user_registration_controller.ex:40 +#: lib/cannery_web/controllers/user_registration_controller.ex:69 #, elixir-autogen, elixir-format msgid "Sorry, this invite was not found or expired" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:99 +#: lib/cannery_web/controllers/user_settings_controller.ex:98 #, elixir-autogen, elixir-format msgid "Unable to delete user" msgstr "" @@ -102,7 +102,7 @@ msgstr "" msgid "Unauthorized" msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:53 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:51 #, elixir-autogen, elixir-format msgid "User confirmation link is invalid or it has expired." msgstr "" @@ -112,22 +112,22 @@ msgstr "" msgid "You are not authorized to view this page." msgstr "" -#: lib/cannery/accounts/user.ex:145 +#: lib/cannery/accounts/user.ex:140 #, elixir-autogen, elixir-format msgid "did not change" msgstr "" -#: lib/cannery/accounts/user.ex:166 +#: lib/cannery/accounts/user.ex:161 #, elixir-autogen, elixir-format msgid "does not match password" msgstr "" -#: lib/cannery/accounts/user.ex:203 +#: lib/cannery/accounts/user.ex:198 #, elixir-autogen, elixir-format msgid "is not valid" msgstr "" -#: lib/cannery/accounts/user.ex:100 +#: lib/cannery/accounts/user.ex:95 #, elixir-autogen, elixir-format msgid "must have the @ sign and no spaces" msgstr "" @@ -158,7 +158,7 @@ msgstr "" msgid "Could not parse number of copies" msgstr "" -#: lib/cannery/ammo.ex:1028 +#: lib/cannery/ammo.ex:1026 #, elixir-autogen, elixir-format msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}" msgstr "" @@ -168,27 +168,27 @@ msgstr "" msgid "Your browser does not support the canvas element." msgstr "" -#: lib/cannery/activity_log/shot_record.ex:74 +#: lib/cannery/activity_log/shot_record.ex:71 #, elixir-autogen, elixir-format msgid "Please select a valid user and ammo pack" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:88 +#: lib/cannery/activity_log/shot_record.ex:85 #, elixir-autogen, elixir-format msgid "Ammo left can be at most %{count} rounds" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:84 +#: lib/cannery/activity_log/shot_record.ex:81 #, elixir-autogen, elixir-format msgid "Ammo left must be at least 0" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:119 +#: lib/cannery/activity_log/shot_record.ex:116 #, elixir-autogen, elixir-format msgid "Count can be at most %{count} shots" msgstr "" -#: lib/cannery/activity_log/shot_record.ex:80 +#: lib/cannery/activity_log/shot_record.ex:77 #, elixir-autogen, elixir-format msgid "can't be blank" msgstr "" @@ -209,12 +209,12 @@ msgstr "" msgid "You must log in to access this page." msgstr "" -#: lib/cannery/ammo/pack.ex:104 +#: lib/cannery/ammo/pack.ex:98 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid container" msgstr "" -#: lib/cannery/ammo/pack.ex:102 +#: lib/cannery/ammo/pack.ex:96 #, elixir-autogen, elixir-format, fuzzy msgid "Please select a valid type" msgstr "" diff --git a/priv/gettext/it/LC_MESSAGES/prompts.po b/priv/gettext/it/LC_MESSAGES/prompts.po index 5df2b863..b5c8e4e5 100644 --- a/priv/gettext/it/LC_MESSAGES/prompts.po +++ b/priv/gettext/it/LC_MESSAGES/prompts.po @@ -50,7 +50,7 @@ msgstr "" msgid "%{name} updated successfully" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:29 +#: lib/cannery_web/controllers/user_settings_controller.ex:28 #, elixir-autogen, elixir-format msgid "A link to confirm your email change has been sent to the new address." msgstr "" @@ -85,12 +85,12 @@ msgstr "" msgid "Are you sure you want to log out?" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:77 +#: lib/cannery_web/controllers/user_settings_controller.ex:76 #, elixir-autogen, elixir-format msgid "Email changed successfully." msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:23 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:21 #, elixir-autogen, elixir-format msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly." msgstr "" @@ -110,12 +110,12 @@ msgstr "" msgid "Password reset successfully." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:49 +#: lib/cannery_web/controllers/user_settings_controller.ex:48 #, elixir-autogen, elixir-format msgid "Password updated successfully." msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:65 +#: lib/cannery_web/controllers/user_registration_controller.ex:64 #, elixir-autogen, elixir-format msgid "Please check your email to verify your account" msgstr "" @@ -131,7 +131,7 @@ msgstr "" msgid "Saving..." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:95 +#: lib/cannery_web/controllers/user_settings_controller.ex:94 #, elixir-autogen, elixir-format msgid "Your account has been deleted" msgstr "" @@ -183,7 +183,7 @@ msgstr "" msgid "Shot records updated successfully" msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:37 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:35 #, elixir-autogen, elixir-format msgid "%{email} confirmed successfully." msgstr "" @@ -219,7 +219,7 @@ msgstr "" msgid "Are you sure you want to change your language?" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:65 +#: lib/cannery_web/controllers/user_settings_controller.ex:64 #, elixir-autogen, elixir-format msgid "Language updated successfully." msgstr "" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index 5803f1e1..d1b677cd 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -39,7 +39,7 @@ msgstr "" msgid "%{name} updated successfully" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:29 +#: lib/cannery_web/controllers/user_settings_controller.ex:28 #, elixir-autogen, elixir-format msgid "A link to confirm your email change has been sent to the new address." msgstr "" @@ -74,12 +74,12 @@ msgstr "" msgid "Are you sure you want to log out?" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:77 +#: lib/cannery_web/controllers/user_settings_controller.ex:76 #, elixir-autogen, elixir-format msgid "Email changed successfully." msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:23 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:21 #, elixir-autogen, elixir-format msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly." msgstr "" @@ -99,12 +99,12 @@ msgstr "" msgid "Password reset successfully." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:49 +#: lib/cannery_web/controllers/user_settings_controller.ex:48 #, elixir-autogen, elixir-format msgid "Password updated successfully." msgstr "" -#: lib/cannery_web/controllers/user_registration_controller.ex:65 +#: lib/cannery_web/controllers/user_registration_controller.ex:64 #, elixir-autogen, elixir-format msgid "Please check your email to verify your account" msgstr "" @@ -120,7 +120,7 @@ msgstr "" msgid "Saving..." msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:95 +#: lib/cannery_web/controllers/user_settings_controller.ex:94 #, elixir-autogen, elixir-format msgid "Your account has been deleted" msgstr "" @@ -172,7 +172,7 @@ msgstr "" msgid "Shot records updated successfully" msgstr "" -#: lib/cannery_web/controllers/user_confirmation_controller.ex:37 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:35 #, elixir-autogen, elixir-format msgid "%{email} confirmed successfully." msgstr "" @@ -208,7 +208,7 @@ msgstr "" msgid "Are you sure you want to change your language?" msgstr "" -#: lib/cannery_web/controllers/user_settings_controller.ex:65 +#: lib/cannery_web/controllers/user_settings_controller.ex:64 #, elixir-autogen, elixir-format msgid "Language updated successfully." msgstr ""