diff options
author | Eric Putnam <putnam.eric@gmail.com> | 2017-02-28 15:31:36 -0800 |
---|---|---|
committer | Eric Putnam <putnam.eric@gmail.com> | 2017-03-01 11:26:06 -0800 |
commit | e2a8690fa6a41e481ae14e9642f4f5efeaa2d681 (patch) | |
tree | 2207aafabf7082df595ca2221aabf5e246c9dea1 /lib/puppet/parser/functions/delete_regex.rb | |
parent | 2e3b87f4ffafe5eb4d0a37d11e4f63fbbed0dd63 (diff) |
(MODULES-4473) join strings for i18n parser
This commit joins all strings that are split over two lines with a plus,
backslash, or double less than so that our magical i18n parser can wave
over the module and mark every ruby string with our i18n function.
Diffstat (limited to 'lib/puppet/parser/functions/delete_regex.rb')
-rw-r--r-- | lib/puppet/parser/functions/delete_regex.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/puppet/parser/functions/delete_regex.rb b/lib/puppet/parser/functions/delete_regex.rb index d72b3e9..e2c32db 100644 --- a/lib/puppet/parser/functions/delete_regex.rb +++ b/lib/puppet/parser/functions/delete_regex.rb @@ -12,7 +12,7 @@ to be matched as an OR. delete_regex(['a','b','c','b'], 'b') Would return: ['a','c'] - + delete_regex(['a','b','c','b'], ['b', 'c']) Would return: ['a'] @@ -25,8 +25,7 @@ to be matched as an OR. EOS ) do |arguments| - raise(Puppet::ParseError, "delete_regex(): Wrong number of arguments "+ - "given #{arguments.size} for 2") unless arguments.size == 2 + raise(Puppet::ParseError, "delete_regex(): Wrong number of arguments given #{arguments.size} for 2") unless arguments.size == 2 collection = arguments[0].dup Array(arguments[1]).each do |item| @@ -34,8 +33,7 @@ to be matched as an OR. when Array, Hash, String collection.reject! { |coll_item| (coll_item =~ %r{\b#{item}\b}) } else - raise(TypeError, "delete_regex(): First argument must be an Array, " + - "Hash, or String. Given an argument of class #{collection.class}.") + raise(TypeError, "delete_regex(): First argument must be an Array, Hash, or String. Given an argument of class #{collection.class}.") end end collection |