plutonium 0.64.0 → 0.65.0

data/lib/plutonium/ui/dashboard/metric.rb

@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+module Plutonium
+  module UI
+    module Dashboard
+      # A single headline number with an optional change indicator.
+      #
+      # The card's block returns either the value itself or a hash:
+      #
+      #   {value: 1_240}                                   # just the number
+      #   {value: 1_240, previous: 1_100}                  # change computed: +12.7%
+      #   {value: 1_240, change: 12.7}                     # change in percentage points
+      #   {value: 1_240, change: "+140", trend: :up}       # change shown verbatim
+      #   {value: 98.2, change_label: "vs. last week"}     # caption after the change
+      #
+      # `format:` picks the number formatter (`:number`, `:currency`,
+      # `:percentage`, `:human`, or a proc run on the dashboard); `positive:`
+      # says which direction is good (`:up` by default, `:down` for churn or
+      # error rates) and drives the change colour.
+      class Metric < Card
+        include ActiveSupport::NumberHelper
+
+        private
+
+        def render_body
+          data = normalize(card.evaluate(dashboard))
+
+          div(class: "pu-metric") do
+            div(class: "pu-metric-value") { format_value(data[:value]) }
+            render_change(data) if data[:change] || data[:change_label]
+          end
+        end
+
+        def normalize(result)
+          data = result.is_a?(Hash) ? result.symbolize_keys : {value: result}
+          data[:change_label] ||= card.options[:change_label]
+
+          if !data.key?(:change) && data[:previous].is_a?(Numeric) && data[:value].is_a?(Numeric)
+            data[:change] = percent_change(data[:value], data[:previous])
+          end
+
+          data[:trend] ||= infer_trend(data[:change]) if data.key?(:change)
+          data
+        end
+
+        def percent_change(value, previous)
+          return nil if previous.zero?
+
+          ((value - previous) / previous.to_f.abs) * 100
+        end
+
+        def infer_trend(change)
+          case change
+          when Numeric
+            if change.positive? then :up
+            elsif change.negative? then :down
+            else :flat
+            end
+          when String
+            if change.start_with?("-") then :down
+            elsif change.start_with?("+") then :up
+            else :flat
+            end
+          end
+        end
+
+        def render_change(data)
+          trend = data[:trend] || :flat
+          div(class: tokens("pu-metric-change", change_tone_class(trend))) do
+            render_trend_icon(trend)
+            span(class: "font-medium") { format_change(data[:change]) } if data[:change]
+            span(class: "pu-metric-change-label") { data[:change_label] } if data[:change_label].present?
+          end
+        end
+
+        def render_trend_icon(trend)
+          icon = case trend
+          when :up then Phlex::TablerIcons::TrendingUp
+          when :down then Phlex::TablerIcons::TrendingDown
+          else Phlex::TablerIcons::Minus
+          end
+          render icon.new(class: "size-4 shrink-0")
+        end
+
+        def change_tone_class(trend)
+          return "pu-metric-change-neutral" if trend == :flat || trend.nil?
+
+          good = (trend == :up) == (card.options[:positive] == :up)
+          good ? "pu-metric-change-positive" : "pu-metric-change-negative"
+        end
+
+        def format_change(change)
+          case change
+          when Numeric
+            sign = change.positive? ? "+" : ""
+            "#{sign}#{number_to_rounded(change, precision: 1, strip_insignificant_zeros: true)}%"
+          else change.to_s
+          end
+        end
+
+        def format_value(value)
+          return t("plutonium.dashboard.metric.empty") if value.nil?
+
+          formatted = case (format = card.options[:format])
+          when Proc then dashboard.instance_exec(value, &format)
+          when :currency then number_to_currency(value, **currency_options)
+          when :percentage then number_to_percentage(value, precision: precision(1))
+          when :human then number_to_human(value, precision: precision(3))
+          else format_number(value)
+          end
+
+          [card.options[:prefix], formatted, card.options[:suffix]].compact.join
+        end
+
+        def format_number(value)
+          return value.to_s unless value.is_a?(Numeric)
+
+          if card.options[:precision] || value.is_a?(Float)
+            number_to_rounded(value, precision: precision(value.is_a?(Float) ? 2 : 0), delimiter: ",", strip_insignificant_zeros: true)
+          else
+            number_to_delimited(value)
+          end
+        end
+
+        def currency_options
+          options = {precision: precision(2)}
+          options[:unit] = card.options[:unit] if card.options[:unit]
+          options
+        end
+
+        def precision(default)
+          card.options.fetch(:precision, default)
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/ui/dashboard/skeleton.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Plutonium
+  module UI
+    module Dashboard
+      # The placeholder a lazy card's frame shows until its response lands.
+      # Shaped like the card it stands in for, so the grid does not jump when
+      # the real card arrives.
+      class Skeleton < Plutonium::UI::Component::Base
+        def initialize(card:)
+          @card = card
+        end
+
+        def view_template
+          div(role: "status", class: "pu-card pu-dashboard-card pu-dashboard-skeleton h-full motion-safe:animate-pulse") do
+            div(class: "h-3 w-24 rounded-full bg-[var(--pu-border-strong)]")
+            render_body
+            span(class: "sr-only") { t("plutonium.dashboard.loading_card", card: @card.label) }
+          end
+        end
+
+        private
+
+        def render_body
+          case @card.kind
+          when :metric
+            div(class: "mt-4 h-8 w-32 rounded-[var(--pu-radius-md)] bg-[var(--pu-border)]")
+            div(class: "mt-3 h-2 w-20 rounded-full bg-[var(--pu-border)]")
+          when :chart
+            div(class: "mt-4 rounded-[var(--pu-radius-md)] bg-[var(--pu-border)]", style: "height: #{@card.options[:height]};")
+          else
+            div(class: "mt-4 h-2 w-full rounded-full bg-[var(--pu-border)]")
+            div(class: "mt-3 h-2 w-5/6 rounded-full bg-[var(--pu-border)]")
+            div(class: "mt-3 h-2 w-2/3 rounded-full bg-[var(--pu-border)]")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/ui/display/components/attachment.rb

@@ -81,7 +81,7 @@ module Plutonium
           end
 
           def attachment_extension(attachment)
-            attachment.try(:extension) || File.extname(attachment.filename.to_s)
+            attachment.try(:extension).presence || File.extname(attachment.filename.to_s).delete(".")
           end
 
           def normalize_value(value)

data/lib/plutonium/ui/display/components/badge.rb

@@ -62,10 +62,16 @@ module Plutonium
           def render_value(value)
             variant = self.class.variant_for(value, colors: @colors)
             span(**attributes, class: tokens("pu-badge", "pu-badge-#{variant}")) do
-              plain self.class.humanize(value)
+              plain value_label(value)
             end
           end
 
+          # plutonium.values.<model>.<attr>.<value> or the Rails enum key
+          # activerecord.attributes.<model>.<attr>/<value>, else humanized.
+          def value_label(value)
+            Plutonium::Translation.value_label(field.object.class, field.key, value) || self.class.humanize(value)
+          end
+
           protected
 
           def build_attributes

data/lib/plutonium/ui/display/components/boolean.rb

@@ -25,9 +25,9 @@ module Plutonium
             end
           end
 
-          def true_label = @true_label || "Yes"
+          def true_label = @true_label || Plutonium::Translation.t("plutonium.boolean.true")
 
-          def false_label = @false_label || "No"
+          def false_label = @false_label || Plutonium::Translation.t("plutonium.boolean.false")
 
           def build_attributes
             @true_label = attributes.delete(:true_label)

data/lib/plutonium/ui/display/resource.rb

@@ -123,6 +123,9 @@ module Plutonium
             condition = section.condition
             next if condition && !instance_exec(&condition)
             next if resolved.fields.empty?
+            # A section whose fields are all hidden by their own `condition:`
+            # would render as an empty card; hidden display fields emit nothing.
+            next if resolved.fields.all? { |name| field_condition_hidden?(name) }
 
             Plutonium::Definition::FormLayout::ResolvedSection.new(
               section: Plutonium::Definition::FormLayout::Section.new(
@@ -147,16 +150,7 @@ module Plutonium
         # `condition:` is excluded for the same reason it is on the form: it
         # asks "should this render here, now?", which is resolved separately
         # and against this display, not turned into a value up front.
-        def resolve_section_option_procs(options)
-          return options if options.blank?
-
-          options.to_h do |key, value|
-            resolvable = key != :condition && value.is_a?(Proc)
-            next [key, value] unless resolvable
-
-            [key, value.arity.zero? ? value.call : value.call(self)]
-          end
-        end
+        def resolve_section_option_procs(options) = resolve_option_procs(options)
 
         # Pure presentation — the section is already resolved (visible) by
         # resolve_display_layout.
@@ -206,7 +200,7 @@ module Plutonium
 
             tablist.with_tab(
               identifier: "details",
-              title: -> { plain "Details" }
+              title: -> { plain t("plutonium.ui.details") }
             ) do
               render details_display
             end
@@ -279,6 +273,14 @@ module Plutonium
           raise ArgumentError, "#{object.class}##{name} defined in #permitted_associations, but #{reflection.klass} is not a registered resource"
         end
 
+        # Whether +name+ is hidden on this render by its own `condition:` — the
+        # same check render_resource_field makes before rendering it.
+        def field_condition_hidden?(name)
+          condition = resource_definition.defined_displays.dig(name, :options, :condition) ||
+            resource_definition.defined_fields.dig(name, :options, :condition)
+          condition.present? && !instance_exec(&condition)
+        end
+
         def render_resource_field(name)
           when_permitted(name) do
             # field :name, as: :string
@@ -294,6 +296,9 @@ module Plutonium
             display_definition = resource_definition.defined_displays[name] || {}
             display_options = display_definition[:options] || {}
 
+            field_options = resolve_field_level_procs(field_options)
+            display_options = resolve_field_level_procs(display_options)
+
             # Check for conditional rendering
             condition = display_options[:condition] || field_options[:condition]
             conditionally_hidden = condition && !instance_exec(&condition)
@@ -301,13 +306,15 @@ module Plutonium
 
             tag = display_options[:as] || field_options[:as]
 
-            # Extract field-level options from display_options and merge into field_options
-            # These are Phlexi field options that should be passed to field(), not to the tag builder
-            field_level_keys = [:label, :description, :placeholder]
-            field_level_options = display_options.slice(*field_level_keys)
+            # Route the display's own field-level options to field(); strip the
+            # full union from the tag attributes so a form-only key (e.g. :hint)
+            # declared here is dropped rather than leaked as an HTML attribute.
+            field_level_options = display_options.slice(*DISPLAY_FIELD_LEVEL_KEYS)
             field_options = field_options.merge(field_level_options)
+            # A blank description falls back to plutonium.fields.<model>.<attr>.description.
+            field_options = Plutonium::Translation.fill_field_text(field_options, object.class, name, :description)
 
-            tag_attributes = display_options.except(:wrapper, :as, :condition, *field_level_keys)
+            tag_attributes = display_options.except(:wrapper, :as, :condition, *FIELD_LEVEL_KEYS)
 
             # A `formatter:` produces the display string itself, so render it
             # through the formatted-value component regardless of the field's

data/lib/plutonium/ui/export_button.rb

@@ -45,7 +45,7 @@ module Plutonium
           style: PRIMARY_STYLE
         ) do
           render Phlex::TablerIcons::Download.new(class: "w-4 h-4 shrink-0")
-          span { "Export" }
+          span { t("plutonium.ui.export.export") }
         end
       end
 
@@ -54,7 +54,7 @@ module Plutonium
           type: "button",
           class: "pu-btn pu-btn-outline pu-btn-sm",
           style: CARET_STYLE,
-          aria: {expanded: "false", haspopup: "menu", label: "More export options"},
+          aria: {expanded: "false", haspopup: "menu", label: t("plutonium.ui.export.more_options")},
           data: {resource_drop_down_target: "trigger"}
         ) do
           render Phlex::TablerIcons::ChevronDown.new(class: "w-4 h-4")
@@ -76,7 +76,7 @@ module Plutonium
               class: "flex items-center gap-2 px-4 py-2 text-sm text-[var(--pu-text)] hover:bg-[var(--pu-surface-alt)] transition-colors"
             ) do
               render Phlex::TablerIcons::Download.new(class: "w-4 h-4")
-              span { "Export all" }
+              span { t("plutonium.ui.export.export_all") }
             end
           end
         end

data/lib/plutonium/ui/form/components/key_value_store.rb

@@ -81,7 +81,7 @@ module Plutonium
               # Key input
               input(
                 type: :text,
-                placeholder: "Key",
+                placeholder: Plutonium::Translation.t("plutonium.ui.form.key_value_store.key_placeholder"),
                 value: key,
                 name: "#{field_name}[#{index}][key]",
                 id: "#{field.dom.id}_#{index}_key",
@@ -92,7 +92,7 @@ module Plutonium
               # Value input
               input(
                 type: :text,
-                placeholder: "Value",
+                placeholder: Plutonium::Translation.t("plutonium.ui.form.key_value_store.value_placeholder"),
                 value: value,
                 name: "#{field_name}[#{index}][value]",
                 id: "#{field.dom.id}_#{index}_value",
@@ -122,7 +122,7 @@ module Plutonium
                   key_value_store_target: "addButton"
                 }
               ) do
-                plain "+ Add Pair"
+                plain Plutonium::Translation.t("plutonium.ui.form.key_value_store.add_pair")
               end
             end
           end
@@ -135,7 +135,7 @@ module Plutonium
               ) do
                 input(
                   type: :text,
-                  placeholder: "Key",
+                  placeholder: Plutonium::Translation.t("plutonium.ui.form.key_value_store.key_placeholder"),
                   name: "#{field_name}[__INDEX__][key]",
                   id: "#{field.dom.id}___INDEX___key",
                   class: "flex-1 px-3 py-1 text-sm border border-[var(--pu-border)] rounded-[var(--pu-radius-sm)] focus:ring-2 focus:ring-primary-500 focus:border-primary-500 bg-[var(--pu-surface)] text-[var(--pu-text)]",
@@ -144,7 +144,7 @@ module Plutonium
 
                 input(
                   type: :text,
-                  placeholder: "Value",
+                  placeholder: Plutonium::Translation.t("plutonium.ui.form.key_value_store.value_placeholder"),
                   name: "#{field_name}[__INDEX__][value]",
                   id: "#{field.dom.id}___INDEX___value",
                   class: "flex-1 px-3 py-1 text-sm border border-[var(--pu-border)] rounded-[var(--pu-radius-sm)] focus:ring-2 focus:ring-primary-500 focus:border-primary-500 bg-[var(--pu-surface)] text-[var(--pu-text)]",

data/lib/plutonium/ui/form/components/password.rb

@@ -74,9 +74,9 @@ module Plutonium
           def apply_default_hint(value)
             return if field.has_hint?
             if value == SENTINEL
-              field.hint("Leave blank to keep the current value.")
+              field.hint(Plutonium::Translation.t("plutonium.ui.form.password.keep_current_hint"))
             elsif reentry_required?
-              field.hint("Re-enter the new value to save it.")
+              field.hint(Plutonium::Translation.t("plutonium.ui.form.password.reenter_hint"))
             end
           end
 

data/lib/plutonium/ui/form/components/resource_select.rb

@@ -34,13 +34,37 @@ module Plutonium
           # capped at `limit`. Shared by `choices` (with the limit) and
           # `normalize_simple_input` (without — so typeahead picks beyond the
           # rendered subset still validate).
+          #
+          # The custom `scope:` (set on the Association filter) narrows the
+          # relation BEFORE authorization, so policy can only further reduce —
+          # never widen — what the scope allows. Mirrors the kanban/positioning
+          # scope pattern.
           def authorized_relation(limit: nil)
             relation = @association_class.all
+            relation = apply_scope(relation, @scope)
             relation = relation.limit(limit) if limit && relation.respond_to?(:limit)
             return relation if @skip_authorization
             authorized_resource_scope(@association_class, relation: relation)
           end
 
+          # Applies an optional association scope to a relation.
+          #   Symbol → relation.public_send(sym)   (named scope, e.g. :verified)
+          #   Proc   → arity 0  → relation.instance_exec(&scope) (kanban form: -> { where(...) })
+          #          → arity ≥1 → scope.call(relation)             (documented form: ->(s) { s.verified })
+          #   nil    → relation unchanged
+          # The arity dispatch matches call_option_proc (Form::Resource) so the
+          # documented `->(s) { s.active }` signature works AND the zero-arg
+          # kanban form works. Unsupported types fail loud rather than silently
+          # doing nothing (the original bug).
+          def apply_scope(relation, scope)
+            case scope
+            when Symbol then relation.public_send(scope)
+            when Proc then scope.arity.zero? ? relation.instance_exec(&scope) : scope.call(relation)
+            when nil then relation
+            else raise ArgumentError, "Unsupported association scope: #{scope.inspect} (expected Symbol, Proc, or nil)"
+            end
+          end
+
           def build_attributes
             # Defaults must land BEFORE super — AcceptsChoices.build_attributes
             # consumes :value_method / :label_method off `attributes` into
@@ -52,6 +76,7 @@ module Plutonium
 
             @association_class = attributes.delete(:association_class)
             @skip_authorization = attributes.delete(:skip_authorization)
+            @scope = attributes.delete(:scope)
             @choice_limit = attributes.fetch(:choice_limit) { DEFAULT_CHOICE_LIMIT }
             attributes.delete(:choice_limit)
             # Stash the typeahead option; the URL helper needs view_context
@@ -103,6 +128,8 @@ module Plutonium
             end
 
             choices.values.find { |opt| same_record?(input_value, opt) } && input_value
+          rescue
+            nil
           end
 
           # Two values point at the same record when both decode to the

data/lib/plutonium/ui/form/components/secure_association.rb

@@ -173,6 +173,8 @@ module Plutonium
 
             return nil unless sgid.model_class <= association_reflection.klass
             authorized_relation.exists?(id: sgid.model_id) ? sgid : nil
+          rescue
+            nil
           end
 
           def selected?(option)

data/lib/plutonium/ui/form/components/uppy.rb

@@ -156,7 +156,7 @@ module Plutonium
               data: {action: "click->attachment-preview#remove"}
             ) do
               span(class: "bi bi-trash")
-              plain "Delete"
+              plain Plutonium::Translation.t("plutonium.ui.form.attachment.delete")
             end
           end
 
@@ -165,7 +165,7 @@ module Plutonium
           end
 
           def attachment_extension(attachment)
-            attachment.try(:extension) || File.extname(attachment.filename.to_s)
+            attachment.try(:extension).presence || File.extname(attachment.filename.to_s).delete(".")
           end
 
           def build_direct_upload_options
@@ -184,13 +184,21 @@ module Plutonium
               max_file_size: nil,
               min_file_size: nil,
               max_total_size: nil,
-              max_file_num: attributes.fetch(:size, field.multiple? ? field.limit : 1),
+              max_file_num: attributes.fetch(:size) { field.multiple? ? field.limit : 1 },
               min_file_num: nil,
               allowed_file_types: nil,
               required_meta_fields: nil,
               endpoint: attributes[:endpoint] || "/upload"
             }.each do |key, default_value|
               value = attributes.key?(key) ? attributes.delete(key) : default_value
+              # The attachment-input controller declares Array/Object value types,
+              # which Stimulus reads with JSON.parse. Phlex would otherwise render an
+              # array attribute space-joined (its class-list behaviour), so
+              # allowed_file_types: [".csv", "text/csv"] reached the controller as
+              # ".csv text/csv" and JSON.parse threw on connect — after the native
+              # file input was already hidden, leaving no usable file picker. Emit
+              # structured values as JSON, matching intl_tel_input's options.
+              value = value.to_json if value.is_a?(Array) || value.is_a?(Hash)
               direct_upload_options[:data][:"attachment_input_#{key}_value"] = value
             end
 

data/lib/plutonium/ui/form/concerns/renders_nested_resource_fields.rb

@@ -263,7 +263,7 @@ module Plutonium
           def render_nested_fields_add_button_content(name)
             span(class: "bg-secondary-700 text-white hover:bg-secondary-800 focus:ring-secondary-300 dark:bg-secondary-600 dark:hover:bg-secondary-700 dark:focus:ring-secondary-800 flex items-center justify-center px-4 py-1.5 text-sm font-medium rounded-lg focus:outline-none focus:ring-4") do
               render Phlex::TablerIcons::Plus.new(class: "w-4 h-4 mr-1")
-              span { "Add #{name.to_s.singularize.humanize}" }
+              span { t("plutonium.ui.form.repeater.add", name: name.to_s.singularize.humanize) }
             end
           end
 

data/lib/plutonium/ui/form/concerns/renders_repeater_row_controls.rb

@@ -29,7 +29,7 @@ module Plutonium
             div(class: "flex items-center justify-end") do
               button(type: :button, class: REMOVE_BUTTON_CLASS, data_action: action) do
                 render Phlex::TablerIcons::Trash.new(class: "w-4 h-4")
-                span { "Remove" }
+                span { t("plutonium.ui.form.repeater.remove") }
               end
             end
           end
@@ -39,10 +39,11 @@ module Plutonium
           # a left danger stripe + struck-through label read as "pending delete".
           #
           # @param restore_action [String] Stimulus action for the Restore button
-          # @param label [String] text shown beside the trash icon
+          # @param label [String, nil] text shown beside the trash icon; defaults to "Removed"
           # @param bar_data [Hash] extra data attributes (Stimulus target/marker)
           #   the controller uses to find and toggle this bar
-          def render_repeater_removed_bar(restore_action:, label: "Removed", **bar_data)
+          def render_repeater_removed_bar(restore_action:, label: nil, **bar_data)
+            label ||= t("plutonium.ui.form.repeater.removed")
             div(
               hidden: true,
               class: "-m-4 flex items-center justify-between gap-3 px-4 py-2.5 " \
@@ -56,7 +57,7 @@ module Plutonium
               end
               button(type: :button, class: RESTORE_BUTTON_CLASS, data_action: restore_action) do
                 render Phlex::TablerIcons::ArrowBackUp.new(class: "w-4 h-4")
-                span { "Restore" }
+                span { t("plutonium.ui.form.repeater.restore") }
               end
             end
           end

data/lib/plutonium/ui/form/concerns/renders_structured_inputs.rb

@@ -137,7 +137,7 @@ module Plutonium
               ) do
                 span(class: "bg-secondary-700 text-white flex items-center justify-center px-4 py-1.5 text-sm font-medium rounded-lg") do
                   render Phlex::TablerIcons::Plus.new(class: "w-4 h-4 mr-1")
-                  span { "Add #{name.to_s.singularize.humanize}" }
+                  span { t("plutonium.ui.form.repeater.add", name: name.to_s.singularize.humanize) }
                 end
               end
             end

data/lib/plutonium/ui/form/query.rb

@@ -82,7 +82,7 @@ module Plutonium
               render Phlex::TablerIcons::Search.new(class: "w-5 h-5 text-[var(--pu-text-muted)]")
             end
             render field(:search, value: search_query)
-              .placeholder("Search...")
+              .placeholder(t("plutonium.ui.table.search_placeholder"))
               .input_tag(
                 value: search_query,
                 class: "pu-input pu-input-icon-left w-full",
@@ -106,7 +106,7 @@ module Plutonium
               data: {resource_drop_down_target: "trigger"}
             ) do
               render Phlex::TablerIcons::Filter.new(class: "w-4 h-4 inline-block align-text-bottom")
-              plain " Filters"
+              plain " #{t("plutonium.ui.table.filters")}"
               if active_count > 0
                 plain " "
                 span(class: "inline-flex items-center justify-center w-5 h-5 text-xs font-semibold rounded-full text-gray-800 bg-white") do
@@ -142,13 +142,13 @@ module Plutonium
               ) do
                 render Phlex::TablerIcons::X.new(class: "w-5 h-5")
               end
-              span(class: "text-sm font-semibold text-[var(--pu-text)]") { "Filters" }
+              span(class: "text-sm font-semibold text-[var(--pu-text)]") { t("plutonium.ui.table.filters") }
             end
             button(
               type: "button",
               class: "text-sm text-[var(--pu-text-muted)] hover:text-[var(--pu-text)] transition-colors",
               data: {action: "filter-panel#clear"}
-            ) { "Clear all" }
+            ) { t("plutonium.ui.table.clear_all") }
           end
 
           # Scrollable filter fields
@@ -160,9 +160,9 @@ module Plutonium
                 inputs.each do |input_name, _|
                   # For multi-input filters (like date range), include the input name in the label
                   label = if has_multiple_inputs
-                    "#{filter_name.to_s.humanize} (#{input_name.to_s.humanize.downcase})"
+                    t("plutonium.query.filter_input_label", label: query_object.filter_label(filter_name), input: input_name.to_s.humanize.downcase)
                   else
-                    filter_name.to_s.humanize
+                    query_object.filter_label(filter_name)
                   end
                   render_filter_field nested, definition, input_name, filter_label: label
                 end
@@ -175,7 +175,7 @@ module Plutonium
             render field(:submit).submit_button_tag(
               name: nil,
               class!: "pu-btn pu-btn-md pu-btn-primary w-full"
-            ) { "Apply Filters" }
+            ) { t("plutonium.ui.table.apply_filters") }
           end
         end
 
@@ -196,7 +196,7 @@ module Plutonium
             label(class: "text-sm font-medium text-[var(--pu-text)]") { filter_label }
             nested.field(name, **field_options) do |f|
               # Set placeholder for blank option text in selects
-              f.placeholder(input_options[:include_blank] || "All") if input_options[:include_blank]
+              f.placeholder(input_options[:include_blank] || t("plutonium.ui.table.all")) if input_options[:include_blank]
               render instance_exec(f, &tag_block)
             end
           end