diff --git a/lib/mv_web/live/datafields_live.ex b/lib/mv_web/live/datafields_live.ex index 0fc4c3c..916864b 100644 --- a/lib/mv_web/live/datafields_live.ex +++ b/lib/mv_web/live/datafields_live.ex @@ -29,7 +29,7 @@ defmodule MvWeb.DatafieldsLive do <.header> {gettext("Datafields")} <:subtitle> - {gettext("Configure member fields and custom data fields.")} + {gettext("Configure which data you want to save for your members. Define individual datafields.")} diff --git a/lib/mv_web/live/membership_fee_settings_live.ex b/lib/mv_web/live/membership_fee_settings_live.ex index 8ced57d..94e64c7 100644 --- a/lib/mv_web/live/membership_fee_settings_live.ex +++ b/lib/mv_web/live/membership_fee_settings_live.ex @@ -142,7 +142,7 @@ defmodule MvWeb.MembershipFeeSettingsLive do <.header> {gettext("Membership Fee Settings")} <:subtitle> - {gettext("Configure global settings and fee types for membership fees.")} + {gettext("Configure fee types for membership fees.")} <:actions> <.button variant="primary" navigate={~p"/membership_fee_settings/new_fee_type"}> diff --git a/lib/mv_web/live/membership_fee_type_live/form.ex b/lib/mv_web/live/membership_fee_type_live/form.ex index 237b4b4..215bc2f 100644 --- a/lib/mv_web/live/membership_fee_type_live/form.ex +++ b/lib/mv_web/live/membership_fee_type_live/form.ex @@ -34,9 +34,6 @@ defmodule MvWeb.MembershipFeeTypeLive.Form do {@page_title} - <:subtitle> - {gettext("Use this form to manage membership fee types in your database.")} - <:actions> <.button form="membership-fee-type-form" diff --git a/lib/mv_web/live/role_live/form.ex b/lib/mv_web/live/role_live/form.ex index e066555..f3b1663 100644 --- a/lib/mv_web/live/role_live/form.ex +++ b/lib/mv_web/live/role_live/form.ex @@ -30,7 +30,6 @@ defmodule MvWeb.RoleLive.Form do {@page_title} - <:subtitle>{gettext("Use this form to manage roles in your database.")} <:actions> <.button phx-disable-with={gettext("Saving...")} variant="primary" type="submit"> {gettext("Save")} diff --git a/lib/mv_web/live/statistics_live.ex b/lib/mv_web/live/statistics_live.ex index 32dda6f..63ed0c2 100644 --- a/lib/mv_web/live/statistics_live.ex +++ b/lib/mv_web/live/statistics_live.ex @@ -59,7 +59,6 @@ defmodule MvWeb.StatisticsLive do <.header> {gettext("Statistics")} - <:subtitle>{gettext("Overview from first membership to today")}
diff --git a/lib/mv_web/live/user_live/form.ex b/lib/mv_web/live/user_live/form.ex index a00c06a..4934e3a 100644 --- a/lib/mv_web/live/user_live/form.ex +++ b/lib/mv_web/live/user_live/form.ex @@ -53,7 +53,6 @@ defmodule MvWeb.UserLive.Form do {@page_title} - <:subtitle>{gettext("Use this form to manage user records in your database.")} <:actions> <.button form="user-form" @@ -80,7 +79,7 @@ defmodule MvWeb.UserLive.Form do /> <% end %> - +
- + <%= if @can_manage_member_linking do %>
diff --git a/lib/mv_web/live/user_live/index.html.heex b/lib/mv_web/live/user_live/index.html.heex index cffacf1..91a5485 100644 --- a/lib/mv_web/live/user_live/index.html.heex +++ b/lib/mv_web/live/user_live/index.html.heex @@ -1,6 +1,7 @@ <.header> {gettext("Users")} + <:subtitle>{gettext("Manage users and their permissions.")} <:actions> <%= if can?(@current_user, :create, Mv.Accounts.User) do %> <.button variant="primary" navigate={~p"/users/new"} data-testid="user-new"> diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 32c92b1..00d5541 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -388,11 +388,6 @@ msgstr "Benutzer*in speichern" msgid "Show User" msgstr "Benutzer*in anzeigen" -#: lib/mv_web/live/user_live/form.ex -#, elixir-autogen, elixir-format -msgid "Use this form to manage user records in your database." -msgstr "Verwende dieses Formular, um Benutzer*innen-Datensätze zu verwalten." - #: lib/mv_web/live/user_live/form.ex #: lib/mv_web/live/user_live/show.ex #, elixir-autogen, elixir-format @@ -1476,11 +1471,6 @@ msgstr "Art" msgid "Type '%{confirmation}' to confirm" msgstr "Gib '%{confirmation}' ein, um zu bestätigen" -#: lib/mv_web/live/membership_fee_type_live/form.ex -#, elixir-autogen, elixir-format -msgid "Use this form to manage membership fee types in your database." -msgstr "Verwende dieses Formular, um Mitgliedsbeitragsarten in deiner Datenbank zu verwalten." - #: lib/mv_web/live/member_live/show/membership_fees_component.ex #, elixir-autogen, elixir-format msgid "Warning" @@ -1707,11 +1697,6 @@ msgstr "System-Rollen können nicht gelöscht werden." msgid "Toggle sidebar" msgstr "Sidebar umschalten" -#: lib/mv_web/live/role_live/form.ex -#, elixir-autogen, elixir-format -msgid "Use this form to manage roles in your database." -msgstr "Verwende dieses Formular, um Rollen in deiner Datenbank zu verwalten." - #: lib/mv_web/components/layouts/sidebar.ex #, elixir-autogen, elixir-format msgid "User menu" @@ -2431,11 +2416,6 @@ msgstr "Alle Jahre zusammengefasst (Kreis)" msgid "Contributions by year" msgstr "Beiträge nach Jahr" -#: lib/mv_web/live/statistics_live.ex -#, elixir-autogen, elixir-format -msgid "Overview from first membership to today" -msgstr "Übersicht vom ersten Eintritt bis heute" - #: lib/mv_web/live/statistics_live.ex #, elixir-autogen, elixir-format msgid "Contributions by year as table with stacked bars" @@ -2938,16 +2918,6 @@ msgstr "Client-ID" msgid "Client Secret" msgstr "Client-Geheimnis" -#: lib/mv_web/live/membership_fee_settings_live.ex -#, elixir-autogen, elixir-format, fuzzy -msgid "Configure global settings and fee types for membership fees." -msgstr "Globale Einstellungen für Mitgliedsbeiträge konfigurieren." - -#: lib/mv_web/live/datafields_live.ex -#, elixir-autogen, elixir-format -msgid "Configure member fields and custom data fields." -msgstr "Mitgliedsfelder und benutzerdefinierte Datenfelder konfigurieren." - #: lib/mv_web/live/datafields_live.ex #, elixir-autogen, elixir-format, fuzzy msgid "Custom fields" @@ -3240,6 +3210,21 @@ msgstr "Rolle löschen" msgid "Delete User" msgstr "Benutzer*in löschen" +#: lib/mv_web/live/membership_fee_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Configure fee types for membership fees." +msgstr "Verwalte Beitragsarten und Mitgliedsbeiträge." + +#: lib/mv_web/live/datafields_live.ex +#, elixir-autogen, elixir-format +msgid "Configure which data you want to save for your members. Define individual datafields." +msgstr "Verwalte welche Daten du für eure Mitglieder speichern möchtest. Lege individuelle datenfelder an." + +#: lib/mv_web/live/user_live/index.html.heex +#, elixir-autogen, elixir-format, fuzzy +msgid "Manage users and their permissions." +msgstr "Verwalte Benutzer*innen und ihre Berechtigungen." + #~ #: lib/mv_web/live/member_field_live/form_component.ex #~ #, elixir-autogen, elixir-format #~ msgid "Back to Settings" @@ -3265,6 +3250,16 @@ msgstr "Benutzer*in löschen" #~ msgid "Coming soon" #~ msgstr "Demnächst verfügbar" +#~ #: lib/mv_web/live/membership_fee_settings_live.ex +#~ #, elixir-autogen, elixir-format, fuzzy +#~ msgid "Configure global settings and fee types for membership fees." +#~ msgstr "Globale Einstellungen für Mitgliedsbeiträge konfigurieren." + +#~ #: lib/mv_web/live/datafields_live.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Configure member fields and custom data fields." +#~ msgstr "Mitgliedsfelder und benutzerdefinierte Datenfelder konfigurieren." + #~ #: lib/mv_web/live/components/field_visibility_dropdown_component.ex #~ #, elixir-autogen, elixir-format #~ msgid "Custom Field %{id}" @@ -3286,6 +3281,11 @@ msgstr "Benutzer*in löschen" #~ msgid "Edit user" #~ msgstr "Benutzer*in bearbeiten" +#~ #: lib/mv_web/live/statistics_live.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Overview from first membership to today" +#~ msgstr "Übersicht vom ersten Eintritt bis heute" + #~ #: lib/mv_web/live/components/member_filter_component.ex #~ #, elixir-autogen, elixir-format #~ msgid "Reset" @@ -3321,6 +3321,21 @@ msgstr "Benutzer*in löschen" #~ msgid "This is a user record from your database." #~ msgstr "Dies ist ein Benutzer*innen-Datensatz aus Ihrer Datenbank." +#~ #: lib/mv_web/live/membership_fee_type_live/form.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Use this form to manage membership fee types in your database." +#~ msgstr "Verwende dieses Formular, um Mitgliedsbeitragsarten in deiner Datenbank zu verwalten." + +#~ #: lib/mv_web/live/role_live/form.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Use this form to manage roles in your database." +#~ msgstr "Verwende dieses Formular, um Rollen in deiner Datenbank zu verwalten." + +#~ #: lib/mv_web/live/user_live/form.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Use this form to manage user records in your database." +#~ msgstr "Verwende dieses Formular, um Benutzer*innen-Datensätze zu verwalten." + #~ #: lib/mv_web/live/group_live/index.ex #~ #, elixir-autogen, elixir-format #~ msgid "View" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index d6a5208..ec97119 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -389,11 +389,6 @@ msgstr "" msgid "Show User" msgstr "" -#: lib/mv_web/live/user_live/form.ex -#, elixir-autogen, elixir-format -msgid "Use this form to manage user records in your database." -msgstr "" - #: lib/mv_web/live/user_live/form.ex #: lib/mv_web/live/user_live/show.ex #, elixir-autogen, elixir-format @@ -1477,11 +1472,6 @@ msgstr "" msgid "Type '%{confirmation}' to confirm" msgstr "" -#: lib/mv_web/live/membership_fee_type_live/form.ex -#, elixir-autogen, elixir-format -msgid "Use this form to manage membership fee types in your database." -msgstr "" - #: lib/mv_web/live/member_live/show/membership_fees_component.ex #, elixir-autogen, elixir-format msgid "Warning" @@ -1708,11 +1698,6 @@ msgstr "" msgid "Toggle sidebar" msgstr "" -#: lib/mv_web/live/role_live/form.ex -#, elixir-autogen, elixir-format -msgid "Use this form to manage roles in your database." -msgstr "" - #: lib/mv_web/components/layouts/sidebar.ex #, elixir-autogen, elixir-format msgid "User menu" @@ -2432,11 +2417,6 @@ msgstr "" msgid "Contributions by year" msgstr "" -#: lib/mv_web/live/statistics_live.ex -#, elixir-autogen, elixir-format -msgid "Overview from first membership to today" -msgstr "" - #: lib/mv_web/live/statistics_live.ex #, elixir-autogen, elixir-format msgid "Contributions by year as table with stacked bars" @@ -2938,16 +2918,6 @@ msgstr "" msgid "Client Secret" msgstr "" -#: lib/mv_web/live/membership_fee_settings_live.ex -#, elixir-autogen, elixir-format -msgid "Configure global settings and fee types for membership fees." -msgstr "" - -#: lib/mv_web/live/datafields_live.ex -#, elixir-autogen, elixir-format -msgid "Configure member fields and custom data fields." -msgstr "" - #: lib/mv_web/live/datafields_live.ex #, elixir-autogen, elixir-format msgid "Custom fields" @@ -3239,3 +3209,18 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Delete User" msgstr "" + +#: lib/mv_web/live/membership_fee_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Configure fee types for membership fees." +msgstr "" + +#: lib/mv_web/live/datafields_live.ex +#, elixir-autogen, elixir-format +msgid "Configure which data you want to save for your members. Define individual datafields." +msgstr "" + +#: lib/mv_web/live/user_live/index.html.heex +#, elixir-autogen, elixir-format +msgid "Manage users and their permissions." +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index a3252e5..a0c41cc 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -389,11 +389,6 @@ msgstr "" msgid "Show User" msgstr "" -#: lib/mv_web/live/user_live/form.ex -#, elixir-autogen, elixir-format, fuzzy -msgid "Use this form to manage user records in your database." -msgstr "" - #: lib/mv_web/live/user_live/form.ex #: lib/mv_web/live/user_live/show.ex #, elixir-autogen, elixir-format @@ -1477,11 +1472,6 @@ msgstr "" msgid "Type '%{confirmation}' to confirm" msgstr "" -#: lib/mv_web/live/membership_fee_type_live/form.ex -#, elixir-autogen, elixir-format, fuzzy -msgid "Use this form to manage membership fee types in your database." -msgstr "" - #: lib/mv_web/live/member_live/show/membership_fees_component.ex #, elixir-autogen, elixir-format msgid "Warning" @@ -1708,11 +1698,6 @@ msgstr "" msgid "Toggle sidebar" msgstr "" -#: lib/mv_web/live/role_live/form.ex -#, elixir-autogen, elixir-format, fuzzy -msgid "Use this form to manage roles in your database." -msgstr "" - #: lib/mv_web/components/layouts/sidebar.ex #, elixir-autogen, elixir-format, fuzzy msgid "User menu" @@ -2432,11 +2417,6 @@ msgstr "" msgid "Contributions by year" msgstr "" -#: lib/mv_web/live/statistics_live.ex -#, elixir-autogen, elixir-format -msgid "Overview from first membership to today" -msgstr "" - #: lib/mv_web/live/statistics_live.ex #, elixir-autogen, elixir-format, fuzzy msgid "Contributions by year as table with stacked bars" @@ -2938,16 +2918,6 @@ msgstr "" msgid "Client Secret" msgstr "" -#: lib/mv_web/live/membership_fee_settings_live.ex -#, elixir-autogen, elixir-format, fuzzy -msgid "Configure global settings and fee types for membership fees." -msgstr "" - -#: lib/mv_web/live/datafields_live.ex -#, elixir-autogen, elixir-format -msgid "Configure member fields and custom data fields." -msgstr "" - #: lib/mv_web/live/datafields_live.ex #, elixir-autogen, elixir-format, fuzzy msgid "Custom fields" @@ -3240,6 +3210,21 @@ msgstr "" msgid "Delete User" msgstr "" +#: lib/mv_web/live/membership_fee_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Configure fee types for membership fees." +msgstr "" + +#: lib/mv_web/live/datafields_live.ex +#, elixir-autogen, elixir-format +msgid "Configure which data you want to save for your members. Define individual datafields." +msgstr "" + +#: lib/mv_web/live/user_live/index.html.heex +#, elixir-autogen, elixir-format, fuzzy +msgid "Manage users and their permissions." +msgstr "" + #~ #: lib/mv_web/live/member_field_live/form_component.ex #~ #, elixir-autogen, elixir-format #~ msgid "Back to Settings" @@ -3265,6 +3250,16 @@ msgstr "" #~ msgid "Coming soon" #~ msgstr "" +#~ #: lib/mv_web/live/membership_fee_settings_live.ex +#~ #, elixir-autogen, elixir-format, fuzzy +#~ msgid "Configure global settings and fee types for membership fees." +#~ msgstr "" + +#~ #: lib/mv_web/live/datafields_live.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Configure member fields and custom data fields." +#~ msgstr "" + #~ #: lib/mv_web/live/components/field_visibility_dropdown_component.ex #~ #, elixir-autogen, elixir-format, fuzzy #~ msgid "Custom Field %{id}" @@ -3281,6 +3276,11 @@ msgstr "" #~ msgid "Edit user" #~ msgstr "" +#~ #: lib/mv_web/live/statistics_live.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Overview from first membership to today" +#~ msgstr "" + #~ #: lib/mv_web/live/components/member_filter_component.ex #~ #, elixir-autogen, elixir-format #~ msgid "Reset" @@ -3316,6 +3316,21 @@ msgstr "" #~ msgid "This is a user record from your database." #~ msgstr "" +#~ #: lib/mv_web/live/membership_fee_type_live/form.ex +#~ #, elixir-autogen, elixir-format, fuzzy +#~ msgid "Use this form to manage membership fee types in your database." +#~ msgstr "" + +#~ #: lib/mv_web/live/role_live/form.ex +#~ #, elixir-autogen, elixir-format, fuzzy +#~ msgid "Use this form to manage roles in your database." +#~ msgstr "" + +#~ #: lib/mv_web/live/user_live/form.ex +#~ #, elixir-autogen, elixir-format, fuzzy +#~ msgid "Use this form to manage user records in your database." +#~ msgstr "" + #~ #: lib/mv_web/live/group_live/index.ex #~ #, elixir-autogen, elixir-format #~ msgid "View"