Merge pull request #729 from eputnam/i18n_prep

(MODULES-4473) join strings for i18n parser

Author: glennsarti

lib/puppet/parser/functions/abs.rb

@@ -9,8 +9,7 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "abs(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "abs(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
 
@@ -21,8 +20,7 @@ module Puppet::Parser::Functions
       elsif value.match(/^-?\d+$/)
         value = value.to_i
       else
-        raise(Puppet::ParseError, 'abs(): Requires float or ' +
-          'integer to work with')
+        raise(Puppet::ParseError, 'abs(): Requires float or integer to work with')
       end
     end
 

lib/puppet/parser/functions/any2bool.rb

@@ -15,8 +15,7 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "any2bool(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "any2bool(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     # If argument is already Boolean, return it
     if !!arguments[0] == arguments[0]

lib/puppet/parser/functions/assert_private.rb

@@ -9,8 +9,7 @@ module Puppet::Parser::Functions
     EOS
   ) do |args|
 
-    raise(Puppet::ParseError, "assert_private(): Wrong number of arguments "+
-      "given (#{args.size}}) for 0 or 1)") if args.size > 1
+    raise(Puppet::ParseError, "assert_private(): Wrong number of arguments given (#{args.size}}) for 0 or 1)") if args.size > 1
 
     scope = self
     if scope.lookupvar('module_name') != scope.lookupvar('caller_module_name')

lib/puppet/parser/functions/bool2num.rb

@@ -11,8 +11,7 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "bool2num(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "bool2num(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = function_str2bool([arguments[0]])
 

lib/puppet/parser/functions/bool2str.rb

@@ -20,8 +20,7 @@ module Puppet::Parser::Functions
   ) do |arguments|
 
     unless arguments.size == 1 or arguments.size == 3
-      raise(Puppet::ParseError, "bool2str(): Wrong number of arguments " +
-                                "given (#{arguments.size} for 3)")
+      raise(Puppet::ParseError, "bool2str(): Wrong number of arguments given (#{arguments.size} for 3)")
     end
 
     value = arguments[0]

lib/puppet/parser/functions/camelcase.rb

@@ -8,15 +8,13 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "camelcase(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "camelcase(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
     klass = value.class
 
     unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'camelcase(): Requires either ' +
-        'array or string to work with')
+      raise(Puppet::ParseError, 'camelcase(): Requires either array or string to work with')
     end
 
     if value.is_a?(Array)

lib/puppet/parser/functions/capitalize.rb

@@ -9,14 +9,12 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "capitalize(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "capitalize(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
 
     unless value.is_a?(Array) || value.is_a?(String)
-      raise(Puppet::ParseError, 'capitalize(): Requires either ' +
-        'array or string to work with')
+      raise(Puppet::ParseError, 'capitalize(): Requires either array or string to work with')
     end
 
     if value.is_a?(Array)

lib/puppet/parser/functions/ceiling.rb

@@ -5,18 +5,15 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "ceiling(): Wrong number of arguments " +
-          "given (#{arguments.size} for 1)") if arguments.size != 1
+    raise(Puppet::ParseError, "ceiling(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size != 1
 
     begin
       arg = Float(arguments[0])
     rescue TypeError, ArgumentError => e
-      raise(Puppet::ParseError, "ceiling(): Wrong argument type " +
-            "given (#{arguments[0]} for Numeric)")
+      raise(Puppet::ParseError, "ceiling(): Wrong argument type given (#{arguments[0]} for Numeric)")
     end
 
-    raise(Puppet::ParseError, "ceiling(): Wrong argument type " +
-          "given (#{arg.class} for Numeric)") if arg.is_a?(Numeric) == false
+    raise(Puppet::ParseError, "ceiling(): Wrong argument type given (#{arg.class} for Numeric)") if arg.is_a?(Numeric) == false
 
     arg.ceil
   end

lib/puppet/parser/functions/chomp.rb

@@ -10,14 +10,12 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "chomp(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "chomp(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
 
     unless value.is_a?(Array) || value.is_a?(String)
-      raise(Puppet::ParseError, 'chomp(): Requires either ' +
-        'array or string to work with')
+      raise(Puppet::ParseError, 'chomp(): Requires either array or string to work with')
     end
 
     if value.is_a?(Array)

lib/puppet/parser/functions/chop.rb

@@ -12,14 +12,12 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "chop(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "chop(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
 
     unless value.is_a?(Array) || value.is_a?(String)
-      raise(Puppet::ParseError, 'chop(): Requires either an ' +
-        'array or string to work with')
+      raise(Puppet::ParseError, 'chop(): Requires either an array or string to work with')
     end
 
     if value.is_a?(Array)