diff --git a/app/models/measurement.rb b/app/models/measurement.rb index 8d8d5ac..9c37012 100644 --- a/app/models/measurement.rb +++ b/app/models/measurement.rb @@ -11,7 +11,7 @@ class Measurement < ActiveRecord::Base validate do quantities = self.readouts.map { |r| [r.quantity_id, r.unit_id] } if quantities.length != quantities.uniq.length - errors.add(:readouts, :duplicated_quantity) + errors.add(:readouts, :duplicated_quantity_unit_pair) end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 8997c3b..21b1033 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -18,6 +18,11 @@ en: activerecord: errors: models: + measurement: + attributes: + readouts: + duplicated_quantity_unit_pair: 'you can define each quantity/unit pair only + once per measurement' ingredient: attributes: nutrients: @@ -90,10 +95,12 @@ en: sources: index: heading: 'Data sources' + heading_new_source: 'New source' link_new_source: 'New source' quantities: index: heading: 'Quantities' + heading_new_quantity: 'New quantity' link_new_quantity: 'New quantity' form: domains: @@ -106,4 +113,5 @@ en: units: index: heading: 'Units' + heading_new_unit: 'New unit' link_new_unit: 'New unit'