diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/irb/locale.rb | 73 |
2 files changed, 40 insertions, 42 deletions
@@ -1,3 +1,12 @@ +Sat Jan 1 17:02:50 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * lib/irb/locale.rb (IRB::Locale#search_file): make it possible + to load a localization from a gem. + (IRB::Locale#lc_path): obsoleted because of the change of #search_file + (IRB::Locale#each_localized_path): new private method, based on lc_path + (IRB::Locale#find): follows the change of #search_file. + (IRB::Locale#load): removed duplicate with #find. + Sat Jan 1 11:44:42 2011 Tanaka Akira <akr@fsij.org> * strftime.c: parenthesize macro arguments. diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb index 9924409ba1..b37ad08403 100644 --- a/lib/irb/locale.rb +++ b/lib/irb/locale.rb @@ -50,7 +50,7 @@ module IRB def String(mes) mes = super(mes) if @encoding - mes.encode(@encoding) + mes.encode(@encoding, undef: :replace) else mes end @@ -111,22 +111,27 @@ module IRB alias toplevel_load load def load(file, priv=nil) + found = find(file) + if found + return real_load(found, priv) + else + raise LoadError, "No such file to load -- #{file}" + end + end + + def find(file , paths = $:) dir = File.dirname(file) dir = "" if dir == "." base = File.basename(file) - if dir[0] == ?/ #/ - lc_path = search_file(dir, base) - return real_load(lc_path, priv) if lc_path - end - - for path in $: - lc_path = search_file(path + "/" + dir, base) - return real_load(lc_path, priv) if lc_path + if dir.start_with?('/') + return each_localized_path(dir, base).find{|full_path| File.readable? full_path} + else + return search_file(paths, dir, base) end - raise LoadError, "No such file to load -- #{file}" end + private def real_load(path, priv) src = MagicFile.open(path){|f| f.read} if priv @@ -135,41 +140,30 @@ module IRB eval(src, TOPLEVEL_BINDING, path) end end - private :real_load - def find(file , paths = $:) - dir = File.dirname(file) - dir = "" if dir == "." - base = File.basename(file) - if dir =~ /^\// - return lc_path = search_file(dir, base) - else - for path in $: - if lc_path = search_file(path + "/" + dir, base) - return lc_path - end - end + # @param paths load paths in which IRB find a localized file. + # @param dir directory + # @param file basename to be localized + # + # typically, for the parameters and a <path> in paths, it searches + # <path>/<dir>/<locale>/<file> + def search_file(lib_paths, dir, file) + each_localized_path(dir, file) do |lc_path| + lib_paths.each do |libpath| + full_path = File.join(libpath, lc_path) + return full_path if File.readable?(full_path) + end + redo if Gem.try_activate(lc_path) end nil end - def search_file(path, file) + def each_localized_path(dir, file) + return enum_for(:each_localized_path) unless block_given? each_sublocale do |lc| - full_path = path + lc_path(file, lc) - return full_path if File.exist?(full_path) - end - nil - end - private :search_file - - def lc_path(file = "", lc = @locale) - if lc.nil? - LOCALE_DIR + file - else - LOCALE_DIR + @lang + "/" + file + yield lc.nil? ? File.join(dir, LOCALE_DIR, file) : File.join(dir, LOCALE_DIR, lc, file) end end - private :lc_path def each_sublocale if @lang @@ -186,10 +180,5 @@ module IRB end yield nil end - private :each_sublocale end end - - - - |