X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fcore%2Fconfig.rb;h=fc99fd8c961f5de8dae44dc89050362337a5ea0e;hb=b6e6d0c78156e3fe16a011007c7f4314e442619a;hp=38140f18b6599979abb2a72a78c099387553eb10;hpb=8610e08b1dbaa0738d2d6155260dbfba8d8aa42c;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/lib/rbot/core/config.rb b/lib/rbot/core/config.rb index 38140f18..fc99fd8c 100644 --- a/lib/rbot/core/config.rb +++ b/lib/rbot/core/config.rb @@ -4,16 +4,14 @@ # :title: rbot config management from IRC # # Author:: Giuseppe "Oblomov" Bilotta -# Copyright:: (C) 2006,2007 Giuseppe Bilotta -# License:: GPL v2 class ConfigModule < CoreBotModule def version_string if $version_timestamp.to_i > 0 - ago = String.new ' [' - ago << Utils.secs_to_string(Time.now.to_i - $version_timestamp.to_i) - ago << ' ago]' + ago = _(" [%{secs} ago]") % { + :secs => Utils.secs_to_string(Time.now.to_i - $version_timestamp.to_i) + } else ago = '' end @@ -74,13 +72,13 @@ class ConfigModule < CoreBotModule rx = Regexp.new(params[:rx].to_s, true) cfs = [] @bot.config.items.each do |k, v| - cfs << v if k.to_s.match(rx) or (v.desc.match(rx) rescue false) + cfs << [Bold + k.to_s + Bold, v.desc] if k.to_s.match(rx) or (v.desc.match(rx) rescue false) end if cfs.empty? m.reply _("no config key found matching %{r}") % { :r => params[:rx].to_s} else - m.reply _("possible keys: %{kl}") % { :kl => cfs.map { |c| c.key}.join(', ') } - m.reply cfs.map { |c| [c.key, c.desc].join(': ') }.join("\n") + m.reply _("possible keys: %{kl}") % { :kl => cfs.map { |c| c.first}.join(', ') } if cfs.length > 1 + m.reply cfs.map { |c| c.join(': ') }.join("\n") end end