From: Thomas Wood <grand.edgemaster@gmail.com>
Date: Thu, 30 Apr 2009 06:52:14 +0000 (+0000)
Subject: Fix grammar/referred relation id in precondition failed error.
X-Git-Tag: live~7482
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bb3108cb99e95775492157fe135eeda5e70a664e

Fix grammar/referred relation id in precondition failed error.
From: "Precondition failed: The relation 5 is a used in relation 4,0."
To: "Precondition failed: The relation 5 is used in relation 4."
---

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 08b77f449..ae9d2f844 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -243,7 +243,7 @@ class Relation < ActiveRecord::Base
       check_consistency(self, new_relation, user)
       # This will check to see if this relation is used by another relation
       rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = ? AND member_type='Relation' and member_id=? ", true, self.id ])
-      raise OSM::APIPreconditionFailedError.new("The relation #{new_relation.id} is a used in relation #{rel.id}.") unless rel.nil?
+      raise OSM::APIPreconditionFailedError.new("The relation #{new_relation.id} is used in relation #{rel.relation.id}.") unless rel.nil?
 
       self.changeset_id = new_relation.changeset_id
       self.tags = {}