Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Defer getting and escaping abbreviation #92

Merged
merged 1 commit into from
Oct 7, 2018
Merged

Defer getting and escaping abbreviation #92

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/tzinfo/with_offset.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ def strftime(format)
raise ArgumentError, 'format must be specified' unless format

if_timezone_offset do |o|
abbreviation = o.abbreviation.gsub(/%/, '%%')
abbreviation = nil

format = format.gsub(/%(%*)Z/) do
if $1.length.odd?
# Return %%Z so the real strftime treats it as a literal %Z too.
"#$1%Z"
else
"#$1#{abbreviation}"
"#$1#{abbreviation ||= o.abbreviation.gsub(/%/, '%%')}"
end
end
end
Expand Down