Index: src/i18n.js |
diff --git a/src/i18n.js b/src/i18n.js |
index aac440ea597686a93ccee8a4cb5be73069c53cab..a80fd4d9b4a528d21e21902891fdfa7245e5583a 100644 |
--- a/src/i18n.js |
+++ b/src/i18n.js |
@@ -1367,7 +1367,7 @@ function toLDMLString(options) { |
ldmlString += appendToLDMLString(option, {'2-digit': 'ss', 'numeric': 's'}); |
option = getOption('timeZoneName', 'string', ['short', 'long']); |
- ldmlString += appendToLDMLString(option, {short: 'z', long: 'zzzz'}); |
+ ldmlString += appendToLDMLString(option, {short: 'v', long: 'vv'}); |
return ldmlString; |
} |
@@ -1440,9 +1440,9 @@ function fromLDMLString(ldmlString) { |
options = appendToDateTimeObject( |
options, 'second', match, {s: 'numeric', ss: '2-digit'}); |
- match = ldmlString.match(/z|zzzz/g); |
+ match = ldmlString.match(/v{1,2}/g); |
options = appendToDateTimeObject( |
- options, 'timeZoneName', match, {z: 'short', zzzz: 'long'}); |
+ options, 'timeZoneName', match, {v: 'short', vv: 'long'}); |
return options; |
} |