diff --git a/lib/assets/javascripts/twitter_cldr/af.js b/lib/assets/javascripts/twitter_cldr/af.js index 057d99f..5d37be1 100644 --- a/lib/assets/javascripts/twitter_cldr/af.js +++ b/lib/assets/javascripts/twitter_cldr/af.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/ar.js b/lib/assets/javascripts/twitter_cldr/ar.js index c28191a..2c011ab 100644 --- a/lib/assets/javascripts/twitter_cldr/ar.js +++ b/lib/assets/javascripts/twitter_cldr/ar.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/ca.js b/lib/assets/javascripts/twitter_cldr/ca.js index 0b9a1fa..6f4d9d9 100644 --- a/lib/assets/javascripts/twitter_cldr/ca.js +++ b/lib/assets/javascripts/twitter_cldr/ca.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/cs.js b/lib/assets/javascripts/twitter_cldr/cs.js index 7d95239..d578c54 100644 --- a/lib/assets/javascripts/twitter_cldr/cs.js +++ b/lib/assets/javascripts/twitter_cldr/cs.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/da.js b/lib/assets/javascripts/twitter_cldr/da.js index 49ec5a6..5a39041 100644 --- a/lib/assets/javascripts/twitter_cldr/da.js +++ b/lib/assets/javascripts/twitter_cldr/da.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/de.js b/lib/assets/javascripts/twitter_cldr/de.js index cad868e..06f271a 100644 --- a/lib/assets/javascripts/twitter_cldr/de.js +++ b/lib/assets/javascripts/twitter_cldr/de.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/el.js b/lib/assets/javascripts/twitter_cldr/el.js index 48b7110..4ab6116 100644 --- a/lib/assets/javascripts/twitter_cldr/el.js +++ b/lib/assets/javascripts/twitter_cldr/el.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/en.js b/lib/assets/javascripts/twitter_cldr/en.js index f73873d..bb38eb4 100644 --- a/lib/assets/javascripts/twitter_cldr/en.js +++ b/lib/assets/javascripts/twitter_cldr/en.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/es.js b/lib/assets/javascripts/twitter_cldr/es.js index bcc7384..a4a0d2f 100644 --- a/lib/assets/javascripts/twitter_cldr/es.js +++ b/lib/assets/javascripts/twitter_cldr/es.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/eu.js b/lib/assets/javascripts/twitter_cldr/eu.js index d9f3004..08ff4fd 100644 --- a/lib/assets/javascripts/twitter_cldr/eu.js +++ b/lib/assets/javascripts/twitter_cldr/eu.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/fa.js b/lib/assets/javascripts/twitter_cldr/fa.js index 1faa31c..38343a3 100644 --- a/lib/assets/javascripts/twitter_cldr/fa.js +++ b/lib/assets/javascripts/twitter_cldr/fa.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/fi.js b/lib/assets/javascripts/twitter_cldr/fi.js index 43cf89c..dcdb894 100644 --- a/lib/assets/javascripts/twitter_cldr/fi.js +++ b/lib/assets/javascripts/twitter_cldr/fi.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/fil.js b/lib/assets/javascripts/twitter_cldr/fil.js index 73b8652..c3079ee 100644 --- a/lib/assets/javascripts/twitter_cldr/fil.js +++ b/lib/assets/javascripts/twitter_cldr/fil.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/fr.js b/lib/assets/javascripts/twitter_cldr/fr.js index 84aed68..dd58ebb 100644 --- a/lib/assets/javascripts/twitter_cldr/fr.js +++ b/lib/assets/javascripts/twitter_cldr/fr.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/he.js b/lib/assets/javascripts/twitter_cldr/he.js index 4d6e2e5..f90a26e 100644 --- a/lib/assets/javascripts/twitter_cldr/he.js +++ b/lib/assets/javascripts/twitter_cldr/he.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/hi.js b/lib/assets/javascripts/twitter_cldr/hi.js index 695c2e3..0b6ffee 100644 --- a/lib/assets/javascripts/twitter_cldr/hi.js +++ b/lib/assets/javascripts/twitter_cldr/hi.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/hu.js b/lib/assets/javascripts/twitter_cldr/hu.js index 43bb0f9..700f37a 100644 --- a/lib/assets/javascripts/twitter_cldr/hu.js +++ b/lib/assets/javascripts/twitter_cldr/hu.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/id.js b/lib/assets/javascripts/twitter_cldr/id.js index 5d51322..2bc18a0 100644 --- a/lib/assets/javascripts/twitter_cldr/id.js +++ b/lib/assets/javascripts/twitter_cldr/id.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/it.js b/lib/assets/javascripts/twitter_cldr/it.js index dfea88a..bba40ce 100644 --- a/lib/assets/javascripts/twitter_cldr/it.js +++ b/lib/assets/javascripts/twitter_cldr/it.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/ja.js b/lib/assets/javascripts/twitter_cldr/ja.js index 41b1a0b..36c4327 100644 --- a/lib/assets/javascripts/twitter_cldr/ja.js +++ b/lib/assets/javascripts/twitter_cldr/ja.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/ko.js b/lib/assets/javascripts/twitter_cldr/ko.js index 3c67554..64a9c9b 100644 --- a/lib/assets/javascripts/twitter_cldr/ko.js +++ b/lib/assets/javascripts/twitter_cldr/ko.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/msa.js b/lib/assets/javascripts/twitter_cldr/msa.js index ee93c12..04f4fe1 100644 --- a/lib/assets/javascripts/twitter_cldr/msa.js +++ b/lib/assets/javascripts/twitter_cldr/msa.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/nl.js b/lib/assets/javascripts/twitter_cldr/nl.js index ec5756b..9800135 100644 --- a/lib/assets/javascripts/twitter_cldr/nl.js +++ b/lib/assets/javascripts/twitter_cldr/nl.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/no.js b/lib/assets/javascripts/twitter_cldr/no.js index c280141..fc7d4ce 100644 --- a/lib/assets/javascripts/twitter_cldr/no.js +++ b/lib/assets/javascripts/twitter_cldr/no.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/pl.js b/lib/assets/javascripts/twitter_cldr/pl.js index 116464c..15386d0 100644 --- a/lib/assets/javascripts/twitter_cldr/pl.js +++ b/lib/assets/javascripts/twitter_cldr/pl.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/pt.js b/lib/assets/javascripts/twitter_cldr/pt.js index d027862..0fafdfb 100644 --- a/lib/assets/javascripts/twitter_cldr/pt.js +++ b/lib/assets/javascripts/twitter_cldr/pt.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/ru.js b/lib/assets/javascripts/twitter_cldr/ru.js index bc753de..6da59b4 100644 --- a/lib/assets/javascripts/twitter_cldr/ru.js +++ b/lib/assets/javascripts/twitter_cldr/ru.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/sv.js b/lib/assets/javascripts/twitter_cldr/sv.js index e9d934a..f8b80c9 100644 --- a/lib/assets/javascripts/twitter_cldr/sv.js +++ b/lib/assets/javascripts/twitter_cldr/sv.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/th.js b/lib/assets/javascripts/twitter_cldr/th.js index cca28a3..51f2efb 100644 --- a/lib/assets/javascripts/twitter_cldr/th.js +++ b/lib/assets/javascripts/twitter_cldr/th.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/tr.js b/lib/assets/javascripts/twitter_cldr/tr.js index e2e60e9..6f67834 100644 --- a/lib/assets/javascripts/twitter_cldr/tr.js +++ b/lib/assets/javascripts/twitter_cldr/tr.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/uk.js b/lib/assets/javascripts/twitter_cldr/uk.js index de92742..7edcf32 100644 --- a/lib/assets/javascripts/twitter_cldr/uk.js +++ b/lib/assets/javascripts/twitter_cldr/uk.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/ur.js b/lib/assets/javascripts/twitter_cldr/ur.js index 542e3bf..62a2140 100644 --- a/lib/assets/javascripts/twitter_cldr/ur.js +++ b/lib/assets/javascripts/twitter_cldr/ur.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/zh-cn.js b/lib/assets/javascripts/twitter_cldr/zh-cn.js index b2cef4a..eb02bbf 100644 --- a/lib/assets/javascripts/twitter_cldr/zh-cn.js +++ b/lib/assets/javascripts/twitter_cldr/zh-cn.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/assets/javascripts/twitter_cldr/zh-tw.js b/lib/assets/javascripts/twitter_cldr/zh-tw.js index e94d49b..446a996 100644 --- a/lib/assets/javascripts/twitter_cldr/zh-tw.js +++ b/lib/assets/javascripts/twitter_cldr/zh-tw.js @@ -407,7 +407,7 @@ TwitterCldr.DateTimeFormatter = DateTimeFormatter = (function() { case 3: return offsetString; default: - return "UTC " + offsetString; + return "UTC" + offsetString; } }; diff --git a/lib/twitter_cldr/js/mustache/calendars/datetime.coffee b/lib/twitter_cldr/js/mustache/calendars/datetime.coffee index a3a5c30..ce77857 100644 --- a/lib/twitter_cldr/js/mustache/calendars/datetime.coffee +++ b/lib/twitter_cldr/js/mustache/calendars/datetime.coffee @@ -239,7 +239,7 @@ TwitterCldr.DateTimeFormatter = class DateTimeFormatter when 1, 2, 3 offsetString else - "UTC " + offsetString + "UTC" + offsetString timezone_generic_non_location: (time, pattern, length) -> throw 'not yet implemented (requires timezone translation data")' \ No newline at end of file diff --git a/spec/js/calendars/datetime.spec.js b/spec/js/calendars/datetime.spec.js index b70155e..ef65093 100644 --- a/spec/js/calendars/datetime.spec.js +++ b/spec/js/calendars/datetime.spec.js @@ -346,7 +346,7 @@ describe("DateTimeFormatter", function() { expect(formatter.timezone(date, 'z', 1)).toMatch(/^(-|\+)\d{2}:\d{2}$/); expect(formatter.timezone(date, 'zz', 2)).toMatch(/^(-|\+)\d{2}:\d{2}$/); expect(formatter.timezone(date, 'zzz', 3)).toMatch(/^(-|\+)\d{2}:\d{2}$/); - expect(formatter.timezone(date, 'zzzz', 4)).toMatch(/^UTC (-|\+)\d{2}:\d{2}$/); + expect(formatter.timezone(date, 'zzzz', 4)).toMatch(/^UTC(-|\+)\d{2}:\d{2}$/); }); });