Skip to content

Commit

Permalink
Fix #8683: html_last_updated_fmt generates wrong time zone for %Z
Browse files Browse the repository at this point in the history
sphinx.util.i18n:format_date() converts '%Z' to full name of time zone
unexpectedly.  It should be converted to short name.
  • Loading branch information
tk0miya committed Jan 12, 2021
1 parent d5559e1 commit 8ff8b55
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES
Expand Up @@ -51,6 +51,7 @@ Bugs fixed
* #8341: C, fix intersphinx lookup types for names in declarations.
* C, C++: in general fix intersphinx and role lookup types.
* #8683: :confval:`html_last_updated_fmt` does not support UTC offset (%z)
* #8683: :confval:`html_last_updated_fmt` generates wrong time zone for %Z

Testing
--------
Expand Down
2 changes: 1 addition & 1 deletion sphinx/util/i18n.py
Expand Up @@ -236,7 +236,7 @@ def find_catalog_source_files(locale_dirs: List[str], locale: str, domains: List
'%X': 'medium', # Locale’s appropriate time representation.
'%y': 'YY', # Year without century as a zero-padded decimal number.
'%Y': 'yyyy', # Year with century as a decimal number.
'%Z': 'zzzz', # Time zone name (no characters if no time zone exists).
'%Z': 'zzz', # Time zone name (no characters if no time zone exists).
'%z': 'ZZZ', # UTC offset in the form ±HHMM[SS[.ffffff]]
# (empty string if the object is naive).
'%%': '%',
Expand Down
2 changes: 2 additions & 0 deletions tests/test_util_i18n.py
Expand Up @@ -88,6 +88,8 @@ def test_format_date():
assert i18n.format_date(format, date=date) == 'Feb 7, 2016'

# timezone
format = '%Z'
assert i18n.format_date(format, date=datet) == 'UTC'
format = '%z'
assert i18n.format_date(format, date=datet) == '+0000'

Expand Down

0 comments on commit 8ff8b55

Please sign in to comment.