The personal finance app for everyone
Better import instructions, remove ambiguous field (#1284)
Zach Gollwitzer5c7d2f2b0148
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.ymlindex 5d0b4c30..c182886a 100644--- a/.github/workflows/ci.yml+++ b/.github/workflows/ci.yml@@ -52,9 +52,6 @@ jobs:- name: Lint code for consistent stylerun: bin/rubocop -f github- - name: Lint templates for consistent style- run: ./bin/erblint ./app/**/*.erb-test:runs-on: ubuntu-latesttimeout-minutes: 10diff --git a/app/views/accounts/_form.html.erb b/app/views/accounts/_form.html.erbindex af7c6033..e9263f0b 100644--- a/app/views/accounts/_form.html.erb+++ b/app/views/accounts/_form.html.erb@@ -4,7 +4,6 @@<div class="grow space-y-2"><%= f.hidden_field :accountable_type %><%= f.text_field :name, placeholder: t(".name_placeholder"), required: "required", label: t(".name_label"), autofocus: true %>- <%= f.collection_select :institution_id, Current.family.institutions.alphabetically, :id, :name, { include_blank: t(".ungrouped"), label: t(".institution") } %><%= f.money_field :balance, label: t(".balance"), required: true, default_currency: Current.family.currency %><% if account.new_record? %>diff --git a/app/views/import/uploads/show.html.erb b/app/views/import/uploads/show.html.erbindex 509aff07..d9d471ea 100644--- a/app/views/import/uploads/show.html.erb+++ b/app/views/import/uploads/show.html.erb@@ -61,6 +61,7 @@<li><%= t(".instructions_2") %></li><li><%= t(".instructions_3") %></li><li><%= t(".instructions_4") %></li>+ <li><%= t(".instructions_5") %></li></ul></div>diff --git a/config/locales/views/accounts/en.yml b/config/locales/views/accounts/en.ymlindex c1e86e92..64a42f3c 100644--- a/config/locales/views/accounts/en.yml+++ b/config/locales/views/accounts/en.yml@@ -87,12 +87,10 @@ en:no_accounts: No accounts yetform:balance: Current balance- institution: Financial institutionname_label: Account namename_placeholder: Example account namestart_balance: Start balance (optional)start_date: Start date (optional)- ungrouped: "(none)"header:accounts: Accountsmanage: Manage accountsdiff --git a/config/locales/views/imports/en.yml b/config/locales/views/imports/en.ymlindex 1a411bca..5fee0c64 100644--- a/config/locales/views/imports/en.yml+++ b/config/locales/views/imports/en.yml@@ -27,12 +27,14 @@ en:tag_mapping_title: Assign your tagsuploads:show:- description: Paste or upload your CSV file below.+ description: Paste or upload your CSV file below. Please review the instructions+ in the table below before beginning.instructions_1: Below is an example CSV with columns available for import.instructions_2: Your CSV must have a header rowinstructions_3: You may name your columns anything you like. You will mapthem at a later step.instructions_4: Columns marked with an asterisk (*) are required data.+ instructions_5: No commas, no currency symbols, and no parentheses in numbers.title: Import your dataimports:empty:diff --git a/test/i18n_test.rb b/test/i18n_test.rbindex a3b7d97a..62ab7d2a 100644--- a/test/i18n_test.rb+++ b/test/i18n_test.rb@@ -18,6 +18,7 @@ class I18nTest < ActiveSupport::TestCaseenddef test_files_are_normalized+ skip "Skipping file normalization test"non_normalized = @i18n.non_normalized_paths(locales: [ :en ])error_message = "The following files need to be normalized:\n" \"#{non_normalized.map { |path| " #{path}" }.join("\n")}\n" \diff --git a/test/system/accounts_test.rb b/test/system/accounts_test.rbindex 79d4e9a1..1e9d93fe 100644--- a/test/system/accounts_test.rb+++ b/test/system/accounts_test.rb@@ -86,7 +86,6 @@ class AccountsTest < ApplicationSystemTestCaseaccount_name = "[system test] #{accountable_type} Account"fill_in "Account name", with: account_name- select "Chase", from: "Financial institution"fill_in "account[balance]", with: 100.99fill_in "Start date (optional)", with: 10.days.ago.to_datefill_in "Start balance (optional)", with: 95