100128 2012-10-23 08:48:15 -0700 [Chromium] Convert Chromium template string to an LDML date format 2012-10-26 18:54:46 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 100129 97877 1 tkent tkent jshin tony oldest_to_newest 748679 0 tkent 2012-10-23 08:48:15 -0700 Need to convert a Chromium template string like "Week $2, $1" to an LDML date format like "'Week 'ww, yyyy" 749420 1 170333 tkent 2012-10-24 00:17:05 -0700 Created attachment 170333 Patch 749421 2 tkent 2012-10-24 00:17:28 -0700 See https://codereview.chromium.org/11270005 too. 749996 3 170333 tony 2012-10-24 13:43:05 -0700 Comment on attachment 170333 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170333&action=review > Source/WebKit/chromium/src/LocalizedStrings.cpp:272 > + Nit: extra blank line? > Source/WebKit/chromium/src/LocalizedStrings.cpp:281 > + unsigned literalStart = 0; > + unsigned length = templ.length(); > + for (unsigned i = 0; i < length; ++i) { > + if (templ[i] == '$' && i + 1 < length && (templ[i + 1] == '1' || templ[i + 1] == '2')) { > + if (literalStart < i) As I mentioned on the Chromium side, we should just put ww and yyyy in the template format. Then we can remove this code. This probably isn't likely, but is it a problem if "ww" or "yyyy" appears in the translation? Do we just match the first occurrence? 750336 4 170333 tkent 2012-10-24 20:57:09 -0700 Comment on attachment 170333 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170333&action=review >> Source/WebKit/chromium/src/LocalizedStrings.cpp:272 >> + > > Nit: extra blank line? will remove. >> Source/WebKit/chromium/src/LocalizedStrings.cpp:281 >> + if (literalStart < i) > > As I mentioned on the Chromium side, we should just put ww and yyyy in the template format. Then we can remove this code. > > This probably isn't likely, but is it a problem if "ww" or "yyyy" appears in the translation? Do we just match the first occurrence? For LDML date format pattern, we need to quote any latin alphabet. If we didn't quote a string "Week" in a literal part, a letter 'W' would be recognized as week-of-month designator, 'ee' would be 2-digits day-of-week, 'k' would be 1-to-24 hour. 751440 5 170785 tkent 2012-10-25 18:58:44 -0700 Created attachment 170785 Patch 2 Remove a blank line. Add a comment 752150 6 170785 tony 2012-10-26 10:00:51 -0700 Comment on attachment 170785 Patch 2 View in context: https://bugs.webkit.org/attachment.cgi?id=170785&action=review OK > Source/WebKit/chromium/src/LocalizedStrings.cpp:281 > + for (unsigned i = 0; i < length; ++i) { > + if (templ[i] == '$' && i + 1 < length && (templ[i + 1] == '1' || templ[i + 1] == '2')) { I think you could just make the loop go to length - 1 and remove the i + 1 < length check. 752643 7 170785 tkent 2012-10-26 18:46:01 -0700 Comment on attachment 170785 Patch 2 View in context: https://bugs.webkit.org/attachment.cgi?id=170785&action=review >> Source/WebKit/chromium/src/LocalizedStrings.cpp:281 >> + if (templ[i] == '$' && i + 1 < length && (templ[i + 1] == '1' || templ[i + 1] == '2')) { > > I think you could just make the loop go to length - 1 and remove the i + 1 < length check. ok, I'll change the for-loop condition to "i + 1 < length" and remove "i + 1 < length" here 752649 8 tkent 2012-10-26 18:54:46 -0700 Committed r132718: <http://trac.webkit.org/changeset/132718> 170333 2012-10-24 00:17:05 -0700 2012-10-25 18:58:40 -0700 Patch bug-100128-20121024161540.patch text/plain 2300 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyMzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGIxZjY3Zjc2YmM4MGU3OWE0M2ZmMTZiOTZmODAxNTM3NDQ4MTQwNzcuLmQzNTZiMTZjM2NkODA0 NDJmY2Q1ZWE0YjkwNzllMzhlMjI4ZDRlNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTItMTAtMjQgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gQ29udmVydCBDaHJvbWl1bSB0ZW1wbGF0ZSBzdHJp bmcgdG8gYW4gTERNTCBkYXRlIGZvcm1hdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwMTI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBzcmMvTG9jYWxpemVkU3RyaW5ncy5jcHA6CisgICAgICAgIChX ZWJDb3JlKTogSW5jbHVkZSBXZWJDb3JlL3BsYXRmb3JtL3RleHQvRGF0ZVRpbWVGb3JtYXQuaC4K KyAgICAgICAgKFdlYkNvcmU6OndlZWtGb3JtYXRJbkxETUwpOgorICAgICAgICBSZXBsYWNlICQx IHdpdGggeXl5eSwgJDIgd2l0aCB3dywgYW5kIHF1b3RlIG90aGVyIHBhcnRzLgorCiAyMDEyLTEw LTIzICBWYXJ1biBKYWluICA8dmFydW5qYWluQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDb250 ZXh0IG1lbnUgZ2VuZXJhdGVkIGZyb20gdG91Y2ggZ2VzdHVyZXMgb24gdGV4dGFyZWFzIGhhcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvTG9jYWxpemVkU3RyaW5ncy5j cHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Mb2NhbGl6ZWRTdHJpbmdzLmNwcAppbmRl eCA0ZWYyMzljNmY1NzRkOTc2NzViMDQ5N2YyMjIxZTlkZWFmMTY3YWUwLi4wNjQxZjY0MmUyZWM3 ZGQ3YjEwMjFkZDNiYmJhZmM5NjhiOWM0OGEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9Mb2NhbGl6ZWRTdHJpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9Mb2NhbGl6ZWRTdHJpbmdzLmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIkxvY2FsaXplZFN0cmluZ3MuaCIKIAorI2luY2x1ZGUgIkRh dGVUaW1lRm9ybWF0LmgiCiAjaW5jbHVkZSAiSW50U2l6ZS5oIgogI2luY2x1ZGUgIk5vdEltcGxl bWVudGVkLmgiCiAKQEAgLTI2OCw5ICsyNjksMjQgQEAgU3RyaW5nIHBsYWNlaG9sZGVyRm9yWWVh ckZpZWxkKCkKICAgICByZXR1cm4gcXVlcnkoV2ViTG9jYWxpemVkU3RyaW5nOjpQbGFjZWhvbGRl ckZvclllYXJGaWVsZCk7CiB9CiAKKwogU3RyaW5nIHdlZWtGb3JtYXRJbkxETUwoKQogewotICAg IHJldHVybiBxdWVyeShXZWJMb2NhbGl6ZWRTdHJpbmc6OldlZWtGb3JtYXRUZW1wbGF0ZSk7Cisg ICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgIFN0cmluZyB0ZW1wbCA9IHF1ZXJ5KFdlYkxv Y2FsaXplZFN0cmluZzo6V2Vla0Zvcm1hdFRlbXBsYXRlKTsKKyAgICB1bnNpZ25lZCBsaXRlcmFs U3RhcnQgPSAwOworICAgIHVuc2lnbmVkIGxlbmd0aCA9IHRlbXBsLmxlbmd0aCgpOworICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgeworICAgICAgICBpZiAodGVtcGxb aV0gPT0gJyQnICYmIGkgKyAxIDwgbGVuZ3RoICYmICh0ZW1wbFtpICsgMV0gPT0gJzEnIHx8IHRl bXBsW2kgKyAxXSA9PSAnMicpKSB7CisgICAgICAgICAgICBpZiAobGl0ZXJhbFN0YXJ0IDwgaSkK KyAgICAgICAgICAgICAgICBEYXRlVGltZUZvcm1hdDo6cXVvdGVBbmRBcHBlbmRMaXRlcmFsKHRl bXBsLnN1YnN0cmluZyhsaXRlcmFsU3RhcnQsIGkgLSBsaXRlcmFsU3RhcnQpLCBidWlsZGVyKTsK KyAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKHRlbXBsWysraV0gPT0gJzEnID8gInl5eXkiIDog Ind3Iik7CisgICAgICAgICAgICBsaXRlcmFsU3RhcnQgPSBpICsgMTsKKyAgICAgICAgfQorICAg IH0KKyAgICBpZiAobGl0ZXJhbFN0YXJ0IDwgbGVuZ3RoKQorICAgICAgICBEYXRlVGltZUZvcm1h dDo6cXVvdGVBbmRBcHBlbmRMaXRlcmFsKHRlbXBsLnN1YnN0cmluZyhsaXRlcmFsU3RhcnQsIGxl bmd0aCAtIGxpdGVyYWxTdGFydCksIGJ1aWxkZXIpOworICAgIHJldHVybiBidWlsZGVyLnRvU3Ry aW5nKCk7CiB9CiAKICNlbmRpZgo= 170785 2012-10-25 18:58:44 -0700 2012-10-26 18:46:01 -0700 Patch 2 bug-100128-20121026105716.patch text/plain 2320 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGIyMmZmNDY2NjdlZDU5NWEzNjMxZDI3NDMyN2MwM2MwY2EzMDI4YTcuLjU5YWJlMGY0OTdlN2Nk NTk5YzU0ZTNhNWEwMzUxYmNlZTk0ZTY3OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTItMTAtMjUgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gQ29udmVydCBDaHJvbWl1bSB0ZW1wbGF0ZSBzdHJp bmcgdG8gYW4gTERNTCBkYXRlIGZvcm1hdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwMTI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBzcmMvTG9jYWxpemVkU3RyaW5ncy5jcHA6CisgICAgICAgIChX ZWJDb3JlKTogSW5jbHVkZSBXZWJDb3JlL3BsYXRmb3JtL3RleHQvRGF0ZVRpbWVGb3JtYXQuaC4K KyAgICAgICAgKFdlYkNvcmU6OndlZWtGb3JtYXRJbkxETUwpOgorICAgICAgICBSZXBsYWNlICQx IHdpdGggeXl5eSwgJDIgd2l0aCB3dywgYW5kIHF1b3RlIG90aGVyIHBhcnRzLgorCiAyMDEyLTEw LTI1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTMyNTE0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvTG9jYWxpemVkU3RyaW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9Mb2NhbGl6ZWRTdHJpbmdzLmNwcAppbmRleCA0ZWYyMzljNmY1NzRkOTc2NzVi MDQ5N2YyMjIxZTlkZWFmMTY3YWUwLi5lMjg2NWZiZTQ2OWU1NDcxNmEwYjY3OWJiYjQ0NWFhZDI5 MTBkMDUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Mb2NhbGl6ZWRT dHJpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Mb2NhbGl6ZWRTdHJp bmdzLmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUg IkxvY2FsaXplZFN0cmluZ3MuaCIKIAorI2luY2x1ZGUgIkRhdGVUaW1lRm9ybWF0LmgiCiAjaW5j bHVkZSAiSW50U2l6ZS5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCiAKQEAgLTI3MCw3 ICsyNzEsMjMgQEAgU3RyaW5nIHBsYWNlaG9sZGVyRm9yWWVhckZpZWxkKCkKIAogU3RyaW5nIHdl ZWtGb3JtYXRJbkxETUwoKQogewotICAgIHJldHVybiBxdWVyeShXZWJMb2NhbGl6ZWRTdHJpbmc6 OldlZWtGb3JtYXRUZW1wbGF0ZSk7CisgICAgU3RyaW5nIHRlbXBsID0gcXVlcnkoV2ViTG9jYWxp emVkU3RyaW5nOjpXZWVrRm9ybWF0VGVtcGxhdGUpOworICAgIC8vIENvbnZlcnRzIGEgc3RyaW5n IGxpa2UgIldlZWsgJDIsICQxIiB0byBhbiBMRE1MIGRhdGUgZm9ybWF0IHBhdHRlcm4gbGlrZQor ICAgIC8vICInV2VlayAnd3cnLCAneXl5eSIuCisgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOwor ICAgIHVuc2lnbmVkIGxpdGVyYWxTdGFydCA9IDA7CisgICAgdW5zaWduZWQgbGVuZ3RoID0gdGVt cGwubGVuZ3RoKCk7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7 CisgICAgICAgIGlmICh0ZW1wbFtpXSA9PSAnJCcgJiYgaSArIDEgPCBsZW5ndGggJiYgKHRlbXBs W2kgKyAxXSA9PSAnMScgfHwgdGVtcGxbaSArIDFdID09ICcyJykpIHsKKyAgICAgICAgICAgIGlm IChsaXRlcmFsU3RhcnQgPCBpKQorICAgICAgICAgICAgICAgIERhdGVUaW1lRm9ybWF0OjpxdW90 ZUFuZEFwcGVuZExpdGVyYWwodGVtcGwuc3Vic3RyaW5nKGxpdGVyYWxTdGFydCwgaSAtIGxpdGVy YWxTdGFydCksIGJ1aWxkZXIpOworICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQodGVtcGxbKytp XSA9PSAnMScgPyAieXl5eSIgOiAid3ciKTsKKyAgICAgICAgICAgIGxpdGVyYWxTdGFydCA9IGkg KyAxOworICAgICAgICB9CisgICAgfQorICAgIGlmIChsaXRlcmFsU3RhcnQgPCBsZW5ndGgpCisg ICAgICAgIERhdGVUaW1lRm9ybWF0OjpxdW90ZUFuZEFwcGVuZExpdGVyYWwodGVtcGwuc3Vic3Ry aW5nKGxpdGVyYWxTdGFydCwgbGVuZ3RoIC0gbGl0ZXJhbFN0YXJ0KSwgYnVpbGRlcik7CisgICAg cmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KIAogI2VuZGlmCg==