Bump i18n-js from 3.7.1 to 3.8.0

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 3e4ddfaf3d2a02a2bfe9d8c4c32518e9fd217d79..4d9fd1c23136ce4399c86551647debd059cd3522 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -144,7 +144,7 @@ module Potlatch
 
       # Output response header
       a, b = bodies.divmod(256)
-      yield 0.chr + 0.chr + 0.chr + 0.chr + a.chr + b.chr
+      yield 0.chr * 4 + a.chr + b.chr
 
       # Process the bodies
       bodies.times do                     # Read each body
@@ -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)