summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/time.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/time.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/time.rb')
-rw-r--r--lib/puppet/parser/functions/time.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/parser/functions/time.rb b/lib/puppet/parser/functions/time.rb
index c574747..d7780c8 100644
--- a/lib/puppet/parser/functions/time.rb
+++ b/lib/puppet/parser/functions/time.rb
@@ -18,8 +18,7 @@ Will return something like: 1311972653
time_zone = arguments[0] if arguments[0]
if (arguments.size != 0) and (arguments.size != 1) then
- raise(Puppet::ParseError, "time(): Wrong number of arguments "+
- "given #{arguments.size} for 0 or 1")
+ raise(Puppet::ParseError, "time(): Wrong number of arguments given #{arguments.size} for 0 or 1")
end
time = Time.new