Merge remote-tracking branch 'origin/main' into feature/308-web-form

lib/mv_web/live/global_settings_live.ex

@@ -442,7 +442,7 @@ defmodule MvWeb.GlobalSettingsLive do
       </.form_section>
 
       <%!-- Vereinfacht Integration Section --%>
-      <.form_section title={gettext("Vereinfacht Integration")}>
+      <.form_section title={gettext("Accounting-Software (Vereinfacht) Integration")}>
         <%= if @vereinfacht_env_configured do %>
           <p class="text-sm text-base-content/70 mb-4">
             {gettext("Some values are set via environment variables. Those fields are read-only.")}
@@ -550,7 +550,7 @@ defmodule MvWeb.GlobalSettingsLive do
         </.form>
       </.form_section>
       <%!-- OIDC Section --%>
-      <.form_section title={gettext("OIDC")}>
+      <.form_section title={gettext("OIDC (Single Sign-On)")}>
         <%= if @oidc_env_configured do %>
           <p class="text-sm text-base-content/70 mb-4">
             {gettext("Some values are set via environment variables. Those fields are read-only.")}

lib/mv_web/live/import_live/components.ex

@@ -28,15 +28,6 @@ defmodule MvWeb.ImportLive.Components do
             "Use the data field name as the CSV column header in your file. Data fields must exist in Mila before importing, because unknown data field columns will be ignored. Groups and membership fees are not supported for import."
           )}
         </p>
-        <p class="text-sm">
-          <.link
-            href={~p"/settings#custom_fields"}
-            class="link"
-            data-testid="custom-fields-link"
-          >
-            {gettext("Manage Member Data")}
-          </.link>
-        </p>
       </div>
     </div>
     """

lib/mv_web/live/member_live/show.ex

@@ -230,7 +230,7 @@ defmodule MvWeb.MemberLive.Show do
               <%!-- Custom Fields Section --%>
               <%= if Enum.any?(@custom_fields) do %>
                 <div>
-                  <.section_box title={gettext("Custom Fields")}>
+                  <.section_box title={gettext("Individual datafields")}>
                     <div class="grid grid-cols-2 gap-4">
                       <%= for custom_field <- @custom_fields do %>
                         <% cfv = find_custom_field_value(@member.custom_field_values, custom_field.id) %>

lib/mv_web/live/role_live/index.html.heex

@@ -2,7 +2,7 @@
   <.header>
     {gettext("Listing Roles")}
     <:subtitle>
-      {gettext("Manage user roles and their permission sets.")}
+      {gettext("Manage roles and their permission sets.")}
     </:subtitle>
     <:actions>
       <%= if can?(@current_user, :create, Mv.Authorization.Role) do %>