Skip to content

Commit 864b4ce

Browse files
committed
Read template in UTF-8
1 parent 1ce1817 commit 864b4ce

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

templates/template.rb

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -304,21 +304,11 @@ def template(name, write_to: nil)
304304
private
305305

306306
def read_template(filepath)
307-
previous_verbosity = $VERBOSE
308-
previous_default_external = Encoding.default_external
309-
$VERBOSE = nil
310-
311-
begin
312-
Encoding.default_external = Encoding::UTF_8
313-
314-
if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
315-
ERB.new(File.read(filepath), trim_mode: "-")
316-
else
317-
ERB.new(File.read(filepath), nil, "-")
318-
end
319-
ensure
320-
Encoding.default_external = previous_default_external
321-
$VERBOSE = previous_verbosity
307+
template = File.read(filepath, encoding: Encoding::UTF_8)
308+
if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
309+
ERB.new(template, trim_mode: "-")
310+
else
311+
ERB.new(template, nil, "-")
322312
end
323313
end
324314

0 commit comments

Comments
 (0)