diff --git a/app/models/loan.rb b/app/models/loan.rb index 5a206e7af..ec56d65b8 100644 --- a/app/models/loan.rb +++ b/app/models/loan.rb @@ -3,9 +3,9 @@ class Loan < ApplicationRecord SUBTYPES = { "mortgage" => { short: "Mortgage", long: "Mortgage" }, - "student" => { short: "Student", long: "Student Loan" }, - "auto" => { short: "Auto", long: "Auto Loan" }, - "other" => { short: "Other", long: "Other Loan" } + "student" => { short: "Student Loan", long: "Student Loan" }, + "auto" => { short: "Auto Loan", long: "Auto Loan" }, + "other" => { short: "Other Loan", long: "Other Loan" } }.freeze def monthly_payment diff --git a/app/views/cryptos/_form.html.erb b/app/views/cryptos/_form.html.erb index d8627a680..7abbc09bc 100644 --- a/app/views/cryptos/_form.html.erb +++ b/app/views/cryptos/_form.html.erb @@ -4,12 +4,12 @@ <%= form.fields_for :accountable do |crypto_form| %> <%= crypto_form.select :subtype, Crypto::SUBTYPES.map { |k, v| [v[:long], k] }, - { label: t(".subtype_label"), prompt: t(".subtype_prompt"), include_blank: t(".subtype_none") } %> + { label: t("cryptos.form.subtype_label"), prompt: t("cryptos.form.subtype_prompt"), include_blank: t("cryptos.form.subtype_none") } %> <%= crypto_form.select :tax_treatment, Crypto.tax_treatments.keys.map { |k| [t("accounts.tax_treatments.#{k}"), k] }, - { label: t(".tax_treatment_label"), include_blank: false }, + { label: t("cryptos.form.tax_treatment_label"), include_blank: false }, {} %> -

<%= t(".tax_treatment_hint") %>

+

<%= t("cryptos.form.tax_treatment_hint") %>

<% end %> <% end %> diff --git a/app/views/loans/_form.html.erb b/app/views/loans/_form.html.erb index 48d7a0ce5..646e2fa00 100644 --- a/app/views/loans/_form.html.erb +++ b/app/views/loans/_form.html.erb @@ -28,6 +28,12 @@ label: t("loans.form.term_months"), placeholder: t("loans.form.term_months_placeholder") %> + +
+ <%= loan_form.select :subtype, + Loan::SUBTYPES.map { |k, v| [v[:long], k] }, + { label: true, prompt: t("loans.form.subtype_prompt"), include_blank: t("loans.form.none") } %> +
<% end %> <% end %> diff --git a/config/locales/views/cryptos/en.yml b/config/locales/views/cryptos/en.yml index 26649e9ad..d2a4e3ddd 100644 --- a/config/locales/views/cryptos/en.yml +++ b/config/locales/views/cryptos/en.yml @@ -5,10 +5,10 @@ en: edit: Edit %{account} form: subtype_label: Account type - subtype_prompt: Select type... - subtype_none: Not specified + subtype_prompt: Select account type + subtype_none: None tax_treatment_label: Tax Treatment - tax_treatment_hint: Most cryptocurrency is held in taxable accounts. Select a different option if held in a tax-advantaged account like a self-directed IRA. + tax_treatment_hint: Most cryptocurrency is held in taxable accounts. Select a different option if held in a tax-advantaged account. new: title: Enter account balance subtypes: diff --git a/config/locales/views/loans/en.yml b/config/locales/views/loans/en.yml index 33eb76f33..157c01cf2 100644 --- a/config/locales/views/loans/en.yml +++ b/config/locales/views/loans/en.yml @@ -10,6 +10,8 @@ en: rate_type: Rate type term_months: Term (months) term_months_placeholder: '360' + subtype_prompt: Select loan type + subtype_none: None new: title: Enter loan details overview: