From: Yugui Date: 2011-01-01T17:05:55+09:00 Subject: [ruby-dev:42922] Remultilingualization of IRB. --20cf3054a2db3f95200498c4634a Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Yuguiです。主に石塚さんへ。 [ruby-core:33987]のAbinoamが私に直メールでpt_BRのirb localizatoinを送ってくれました。 日本以外でもirbを母国語で使いたいというニーズはあるでしょうし、こんなこともあろうかとr20862でlib/irb/lc/ja に相当するlocaleサポートファイルをgemで配布して使えるようにしてありました。 "ポルトガル語対応"のようなものは全員が必要とするわけではありませんから、必要な人だけ追加できるほうがよかろうという判断です。ので、irb-pt_BR gemを作るが良かろうという返事をしようと思いました。 ところが、Ruby 1.9.1のhighest version of gemsを$LOAD_PATHに追加するという実装を前提としていたため、Ruby 1.9.2ではこれは機能しなくなっていたようです。 そこで、添付のパッチのようにlib/irb/locale.rbを変更したいと思います。石塚さんの反対がなければコミットしようと思いますがどうでしょうか。 -- Yuki Sonoda (Yugui) yugui@yugui.jp http://yugui.jp --20cf3054a2db3f95200498c4634a Content-Type: application/octet-stream; name="irb-remultilingualization.diff" Content-Disposition: attachment; filename="irb-remultilingualization.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gie88x6c0 Y29tbWl0IDRmOTEwNmNlYzQzOTA0MTYyZDU4NGI1MTJlZDdhNWVlODgzOWQxODIKQXV0aG9yOiBZ dWtpIFNvbm9kYSAoWXVndWkpIDx5dWd1aUB5dWd1aS5qcD4KRGF0ZTogICBTYXQgSmFuIDEgMTc6 MDM6NDUgMjAxMSArMDkwMAoKICAgICogbGliL2lyYi9sb2NhbGUucmIgKElSQjo6TG9jYWxlI3Nl YXJjaF9maWxlKTogbWFrZSBpdCBwb3NzaWJsZQogICAgICB0byBsb2FkIGEgbG9jYWxpemF0aW9u IGZyb20gYSBnZW0uCiAgICAgIChJUkI6OkxvY2FsZSNsY19wYXRoKTogb2Jzb2xldGVkIGJlY2F1 c2Ugb2YgdGhlIGNoYW5nZSBvZiAjc2VhcmNoX2ZpbGUKICAgICAgKElSQjo6TG9jYWxlI2VhY2hf bG9jYWxpemVkX3BhdGgpOiBuZXcgcHJpdmF0ZSBtZXRob2QsIGJhc2VkIG9uIGxjX3BhdGgKICAg ICAgKElSQjo6TG9jYWxlI2ZpbmQpOiBmb2xsb3dzIHRoZSBjaGFuZ2Ugb2YgI3NlYXJjaF9maWxl LgogICAgICAoSVJCOjpMb2NhbGUjbG9hZCk6IHJlbW92ZWQgZHVwbGljYXRlIHdpdGggI2ZpbmQu CgpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDFjZTkyM2EuLmNhYjc5 NjEgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBA QAorU2F0IEphbiAgMSAxNzowMjo1MCAyMDExICBZdWtpIFNvbm9kYSAoWXVndWkpICA8eXVndWlA eXVndWkuanA+CisKKwkqIGxpYi9pcmIvbG9jYWxlLnJiIChJUkI6OkxvY2FsZSNzZWFyY2hfZmls ZSk6IG1ha2UgaXQgcG9zc2libGUKKwkgIHRvIGxvYWQgYSBsb2NhbGl6YXRpb24gZnJvbSBhIGdl bS4KKwkgIChJUkI6OkxvY2FsZSNsY19wYXRoKTogb2Jzb2xldGVkIGJlY2F1c2Ugb2YgdGhlIGNo YW5nZSBvZiAjc2VhcmNoX2ZpbGUKKwkgIChJUkI6OkxvY2FsZSNlYWNoX2xvY2FsaXplZF9wYXRo KTogbmV3IHByaXZhdGUgbWV0aG9kLCBiYXNlZCBvbiBsY19wYXRoCisJICAoSVJCOjpMb2NhbGUj ZmluZCk6IGZvbGxvd3MgdGhlIGNoYW5nZSBvZiAjc2VhcmNoX2ZpbGUuCisJICAoSVJCOjpMb2Nh bGUjbG9hZCk6IHJlbW92ZWQgZHVwbGljYXRlIHdpdGggI2ZpbmQuCisKIFNhdCBKYW4gIDEgMTE6 NDQ6NDIgMjAxMSAgVGFuYWthIEFraXJhICA8YWtyQGZzaWoub3JnPgogCiAJKiBzdHJmdGltZS5j OiBwYXJlbnRoZXNpemUgbWFjcm8gYXJndW1lbnRzLgpkaWZmIC0tZ2l0IGEvbGliL2lyYi9sb2Nh bGUucmIgYi9saWIvaXJiL2xvY2FsZS5yYgppbmRleCA5OTI0NDA5Li5iMzdhZDA4IDEwMDY0NAot LS0gYS9saWIvaXJiL2xvY2FsZS5yYgorKysgYi9saWIvaXJiL2xvY2FsZS5yYgpAQCAtNTAsNyAr NTAsNyBAQCBtb2R1bGUgSVJCCiAgICAgZGVmIFN0cmluZyhtZXMpCiAgICAgICBtZXMgPSBzdXBl cihtZXMpCiAgICAgICBpZiBAZW5jb2RpbmcKLQltZXMuZW5jb2RlKEBlbmNvZGluZykKKwltZXMu ZW5jb2RlKEBlbmNvZGluZywgdW5kZWY6IDpyZXBsYWNlKQogICAgICAgZWxzZQogCW1lcwogICAg ICAgZW5kCkBAIC0xMTEsMjIgKzExMSwyNyBAQCBtb2R1bGUgSVJCCiAgICAgYWxpYXMgdG9wbGV2 ZWxfbG9hZCBsb2FkCiAKICAgICBkZWYgbG9hZChmaWxlLCBwcml2PW5pbCkKKyAgICAgIGZvdW5k ID0gZmluZChmaWxlKQorICAgICAgaWYgZm91bmQKKyAgICAgICAgcmV0dXJuIHJlYWxfbG9hZChm b3VuZCwgcHJpdikKKyAgICAgIGVsc2UKKyAgICAgICAgcmFpc2UgTG9hZEVycm9yLCAiTm8gc3Vj aCBmaWxlIHRvIGxvYWQgLS0gI3tmaWxlfSIKKyAgICAgIGVuZAorICAgIGVuZAorCisgICAgZGVm IGZpbmQoZmlsZSAsIHBhdGhzID0gJDopCiAgICAgICBkaXIgPSBGaWxlLmRpcm5hbWUoZmlsZSkK ICAgICAgIGRpciA9ICIiIGlmIGRpciA9PSAiLiIKICAgICAgIGJhc2UgPSBGaWxlLmJhc2VuYW1l KGZpbGUpCiAKLSAgICAgIGlmIGRpclswXSA9PSA/LyAjLwotCWxjX3BhdGggPSBzZWFyY2hfZmls ZShkaXIsIGJhc2UpCi0JcmV0dXJuIHJlYWxfbG9hZChsY19wYXRoLCBwcml2KSBpZiBsY19wYXRo Ci0gICAgICBlbmQKLQotICAgICAgZm9yIHBhdGggaW4gJDoKLQlsY19wYXRoID0gc2VhcmNoX2Zp bGUocGF0aCArICIvIiArIGRpciwgYmFzZSkKLQlyZXR1cm4gcmVhbF9sb2FkKGxjX3BhdGgsIHBy aXYpIGlmIGxjX3BhdGgKKyAgICAgIGlmIGRpci5zdGFydF93aXRoPygnLycpCisgICAgICAgIHJl dHVybiBlYWNoX2xvY2FsaXplZF9wYXRoKGRpciwgYmFzZSkuZmluZHt8ZnVsbF9wYXRofCBGaWxl LnJlYWRhYmxlPyBmdWxsX3BhdGh9CisgICAgICBlbHNlCisgICAgICAgIHJldHVybiBzZWFyY2hf ZmlsZShwYXRocywgZGlyLCBiYXNlKQogICAgICAgZW5kCi0gICAgICByYWlzZSBMb2FkRXJyb3Is ICJObyBzdWNoIGZpbGUgdG8gbG9hZCAtLSAje2ZpbGV9IgogICAgIGVuZAogCisgICAgcHJpdmF0 ZQogICAgIGRlZiByZWFsX2xvYWQocGF0aCwgcHJpdikKICAgICAgIHNyYyA9IE1hZ2ljRmlsZS5v cGVuKHBhdGgpe3xmfCBmLnJlYWR9CiAgICAgICBpZiBwcml2CkBAIC0xMzUsNDEgKzE0MCwzMCBA QCBtb2R1bGUgSVJCCiAJZXZhbChzcmMsIFRPUExFVkVMX0JJTkRJTkcsIHBhdGgpCiAgICAgICBl bmQKICAgICBlbmQKLSAgICBwcml2YXRlIDpyZWFsX2xvYWQKIAotICAgIGRlZiBmaW5kKGZpbGUg LCBwYXRocyA9ICQ6KQotICAgICAgZGlyID0gRmlsZS5kaXJuYW1lKGZpbGUpCi0gICAgICBkaXIg PSAiIiBpZiBkaXIgPT0gIi4iCi0gICAgICBiYXNlID0gRmlsZS5iYXNlbmFtZShmaWxlKQotICAg ICAgaWYgZGlyID1+IC9eXC8vCi0JICByZXR1cm4gbGNfcGF0aCA9IHNlYXJjaF9maWxlKGRpciwg YmFzZSkKLSAgICAgIGVsc2UKLQlmb3IgcGF0aCBpbiAkOgotCSAgaWYgbGNfcGF0aCA9IHNlYXJj aF9maWxlKHBhdGggKyAiLyIgKyBkaXIsIGJhc2UpCi0JICAgIHJldHVybiBsY19wYXRoCi0JICBl bmQKLQllbmQKKyAgICAjIEBwYXJhbSBwYXRocyBsb2FkIHBhdGhzIGluIHdoaWNoIElSQiBmaW5k IGEgbG9jYWxpemVkIGZpbGUuCisgICAgIyBAcGFyYW0gZGlyIGRpcmVjdG9yeSAKKyAgICAjIEBw YXJhbSBmaWxlIGJhc2VuYW1lIHRvIGJlIGxvY2FsaXplZAorICAgICMKKyAgICAjIHR5cGljYWxs eSwgZm9yIHRoZSBwYXJhbWV0ZXJzIGFuZCBhIDxwYXRoPiBpbiBwYXRocywgaXQgc2VhcmNoZXMK KyAgICAjICAgPHBhdGg+LzxkaXI+Lzxsb2NhbGU+LzxmaWxlPgorICAgIGRlZiBzZWFyY2hfZmls ZShsaWJfcGF0aHMsIGRpciwgZmlsZSkKKyAgICAgIGVhY2hfbG9jYWxpemVkX3BhdGgoZGlyLCBm aWxlKSBkbyB8bGNfcGF0aHwKKyAgICAgICAgbGliX3BhdGhzLmVhY2ggZG8gfGxpYnBhdGh8Cisg ICAgICAgICAgZnVsbF9wYXRoID0gRmlsZS5qb2luKGxpYnBhdGgsIGxjX3BhdGgpCisgICAgICAg ICAgcmV0dXJuIGZ1bGxfcGF0aCBpZiBGaWxlLnJlYWRhYmxlPyhmdWxsX3BhdGgpCisgICAgICAg IGVuZAorICAgICAgICByZWRvIGlmIEdlbS50cnlfYWN0aXZhdGUobGNfcGF0aCkKICAgICAgIGVu ZAogICAgICAgbmlsCiAgICAgZW5kCiAKLSAgICBkZWYgc2VhcmNoX2ZpbGUocGF0aCwgZmlsZSkK KyAgICBkZWYgZWFjaF9sb2NhbGl6ZWRfcGF0aChkaXIsIGZpbGUpCisgICAgICByZXR1cm4gZW51 bV9mb3IoOmVhY2hfbG9jYWxpemVkX3BhdGgpIHVubGVzcyBibG9ja19naXZlbj8KICAgICAgIGVh Y2hfc3VibG9jYWxlIGRvIHxsY3wKLQlmdWxsX3BhdGggPSBwYXRoICsgbGNfcGF0aChmaWxlLCBs YykKLQlyZXR1cm4gZnVsbF9wYXRoIGlmIEZpbGUuZXhpc3Q/KGZ1bGxfcGF0aCkKLSAgICAgIGVu ZAotICAgICAgbmlsCi0gICAgZW5kCi0gICAgcHJpdmF0ZSA6c2VhcmNoX2ZpbGUKLQotICAgIGRl ZiBsY19wYXRoKGZpbGUgPSAiIiwgbGMgPSBAbG9jYWxlKQotICAgICAgaWYgbGMubmlsPwotCUxP Q0FMRV9ESVIgKyBmaWxlCi0gICAgICBlbHNlCi0JTE9DQUxFX0RJUiArIEBsYW5nICsgIi8iICsg ZmlsZQorICAgICAgICB5aWVsZCBsYy5uaWw/ID8gRmlsZS5qb2luKGRpciwgTE9DQUxFX0RJUiwg ZmlsZSkgOiBGaWxlLmpvaW4oZGlyLCBMT0NBTEVfRElSLCBsYywgZmlsZSkKICAgICAgIGVuZAog ICAgIGVuZAotICAgIHByaXZhdGUgOmxjX3BhdGgKIAogICAgIGRlZiBlYWNoX3N1YmxvY2FsZQog ICAgICAgaWYgQGxhbmcKQEAgLTE4NiwxMCArMTgwLDUgQEAgbW9kdWxlIElSQgogICAgICAgZW5k CiAgICAgICB5aWVsZCBuaWwKICAgICBlbmQKLSAgICBwcml2YXRlIDplYWNoX3N1YmxvY2FsZQog ICBlbmQKIGVuZAotCi0KLQotCg== --20cf3054a2db3f95200498c4634a--