Skip to content

Commit

Permalink
remove overrides, re-update locale strings
Browse files Browse the repository at this point in the history
  • Loading branch information
nimmolo committed Mar 4, 2024
1 parent 057ee05 commit 36f4f16
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 10 deletions.
1 change: 0 additions & 1 deletion app/models/glossary_term.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class GlossaryTerm < AbstractModel

ALL_TERM_FIELDS = [:name, :description].freeze
acts_as_versioned(
# table_name: "glossary_term_versions",
if_changed: ALL_TERM_FIELDS,
association_options: { dependent: :nullify }
)
Expand Down
1 change: 0 additions & 1 deletion app/models/location.rb
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ class Location < AbstractModel
has_many :users # via profile location

acts_as_versioned(
# table_name: "location_versions",
if_changed: %w[
name
north
Expand Down
1 change: 0 additions & 1 deletion app/models/location_description.rb
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ class LocationDescription < Description
ALL_NOTE_FIELDS = [:gen_desc, :ecology, :species, :notes, :refs].freeze

acts_as_versioned(
# table_name: "location_description_versions",
if_changed: ALL_NOTE_FIELDS,
association_options: { dependent: :nullify }
)
Expand Down
1 change: 0 additions & 1 deletion app/models/name.rb
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,6 @@ class Name < AbstractModel
has_many :observations

acts_as_versioned(
# table_name: "name_versions",
if_changed: %w[
rank
text_name
Expand Down
1 change: 0 additions & 1 deletion app/models/name_description.rb
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ class NameDescription < Description
).freeze

acts_as_versioned(
# table_name: "name_description_versions",
if_changed: ALL_NOTE_FIELDS,
association_options: { dependent: :nullify }
)
Expand Down
2 changes: 1 addition & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ def self.erase_user(id)
[:donations, :user_id],
[:external_links, :user_id],
[:glossary_terms, :user_id],
[:glossary_term_versions, :user_id],
[:glossary_term_versions, :user_id],
[:herbaria, :personal_user_id],
[:herbarium_curators, :user_id],
[:herbarium_records, :user_id],
Expand Down
8 changes: 4 additions & 4 deletions config/locales/en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -993,11 +993,11 @@
user_stats_location_description_authors: "[:LOCATION_DESCRIPTIONS] Authored"
user_stats_location_description_editors: "[:LOCATION_DESCRIPTIONS] Edited"
user_stats_locations: "[:LOCATIONS] Created"
user_stats_locations_versions: "[:LOCATIONS] Edited"
user_stats_location_versions: "[:LOCATIONS] Edited"
user_stats_name_description_authors: "[:NAME_DESCRIPTIONS] Authored"
user_stats_name_description_editors: "[:NAME_DESCRIPTIONS] Edited"
user_stats_names: "[:NAMES] Created"
user_stats_names_versions: "[:NAMES] Edited"
user_stats_name_versions: "[:NAMES] Edited"
user_stats_namings: Proposed IDs
user_stats_observations: "[:OBSERVATIONS]"
user_stats_observations_with_voucher: Observations with Specimen, Notes and Images
Expand All @@ -1017,11 +1017,11 @@
site_stats_location_description_authors: Authored [:LOCATION_DESCRIPTIONS]
site_stats_location_description_editors: ""
site_stats_locations: Defined [:LOCATIONS]
site_stats_locations_versions: ""
site_stats_location_versions: ""
site_stats_name_description_authors: Authored [:NAME_DESCRIPTIONS]
site_stats_name_description_editors: ""
site_stats_names: ""
site_stats_names_versions: ""
site_stats_name_versions: ""
site_stats_namings: Proposed IDs
site_stats_observations: "[:OBSERVATIONS]"
site_stats_observations_with_voucher: Observations with Full Data
Expand Down

0 comments on commit 36f4f16

Please sign in to comment.