X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b38684e59eef299e82f5858fe1e14f6cf2aaa10a..8100be1e8db3017fe42c7785c391d73e0aff7992:/lib/osm.rb diff --git a/lib/osm.rb b/lib/osm.rb index f3a625c4e..885d1e358 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -133,13 +133,12 @@ module OSM attr_reader :provided, :latest, :id, :type def render_opts - { :text => "Version mismatch: Provided " + provided.to_s + - ", server had: " + latest.to_s + " of " + type + " " + id.to_s, + { :text => "Version mismatch: Provided #{provided}, server had: #{latest} of #{type} #{id}", :status => :conflict, :content_type => "text/plain" } end def to_s - "Version mismatch: Provided " + provided.to_s + ", server had: " + latest.to_s + " of " + type + " " + id.to_s + "Version mismatch: Provided #{provided}, server had: #{latest} of #{type} #{id}" end end