119704 2013-08-12 15:33:46 -0700 extract-localizable-strings doesn't know how to verify an existing strings file 2013-08-12 22:52:39 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz oldest_to_newest 916431 0 mitz 2013-08-12 15:33:46 -0700 extract-localizable-strings doesn't know how to verify an existing strings file 916435 1 208568 mitz 2013-08-12 15:45:28 -0700 Created attachment 208568 Add --verify option to extract-localizable-strings 916437 2 208568 darin 2013-08-12 15:48:28 -0700 Comment on attachment 208568 Add --verify option to extract-localizable-strings View in context: https://bugs.webkit.org/attachment.cgi?id=208568&action=review > Tools/ChangeLog:16 > + mismatching comments are reproted as errors. typo “reproted” 916551 3 mitz 2013-08-12 22:52:39 -0700 Fixed in <http://trac.webkit.org/r153976>. 208568 2013-08-12 15:45:28 -0700 2013-08-12 15:48:28 -0700 Add --verify option to extract-localizable-strings bug-119704-20130812154528.patch text/plain 7569 mitz SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1Mzk2MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDEzLTA4LTEyICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisK KyAgICAgICAgZXh0cmFjdC1sb2NhbGl6YWJsZS1zdHJpbmdzIGRvZXNuJ3Qga25vdyBob3cgdG8g dmVyaWZ5IGFuIGV4aXN0aW5nIHN0cmluZ3MgZmlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NzA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUtc3Ry aW5nczogQWRkZWQgYW4gLS1leGNlcHRpb25zIG9wdGlvbiBmb3Igc3BlY2lmeWluZyB0aGUKKyAg ICAgICAgZXhjZXB0aW9ucyBmaWxlLCBjaGFuZ2luZyB0aGUgd2F5IOKAnG5vIGV4Y2VwdGlvbnMg ZmlsZeKAnSBpcyBleHByZXNzZWQgZnJvbSBwYXNzaW5nIOKAnC3igJ0gYXMgdGhlCisgICAgICAg IGV4Y2VwdGlvbnMgZmlsZSBuYW1lIHRvIG9taXR0aW5nIHRoZSAtLWV4Y2VwdGlvbnMgb3B0aW9u LiBBZGRlZCBhIC0tc2tpcCBvcHRpb24sIGNoYW5naW5nCisgICAgICAgIHRoZSB3YXkgZGlyZWN0 b3JpZXMgdG8gc2tpcCBhcmUgc3BlY2lmaWVkIGZyb20gcHJlZml4aW5nIHRoZSBkaXJlY3Rvcnkg d2l0aCBhIOKAnC3igJ0gdG8KKyAgICAgICAgc3BlY2lmeWluZyBpdCB3aXRoIC0tc2tpcC4KKyAg ICAgICAgRmluYWxseSwgYWRkZWQgYSAtLXZlcmlmeSBvcHRpb24uIFdoZW4gc3BlY2lmaWVkLCB0 aGUgc3RyaW5ncyBmaWxlIGlzIG5vdCB3cml0dGVuIHRvLCBidXQKKyAgICAgICAgaW5zdGVhZCBy ZWFkIGluIGFuZCBjaGVja2VkIGZvciBjb25zaXN0ZW5jeSB3aXRoIHRoZSBjb21tZW50cywga2V5 cyBhbmQgdmFsdWVzIGRlcml2ZWQgZnJvbQorICAgICAgICB0aGUgc291cmNlIGZpbGVzIGFuZCB0 aGUgZXhjZXB0aW9ucyBmaWxlLiBNaXNzaW5nIGtleXMsIHVudXNlZCBrZXlzLCBtaXNtYXRjaGlu ZyB2YWx1ZXMgYW5kCisgICAgICAgIG1pc21hdGNoaW5nIGNvbW1lbnRzIGFyZSByZXByb3RlZCBh cyBlcnJvcnMuCisgICAgICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0LWxvY2FsaXphYmxlLXN0 cmluZ3M6IFVwZGF0ZWQgZm9yIHRoZSBuZXcgd2F5IG9mIHNwZWNpZnlpbmcKKyAgICAgICAgZGly ZWN0b3JpZXMgdG8gc2tpcCBhbmQgbm8gZXhjZXB0aW9ucyBmaWxlLgorCiAyMDEzLTA4LTEyICBC ZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBUaGUgTGF5b3V0TWlsZXN0 b25lcyBkaWRMYXlvdXQgY2FsbGJhY2sgc2hvdWxkIG9ubHkgZmlyZSBmb3IgdGhlIG1haW4gZnJh bWUKSW5kZXg6IFRvb2xzL1NjcmlwdHMvZXh0cmFjdC1sb2NhbGl6YWJsZS1zdHJpbmdzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvZXh0cmFjdC1sb2NhbGl6YWJsZS1zdHJpbmdzCShyZXZp c2lvbiAxNTM5NTEpCisrKyBUb29scy9TY3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUtc3RyaW5n cwkod29ya2luZyBjb3B5KQpAQCAtNDMsMzMgKzQzLDQwIEBACiAjIFRoZSBleGNlcHRpb25zIGZp bGUgaGFzIGEgbGlzdCBvZiBzdHJpbmdzIGluIHF1b3RlcywgZmlsZW5hbWVzLCBhbmQgZmlsZW5h bWUvc3RyaW5nIHBhaXJzIHNlcGFyYXRlZCBieSA6LgogCiB1c2Ugc3RyaWN0OwordXNlIEdldG9w dDo6TG9uZzsKIG5vIHdhcm5pbmdzICdkZXByZWNhdGVkJzsKIAogc3ViIFVuZXNjYXBlSGV4U2Vx dWVuY2UoJCk7CiAKIG15ICVpc0RlYnVnTWFjcm8gPSAoIEFTU0VSVF9XSVRIX01FU1NBR0UgPT4g MSwgTE9HX0VSUk9SID0+IDEsIEVSUk9SID0+IDEsIE5TVVJMX0VSUk9SID0+IDEsIEZBVEFMID0+ IDEsIExPRyA9PiAxLCBMT0dfV0FSTklORyA9PiAxLCBVSV9TVFJJTkdfTE9DQUxJWkVfTEFURVIg PT4gMSwgVUlfU1RSSU5HX0xPQ0FMSVpFX0xBVEVSX0tFWSA9PiAxLCBMUENUU1RSX1VJX1NUUklO R19MT0NBTElaRV9MQVRFUiA9PiAxLCBVTkxPQ0FMSVpFRF9TVFJJTkcgPT4gMSwgVU5MT0NBTEla RURfTFBDVFNUUiA9PiAxLCBkcHJpbnRmID0+IDEsIE5TRXhjZXB0aW9uID0+IDEsIE5TTG9nID0+ IDEsIHByaW50ZiA9PiAxICk7CiAKLUBBUkdWID49IDIgb3IgZGllICJVc2FnZTogZXh0cmFjdC1s b2NhbGl6YWJsZS1zdHJpbmdzIDxleGNlcHRpb25zIGZpbGU+IDxmaWxlIHRvIHVwZGF0ZT4gWyBk aXJlY3RvcnkuLi4gXVxuRGlkIHlvdSBtZWFuIHRvIHJ1biB1cGRhdGUtd2Via2l0LWxvY2FsaXph YmxlLXN0cmluZ3MgaW5zdGVhZD9cbiI7CitteSAkdmVyaWZ5OworbXkgJGV4Y2VwdGlvbnNGaWxl OworbXkgQGRpcmVjdG9yaWVzVG9Ta2lwID0gKCk7CisKK215ICVvcHRpb25zID0gKAorICAgICd2 ZXJpZnknID0+IFwkdmVyaWZ5LAorICAgICdleGNlcHRpb25zPXMnID0+IFwkZXhjZXB0aW9uc0Zp bGUsCisgICAgJ3NraXA9cycgPT4gXEBkaXJlY3Rvcmllc1RvU2tpcCwKKyk7CisKK0dldE9wdGlv bnMoJW9wdGlvbnMpOwogCi1teSAkZXhjZXB0aW9uc0ZpbGUgPSBzaGlmdCBAQVJHVjsKLS1mICRl eGNlcHRpb25zRmlsZSBvciBkaWUgIkNvdWxkbid0IGZpbmQgZXhjZXB0aW9ucyBmaWxlICRleGNl cHRpb25zRmlsZVxuIiB1bmxlc3MgJGV4Y2VwdGlvbnNGaWxlIGVxICItIjsKK0BBUkdWID49IDIg b3IgZGllICJVc2FnZTogZXh0cmFjdC1sb2NhbGl6YWJsZS1zdHJpbmdzIFstLXZlcmlmeV0gWy0t ZXhjZXB0aW9ucyA8ZXhjZXB0aW9ucyBmaWxlPl0gPGZpbGUgdG8gdXBkYXRlPiBbLS1za2lwIGRp cmVjdG9yeSB8IGRpcmVjdG9yeV0uLi5cbkRpZCB5b3UgbWVhbiB0byBydW4gdXBkYXRlLXdlYmtp dC1sb2NhbGl6YWJsZS1zdHJpbmdzIGluc3RlYWQ/XG4iOworCistZiAkZXhjZXB0aW9uc0ZpbGUg b3IgZGllICJDb3VsZG4ndCBmaW5kIGV4Y2VwdGlvbnMgZmlsZSAkZXhjZXB0aW9uc0ZpbGVcbiIg dW5sZXNzICFkZWZpbmVkICRleGNlcHRpb25zRmlsZTsKIAogbXkgJGZpbGVUb1VwZGF0ZSA9IHNo aWZ0IEBBUkdWOwogLWYgJGZpbGVUb1VwZGF0ZSBvciBkaWUgIkNvdWxkbid0IGZpbmQgZmlsZSB0 byB1cGRhdGUgJGZpbGVUb1VwZGF0ZVxuIjsKIAotbXkgJHdhcm5BYm91dFVubG9jYWxpemVkU3Ry aW5ncyA9ICRleGNlcHRpb25zRmlsZSBuZSAiLSI7CitteSAkd2FybkFib3V0VW5sb2NhbGl6ZWRT dHJpbmdzID0gZGVmaW5lZCAkZXhjZXB0aW9uc0ZpbGU7CiAKIG15IEBkaXJlY3RvcmllcyA9ICgp OwotbXkgQGRpcmVjdG9yaWVzVG9Ta2lwID0gKCk7CiBpZiAoQEFSR1YgPCAxKSB7CiAgICAgcHVz aChAZGlyZWN0b3JpZXMsICIuIik7CiB9IGVsc2UgewogICAgIGZvciBteSAkZGlyIChAQVJHVikg ewotICAgICAgICBpZiAoJGRpciA9fiAvXi0oLiopJC8pIHsKLSAgICAgICAgICAgIHB1c2ggQGRp cmVjdG9yaWVzVG9Ta2lwLCAkMTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHB1c2gg QGRpcmVjdG9yaWVzLCAkZGlyOwotICAgICAgICB9CisgICAgICAgIHB1c2ggQGRpcmVjdG9yaWVz LCAkZGlyOwogICAgIH0KIH0KIApAQCAtODMsNyArOTAsNyBAQCBteSAkTlNMb2NhbGl6ZUNvdW50 ID0gMDsKIG15ICVleGNlcHRpb247CiBteSAldXNlZEV4Y2VwdGlvbjsKIAotaWYgKCRleGNlcHRp b25zRmlsZSBuZSAiLSIgJiYgb3BlbiBFWENFUFRJT05TLCAkZXhjZXB0aW9uc0ZpbGUpIHsKK2lm IChkZWZpbmVkICRleGNlcHRpb25zRmlsZSAmJiBvcGVuIEVYQ0VQVElPTlMsICRleGNlcHRpb25z RmlsZSkgewogICAgIHdoaWxlICg8RVhDRVBUSU9OUz4pIHsKICAgICAgICAgY2hvbXA7CiAgICAg ICAgIGlmICgvXiIoW15cXCJdfFxcLikqIiQvIG9yIC9eWy1fXC9cd1xzLl0rLihofG18bW18Y3xj cHApJC8gb3IgL15bLV9cL1x3XHMuXSsuKGh8bXxtbXxjfGNwcCk6IihbXlxcIl18XFwuKSoiJC8p IHsKQEAgLTM3OSwxMSArMzg2LDU1IEBAIGZvciBteSAka2V5IChzb3J0IGtleXMgJWNvbW1lbnRC eUtleSkgewogICAgICRsb2NhbGl6ZWRTdHJpbmdzIC49ICIvKiAkY29tbWVudEJ5S2V5eyRrZXl9 ICovXG5cIiRrZXlcIiA9IFwiJHN0cmluZ0J5S2V5eyRrZXl9XCI7XG5cbiI7CiB9CiAKLSMgV3Jp dGUgb3V0IHRoZSBzdHJpbmdzIGZpbGUgYXMgVVRGLTgKIGlmICgtZSAiJGZpbGVUb1VwZGF0ZSIp IHsKLSAgICBvcGVuIFNUUklOR1MsICI+IiwgIiRmaWxlVG9VcGRhdGUiIG9yIGRpZTsKLSAgICBw cmludCBTVFJJTkdTICRsb2NhbGl6ZWRTdHJpbmdzOwotICAgIGNsb3NlIFNUUklOR1M7CisgICAg aWYgKCEkdmVyaWZ5KSB7CisgICAgICAgICMgV3JpdGUgb3V0IHRoZSBzdHJpbmdzIGZpbGUgYXMg VVRGLTgKKyAgICAgICAgb3BlbiBTVFJJTkdTLCAiPiIsICIkZmlsZVRvVXBkYXRlIiBvciBkaWU7 CisgICAgICAgIHByaW50IFNUUklOR1MgJGxvY2FsaXplZFN0cmluZ3M7CisgICAgICAgIGNsb3Nl IFNUUklOR1M7CisgICAgfSBlbHNlIHsKKyAgICAgICAgb3BlbiBTVFJJTkdTLCAkZmlsZVRvVXBk YXRlIG9yIGRpZTsKKworICAgICAgICBteSAkbGFzdENvbW1lbnQ7CisKKyAgICAgICAgd2hpbGUg KDxTVFJJTkdTPikgeworICAgICAgICAgICAgY2hvbXA7CisKKyAgICAgICAgICAgIG5leHQgaWYg KC9eXHMqJC8pOworCisgICAgICAgICAgICBpZiAoL15cL1wqICguKikgXCpcLyQvKSB7CisgICAg ICAgICAgICAgICAgJGxhc3RDb21tZW50ID0gJDE7CisgICAgICAgICAgICB9IGVsc2lmICgvXiIo KD86W15cXF18XFxbXiJdKSopIlxzKj1ccyoiKCg/OlteXFxdfFxcW14iXSkqKSI7JC8pICMKKyAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBteSAkc3RyaW5nID0gZGVsZXRlICRzdHJpbmdC eUtleXskMX07CisgICAgICAgICAgICAgICAgaWYgKCFkZWZpbmVkICRzdHJpbmcpIHsKKyAgICAg ICAgICAgICAgICAgICAgcHJpbnQgImVycm9yOiAkZmlsZVRvVXBkYXRlIGNvbnRhaW5zIHVudXNl ZCBrZXkgXCIkMVwiIChwcmVjZWRpbmcgY29tbWVudDogLyogJGxhc3RDb21tZW50ICovKVxuIjsK KyAgICAgICAgICAgICAgICAgICAgJHNhd0Vycm9yID0gMTsKKyAgICAgICAgICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgICAgICAgICBpZiAoISgkc3RyaW5nIGVxICQyKSkgeworICAgICAg ICAgICAgICAgICAgICAgICAgcHJpbnQgImVycm9yOiAkZmlsZVRvVXBkYXRlIGNvbnRhaW5zIHVu ZXhwZWN0ZWQgdmFsdWUgXCIkMlwiIGZvciBrZXkgXCIkMVwiIChleHBlY3RlZCBcIiRzdHJpbmdc IilcbiI7CisgICAgICAgICAgICAgICAgICAgICAgICAkc2F3RXJyb3IgPSAxOworICAgICAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGlmICghKCRsYXN0Q29tbWVudCBlcSAk Y29tbWVudEJ5S2V5eyQxfSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHByaW50ICJlcnJv cjogJGZpbGVUb1VwZGF0ZSBjb250YWlucyB1bmV4cGVjdGVkIGNvbW1lbnQgLyogJGxhc3RDb21t ZW50ICovIGZvciBrZXkgXCIkMVwiIChleHBlY3RlZCAvKiAkY29tbWVudEJ5S2V5eyQxfSAqLyki OworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgICAgICBwcmludCAiZXJyb3I6ICRmaWxlVG9VcGRhdGUgY29u dGFpbnMgbGluZSB3aXRoIHVuZXhwZWN0ZWQgZm9ybWF0OiAkX1xuIjsKKyAgICAgICAgICAgICAg ICAkc2F3RXJyb3IgPSAxOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgZm9y IG15ICRtaXNzaW5nIChrZXlzICVzdHJpbmdCeUtleSkgeworICAgICAgICAgICAgcHJpbnQgImVy cm9yOiAkZmlsZVRvVXBkYXRlIGlzIG1pc3Npbmcga2V5IFwiJG1pc3NpbmdcIlxuIjsKKyAgICAg ICAgICAgICRzYXdFcnJvciA9IDE7CisgICAgICAgIH0KKworICAgICAgICBpZiAoJHNhd0Vycm9y KSB7CisgICAgICAgICAgICBwcmludCAiXG5lcnJvcjogJGZpbGVUb1VwZGF0ZSBpcyBub3QgdXAg dG8gZGF0ZS5cbiI7CisgICAgICAgICAgICBleGl0IDE7CisgICAgICAgIH0KKyAgICB9CiB9IGVs c2UgewogICAgIHByaW50ICIkZmlsZVRvVXBkYXRlIGRvZXMgbm90IGV4aXN0XG4iOwogICAgIGV4 aXQgMTsKSW5kZXg6IFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1sb2NhbGl6YWJsZS1zdHJp bmdzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1sb2NhbGl6YWJs ZS1zdHJpbmdzCShyZXZpc2lvbiAxNTM5NTEpCisrKyBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJr aXQtbG9jYWxpemFibGUtc3RyaW5ncwkod29ya2luZyBjb3B5KQpAQCAtMzUsNyArMzUsNyBAQCB1 c2UgbGliICRGaW5kQmluOjpCaW47CiB1c2Ugd2Via2l0ZGlyczsKIAogIyBXZWJLaXQgYW5kIFdl YktpdDIgc3RyaW5ncyBnbyBpbnRvIFdlYkNvcmUncyBMb2NhbGl6YWJsZS5zdHJpbmdzLgotbXkg QHdlYktpdERpcmVjdG9yaWVzVG9TY2FuID0gKCJTb3VyY2UvV2ViQ29yZSIsICJTb3VyY2UvV2Vi S2l0L21hYyIsICJTb3VyY2UvV2ViS2l0L3dpbiIsICJTb3VyY2UvV2ViS2l0MiIsICItU291cmNl L1dlYkNvcmUvaWN1IiwgIi1Tb3VyY2UvV2ViS2l0L21hYy9pY3UiKTsKK215IEB3ZWJLaXREaXJl Y3Rvcmllc1RvU2NhbiA9ICgiU291cmNlL1dlYkNvcmUiLCAiU291cmNlL1dlYktpdC9tYWMiLCAi U291cmNlL1dlYktpdC93aW4iLCAiU291cmNlL1dlYktpdDIiLCAiLS1za2lwIiwgIlNvdXJjZS9X ZWJDb3JlL2ljdSIsICItLXNraXAiLCAiU291cmNlL1dlYktpdC9tYWMvaWN1Iik7CiBteSBAd2Vi SW5zcGVjdG9yVUlEaXJlY3Rvcmllc1RvU2NhbiA9ICgiU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UiKTsKIAogbXkgJHdlYkNvcmVGaWxlVG9VcGRhdGUgPSAiU291cmNlL1dlYkNv cmUvRW5nbGlzaC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzIjsKQEAgLTQ1LDUgKzQ1LDUgQEAg bXkgJHdlYkluc3BlY3RvclVJRmlsZVRvVXBkYXRlID0gIlNvdXJjZQogCiBjaGRpcldlYktpdCgp OwogCi1zeXN0ZW0gIlRvb2xzL1NjcmlwdHMvZXh0cmFjdC1sb2NhbGl6YWJsZS1zdHJpbmdzIiwg Ii0iLCAkd2ViQ29yZUZpbGVUb1VwZGF0ZSwgQHdlYktpdERpcmVjdG9yaWVzVG9TY2FuOworc3lz dGVtICJUb29scy9TY3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUtc3RyaW5ncyIsICR3ZWJDb3Jl RmlsZVRvVXBkYXRlLCBAd2ViS2l0RGlyZWN0b3JpZXNUb1NjYW47CiBzeXN0ZW0gIlRvb2xzL1Nj cmlwdHMvZXh0cmFjdC1sb2NhbGl6YWJsZS1qcy1zdHJpbmdzIiwgJHdlYkluc3BlY3RvclVJRmls ZVRvVXBkYXRlLCBAd2ViSW5zcGVjdG9yVUlEaXJlY3Rvcmllc1RvU2NhbjsK