summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/join_keys_to_values.rb
diff options
context:
space:
mode:
authorEric Putnam <putnam.eric@gmail.com>2017-02-28 15:31:36 -0800
committerEric Putnam <putnam.eric@gmail.com>2017-03-01 11:26:06 -0800
commite2a8690fa6a41e481ae14e9642f4f5efeaa2d681 (patch)
tree2207aafabf7082df595ca2221aabf5e246c9dea1 /lib/puppet/parser/functions/join_keys_to_values.rb
parent2e3b87f4ffafe5eb4d0a37d11e4f63fbbed0dd63 (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/join_keys_to_values.rb')
-rw-r--r--lib/puppet/parser/functions/join_keys_to_values.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/puppet/parser/functions/join_keys_to_values.rb b/lib/puppet/parser/functions/join_keys_to_values.rb
index e3baf9f..d8966ba 100644
--- a/lib/puppet/parser/functions/join_keys_to_values.rb
+++ b/lib/puppet/parser/functions/join_keys_to_values.rb
@@ -23,22 +23,19 @@ Would result in: ["a is 1","b is 2","b is 3"]
# Validate the number of arguments.
if arguments.size != 2
- raise(Puppet::ParseError, "join_keys_to_values(): Takes exactly two " +
- "arguments, but #{arguments.size} given.")
+ raise(Puppet::ParseError, "join_keys_to_values(): Takes exactly two arguments, but #{arguments.size} given.")
end
# Validate the first argument.
hash = arguments[0]
if not hash.is_a?(Hash)
- raise(TypeError, "join_keys_to_values(): The first argument must be a " +
- "hash, but a #{hash.class} was given.")
+ raise(TypeError, "join_keys_to_values(): The first argument must be a hash, but a #{hash.class} was given.")
end
# Validate the second argument.
separator = arguments[1]
if not separator.is_a?(String)
- raise(TypeError, "join_keys_to_values(): The second argument must be a " +
- "string, but a #{separator.class} was given.")
+ raise(TypeError, "join_keys_to_values(): The second argument must be a string, but a #{separator.class} was given.")
end
# Join the keys to their values.