X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5ea7425edd1c6bfbe16b8f5e783a642b3c66812c..2dc50b4431dbf01c2ad9402a5a6f8772ce0a7cc7:/lib/potlatch.rb diff --git a/lib/potlatch.rb b/lib/potlatch.rb index 75b81bbc5..4d9fd1c23 100644 --- a/lib/potlatch.rb +++ b/lib/potlatch.rb @@ -180,13 +180,13 @@ module Potlatch # StringIO.open(txt) do |file| File.open(Rails.root.join("config/potlatch/presets.txt")) do |file| file.each_line do |line| - t = line.chomp - if t =~ %r{(\w+)/(\w+)} + case line.chomp + when %r{(\w+)/(\w+)} presettype = Regexp.last_match(1) presetcategory = Regexp.last_match(2) presetmenus[presettype].push(presetcategory) presetnames[presettype][presetcategory] = ["(no preset)"] - elsif t =~ /^([\w\s]+):\s?(.+)$/ + when /^([\w\s]+):\s?(.+)$/ pre = Regexp.last_match(1) kv = Regexp.last_match(2) presetnames[presettype][presetcategory].push(pre)