Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Use human_attribute_name helper for OpenIDProvider

Jan Sandbrink54b3c862d259
diff --git a/modules/openid_connect/app/components/openid_connect/providers/claims_form.rb b/modules/openid_connect/app/components/openid_connect/providers/claims_form.rb
index 73e447404a6..faa3b09500c 100644
--- a/modules/openid_connect/app/components/openid_connect/providers/claims_form.rb
+++ b/modules/openid_connect/app/components/openid_connect/providers/claims_form.rb
@@ -37,7 +37,7 @@ module OpenIDConnect
f.text_area(
name: :claims,
rows: 10,
- label: I18n.t("activerecord.attributes.openid_connect/provider.claims"),
+ label: OpenIDConnect::Provider.human_attribute_name(:claims),
caption: link_translate(
"openid_connect.instructions.claims",
links: {
@@ -51,7 +51,7 @@ module OpenIDConnect
f.text_field(
name: :acr_values,
- label: I18n.t("activerecord.attributes.openid_connect/provider.acr_values"),
+ label: OpenIDConnect::Provider.human_attribute_name(:acr_values),
caption: link_translate(
"openid_connect.instructions.acr_values",
links: {
diff --git a/modules/openid_connect/app/components/openid_connect/providers/client_details_form.rb b/modules/openid_connect/app/components/openid_connect/providers/client_details_form.rb
index eb1d23bf5fb..433cc7f9774 100644
--- a/modules/openid_connect/app/components/openid_connect/providers/client_details_form.rb
+++ b/modules/openid_connect/app/components/openid_connect/providers/client_details_form.rb
@@ -46,7 +46,7 @@ module OpenIDConnect
end
f.text_field(
name: :post_logout_redirect_uri,
- label: I18n.t("activerecord.attributes.openid_connect/provider.post_logout_redirect_uri"),
+ label: OpenIDConnect::Provider.human_attribute_name(:post_logout_redirect_uri),
caption: I18n.t("openid_connect.instructions.post_logout_redirect_uri"),
disabled: provider.seeded_from_env?,
required: false,
@@ -54,7 +54,7 @@ module OpenIDConnect
)
f.text_field(
name: :scope,
- label: I18n.t("activerecord.attributes.openid_connect/provider.scope"),
+ label: OpenIDConnect::Provider.human_attribute_name(:scope),
caption: link_translate(
"openid_connect.instructions.scope",
links: {
@@ -67,7 +67,7 @@ module OpenIDConnect
)
f.check_box(
name: :limit_self_registration,
- label: I18n.t("activerecord.attributes.openid_connect/provider.limit_self_registration"),
+ label: OpenIDConnect::Provider.human_attribute_name(:limit_self_registration),
caption: I18n.t("openid_connect.instructions.limit_self_registration"),
disabled: provider.seeded_from_env?,
required: true
diff --git a/modules/openid_connect/app/components/openid_connect/providers/metadata_details_form.rb b/modules/openid_connect/app/components/openid_connect/providers/metadata_details_form.rb
index 82cc91634ca..c4405c20017 100644
--- a/modules/openid_connect/app/components/openid_connect/providers/metadata_details_form.rb
+++ b/modules/openid_connect/app/components/openid_connect/providers/metadata_details_form.rb
@@ -35,7 +35,7 @@ module OpenIDConnect
OpenIDConnect::Provider::DISCOVERABLE_STRING_ATTRIBUTES_ALL.each do |attr|
f.text_field(
name: attr,
- label: I18n.t("activerecord.attributes.openid_connect/provider.#{attr}"),
+ label: OpenIDConnect::Provider.human_attribute_name(attr),
disabled: provider.seeded_from_env?,
required: OpenIDConnect::Provider::DISCOVERABLE_STRING_ATTRIBUTES_MANDATORY.include?(attr),
input_width: :large
@@ -44,7 +44,7 @@ module OpenIDConnect
f.text_field(
name: :grant_types_supported,
- label: I18n.t("activerecord.attributes.openid_connect/provider.grant_types_supported"),
+ label: OpenIDConnect::Provider.human_attribute_name(:grant_types_supported),
disabled: provider.seeded_from_env?,
required: false,
input_width: :large
@@ -52,7 +52,7 @@ module OpenIDConnect
f.text_field(
name: :icon,
- label: I18n.t("activerecord.attributes.openid_connect/provider.icon"),
+ label: OpenIDConnect::Provider.human_attribute_name(:icon),
caption: I18n.t("saml.instructions.icon"),
disabled: provider.seeded_from_env?,
required: false,
diff --git a/modules/openid_connect/app/components/openid_connect/providers/name_input_and_tenant_form.rb b/modules/openid_connect/app/components/openid_connect/providers/name_input_and_tenant_form.rb
index cd967c9ab85..2d8a743cfb3 100644
--- a/modules/openid_connect/app/components/openid_connect/providers/name_input_and_tenant_form.rb
+++ b/modules/openid_connect/app/components/openid_connect/providers/name_input_and_tenant_form.rb
@@ -35,7 +35,7 @@ module OpenIDConnect
f.hidden(name: :oidc_provider, value: provider.oidc_provider)
f.text_field(
name: :display_name,
- label: I18n.t("activerecord.attributes.openid_connect/provider.display_name"),
+ label: OpenIDConnect::Provider.human_attribute_name(:display_name),
required: true,
disabled: provider.seeded_from_env?,
caption: I18n.t("openid_connect.instructions.display_name"),
@@ -43,7 +43,7 @@ module OpenIDConnect
)
f.text_field(
name: :tenant,
- label: I18n.t("activerecord.attributes.openid_connect/provider.tenant"),
+ label: OpenIDConnect::Provider.human_attribute_name(:tenant),
required: true,
disabled: provider.seeded_from_env?,
value: provider.tenant || "common",
diff --git a/modules/openid_connect/app/components/openid_connect/providers/name_input_form.rb b/modules/openid_connect/app/components/openid_connect/providers/name_input_form.rb
index 8e28f76babf..e999ee7bf5c 100644
--- a/modules/openid_connect/app/components/openid_connect/providers/name_input_form.rb
+++ b/modules/openid_connect/app/components/openid_connect/providers/name_input_form.rb
@@ -35,7 +35,7 @@ module OpenIDConnect
f.hidden(name: :oidc_provider, value: provider.oidc_provider)
f.text_field(
name: :display_name,
- label: I18n.t("activerecord.attributes.openid_connect/provider.display_name"),
+ label: OpenIDConnect::Provider.human_attribute_name(:display_name),
required: true,
disabled: provider.seeded_from_env?,
caption: I18n.t("openid_connect.instructions.display_name"),
diff --git a/modules/openid_connect/app/components/openid_connect/providers/side_panel/information_component.html.erb b/modules/openid_connect/app/components/openid_connect/providers/side_panel/information_component.html.erb
index eaf1b3b7118..e42e7a7c121 100644
--- a/modules/openid_connect/app/components/openid_connect/providers/side_panel/information_component.html.erb
+++ b/modules/openid_connect/app/components/openid_connect/providers/side_panel/information_component.html.erb
@@ -5,7 +5,7 @@
component_collection do |collection|
collection.with_component(Primer::Beta::Heading.new(tag: :h5, mb: 1)) do
- I18n.t("activerecord.attributes.openid_connect/provider.slug")
+ OpenIDConnect::Provider.human_attribute_name(:slug)
end
collection.with_component(
@@ -13,7 +13,7 @@
)
collection.with_component(Primer::Beta::Heading.new(tag: :h5, mt: 4, mb: 1)) do
- I18n.t("activerecord.attributes.openid_connect/provider.redirect_url")
+ OpenIDConnect::Provider.human_attribute_name(:redirect_url)
end
collection.with_component(
diff --git a/modules/openid_connect/app/components/openid_connect/providers/view_component.html.erb b/modules/openid_connect/app/components/openid_connect/providers/view_component.html.erb
index 2f5a23c8c06..91ae69b444c 100644
--- a/modules/openid_connect/app/components/openid_connect/providers/view_component.html.erb
+++ b/modules/openid_connect/app/components/openid_connect/providers/view_component.html.erb
@@ -30,7 +30,7 @@
provider,
view_mode:,
target_state: :name,
- heading: t("activerecord.attributes.openid_connect/provider.display_name"),
+ heading: OpenIDConnect::Provider.human_attribute_name(:display_name),
description: t("openid_connect.providers.section_texts.display_name")
)
end
@@ -80,7 +80,7 @@
provider,
view_mode:,
target_state: :name,
- heading: t("activerecord.attributes.openid_connect/provider.display_name"),
+ heading: OpenIDConnect::Provider.human_attribute_name(:display_name),
description: t("openid_connect.providers.section_texts.display_name")
)
end
@@ -130,7 +130,7 @@
provider,
view_mode:,
target_state: :name,
- heading: t("activerecord.attributes.openid_connect/provider.display_name"),
+ heading: OpenIDConnect::Provider.human_attribute_name(:display_name),
description: t("openid_connect.providers.section_texts.display_name")
)
end
@@ -304,7 +304,7 @@
provider,
target_state: :claims,
view_mode:,
- heading: t("activerecord.attributes.openid_connect/provider.claims"),
+ heading: OpenIDConnect::Provider.human_attribute_name(:claims),
description: t("openid_connect.providers.section_texts.claims")
)
)