runit-man 1.10.3 → 1.11.0

data/i18n/en.yml

@@ -1,72 +1,95 @@
-runit:
-  label: runit web management tool
-  title: "%1 - %2"
-  header: "%1: %2"
-  error: Error encountered while accessing resource
-  loading: "Please wait while loading…"
-  footer: "State of services updated automatically every %1 seconds."
-  services:
-    table:
-      caption: Services
-      headers:
-        pid: PID
-        name: Name
-        uptime: Uptime (s)
-        stat: Status
-        actions: Actions
-        log_file: Log file
-      values:
-        log_hint: Open tail 100 lines of %1 service log in new window
-        log_absent: Absent
-        files_to_view: Files
-        urls_to_views: Urls
-      footer: Updated at %1
-      subst:
-        inactive: <span class="inactive">inactive</span>
-        down: <span class="down">down<span>
-        finish: <span class="down">finish<span>
-        run: <span class="run">run<span>
-        up: <span class="run">up<span>
-      actions:
-        start: Start
-        stop: Stop
-        restart: Restart
-        switch_down: Deactivate
-        switch_up: Activate
-      signals:
-        t: TERM
-        k: KILL
-        i: INT
-        1: USR1
-        2: USR2
-        a: ALARM
-        q: QUIT
-        x: EXIT
-        p: PAUSE
-        c: CONT
-        h: HUP
-        o: ONCE
-    log:
-      title: "Tail %3 lines of service %1 log - %2"
-      header: "Tail %3 lines of service <strong>%1</strong> log: %2 (<code>%4</code>)"
-      counts: "Show %1 lines of log"
-      updated: "Page updated at %1"
-      reload: Reload
+en:
+  runit:
+    label: runit web management tool
+    title: "%{p1} - %{p2}"
+    header: "%{p1}: %{p2}"
+    error: Error encountered while accessing resource
+    loading: "Please wait while loading&hellip;"
+    footer: "State of services updated automatically every %{sec} seconds."
+    services:
+      table:
+        caption: Services
+        headers:
+          pid: PID
+          name: Name
+          uptime: Uptime (s)
+          stat: Status
+          actions: Actions
+          log_file: Log file
+        values:
+          log_hint: Open tail 100 lines of %{name} service log in new window
+          log_absent: Absent
+          files_to_view: Files
+          urls_to_views: Urls
+        footer: Updated at %{time}
+        subst:
+          inactive: <span class="inactive">inactive</span>
+          down: <span class="down">down<span>
+          finish: <span class="down">finish<span>
+          run: <span class="run">run<span>
+          up: <span class="run">up<span>
+        actions:
+          start: Start
+          stop: Stop
+          restart: Restart
+          switch_down: Deactivate
+          switch_up: Activate
+        signals:
+          t: TERM
+          k: KILL
+          i: INT
+          1: USR1
+          2: USR2
+          a: ALARM
+          q: QUIT
+          x: EXIT
+          p: PAUSE
+          c: CONT
+          h: HUP
+          o: ONCE
+      log:
+        title: "Tail @{count} lines of service @{name} log - @{host}"
+        header: "Tail @{count} lines of service <strong>@{name}</strong> log: @{host} (<code>@{log_location}}</code>)"
+        counts: "Show @{count} lines of log"
+        updated: "Page updated at @{time}"
+        reload: Reload
+        raw: Raw
+        downloads: Log downloads
+        download: Download
+        modified: Last modified
+        file_name: File name
+        file_size: File size
+        about_utc: All times for log files are represented in UTC.
+        b: b
+        Kb: Kb
+        Mb: Mb
+        Gb: Gb
+    view_file:
       raw: Raw
-      downloads: Log downloads
-      download: Download
-      modified: Last modified
-      file_name: File name
-      file_size: File size
-      about_utc: All times for log files are represented in UTC.
-      b: b
-      Kb: Kb
-      Mb: Mb
-      Gb: Gb
-  view_file:
-    raw: Raw
-    title: 'File %1 on %2'
-    header: 'View %1 file on %2'
-    updated: "Page updated at %1"
-    reload: Reload
+      title: 'File %{file} on %{host}'
+      header: 'View %{file} file on %{host}'
+      updated: "Page updated at %{time}"
+      reload: Reload
+
+  date:
+    formats:
+      default: "%Y-%m-%d"
+      short: "%b %d"
+      long: "%B %d, %Y"
+
+    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
+
+    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
+    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
+    order:
+      - :year
+      - :month
+      - :day
+
+  time:
+    formats:
+      default: "%Y-%m-%d %H:%M"
+    am: "am"
+    pm: "pm"
 

data/i18n/ru.yml

@@ -1,73 +1,99 @@
-runit:
-  label: runit - управляющий web-интерфейс
-  title: "%1 - %2"
-  header: "%1: %2"
-  error: Ошибка обращения к ресурсу
-  loading: "Идёт загрузка…"
-  footer: "Состояние сервисов обновляется автоматически каждые %1 секунд."
-  services:
-    table:
-      caption: Сервисы
-      headers:
-        pid: PID
-        name: Название
-        uptime: "Время исполнения (сек.)"
-        stat: Состояние
-        actions: Действия
-        log_file: Лог
-      values:
-        log_hint: Отрыть последние 100 строк лога сервиса %1 в новом окне
-        log_absent: Отсутствует
-        files_to_view: Файлы
-        urls_to_view: Ссылки
-      footer: Обновлено %1
-      subst:
-        inactive: <span class="inactive">неактивен</span>
-        down: <span class="down">остановлен</span>
-        finish: <span class="down">останавливается</span>
-        run: <span class="run">работает</span>
-        up: <span class="run">поднятие</span>
-        got: получен
-        want: ожидается
-      actions:
-        start: Запустить
-        stop: Остановить
-        restart: Перезапустить
-        switch_down: Выключить
-        switch_up: Включить
-      signals:
-        t: TERM
-        k: KILL
-        i: INT
-        1: USR1
-        2: USR2
-        a: ALARM
-        q: QUIT
-        x: EXIT
-        p: PAUSE
-        c: CONT
-        h: HUP
-        o: ONCE
-    log:
-      title: "Последние %3 строк лога сервиса %1 - %2"
-      header: "Последние %3 строк лога сервиса <strong>%1</strong>: %2 (<code>%4</code>)"
-      counts: "Показать %1 строк лога"
-      updated: "Страница обновлена %1"
-      reload: Обновить страницу
+ru:
+  runit:
+    label: runit - управляющий web-интерфейс
+    title: "%{p1} - %{p2}"
+    header: "%{p1}: %{p2}"
+    error: Ошибка обращения к ресурсу
+    loading: "Идёт загрузка&hellip;"
+    footer: "Состояние сервисов обновляется автоматически каждые %{sec} секунд."
+    services:
+      table:
+        caption: Сервисы
+        headers:
+          pid: PID
+          name: Название
+          uptime: "Время исполнения (сек.)"
+          stat: Состояние
+          actions: Действия
+          log_file: Лог
+        values:
+          log_hint: Отрыть последние 100 строк лога сервиса %{name} в новом окне
+          log_absent: Отсутствует
+          files_to_view: Файлы
+          urls_to_view: Ссылки
+        footer: Обновлено %{time}
+        subst:
+          inactive: <span class="inactive">неактивен</span>
+          down: <span class="down">остановлен</span>
+          finish: <span class="down">останавливается</span>
+          run: <span class="run">работает</span>
+          up: <span class="run">поднятие</span>
+          got: получен
+          want: ожидается
+        actions:
+          start: Запустить
+          stop: Остановить
+          restart: Перезапустить
+          switch_down: Выключить
+          switch_up: Включить
+        signals:
+          t: TERM
+          k: KILL
+          i: INT
+          1: USR1
+          2: USR2
+          a: ALARM
+          q: QUIT
+          x: EXIT
+          p: PAUSE
+          c: CONT
+          h: HUP
+          o: ONCE
+      log:
+        title: "Последние %{count} строк лога сервиса %{name} - %{log_location}"
+        header: "Последние %{count} строк лога сервиса <strong>%{name}</strong>: %{host} (<code>%{log_location}</code>)"
+        counts: "Показать %{count} строк лога"
+        updated: "Страница обновлена %{time}"
+        reload: Обновить страницу
+        raw: Текст
+        downloads: Загрузка логов
+        download: Скачать
+        modified: Последнее изменение
+        file_name: Имя файла
+        file_size: Размер файла
+        about_utc: Все времена для файлов представлены в формате UTC.
+        b: б
+        Kb: Кб
+        Mb: Мб
+        Gb: Гб
+    view_file:
       raw: Текст
-      downloads: Загрузка логов
-      download: Скачать
-      modified: Последнее изменение
-      file_name: Имя файла
-      file_size: Размер файла
-      about_utc: Все времена для файлов представлены в формате UTC.
-      b: б
-      Kb: Кб
-      Mb: Мб
-      Gb: Гб
-  view_file:
-    raw: Текст
-    title: 'Файл %1 на %2'
-    header: 'Просмотр файла %1 на %2'
-    updated: "Страница обновлена %1"
-    reload: Обновить страницу
+      title: 'Файл %{name} на %{host}'
+      header: 'Просмотр файла %{name} на %{host}'
+      updated: "Страница обновлена %{time}"
+      reload: Обновить страницу
+
+  date:
+    formats:
+      default: "%d.%m.%Y"
+      short: "%d %b"
+      long: "%d %B %Y"
+
+    day_names: [воскресенье, понедельник, вторник, среда, четверг, пятница, суббота]
+    standalone_day_names: [Воскресенье, Понедельник, Вторник, Среда, Четверг, Пятница, Суббота]
+    abbr_day_names: [Вс, Пн, Вт, Ср, Чт, Пт, Сб]
+
+    month_names: [~, января, февраля, марта, апреля, мая, июня, июля, августа, сентября, октября, ноября, декабря]
+    # see russian gem for info on "standalone" day names
+    standalone_month_names: [~, Январь, Февраль, Март, Апрель, Май, Июнь, Июль, Август, Сентябрь, Октябрь, Ноябрь, Декабрь]
+    abbr_month_names: [~, янв., февр., марта, апр., мая, июня, июля, авг., сент., окт., нояб., дек.]
+    standalone_abbr_month_names: [~, янв., февр., март, апр., май, июнь, июль, авг., сент., окт., нояб., дек.]
+
+    order: [ :day, :month, :year ]
+
+  time:
+    formats:
+      default: "%d.%m.%Y %H:%M"
+    am: "утра"
+    pm: "вечера"
+

data/lib/runit-man/app.rb

@@ -1,8 +1,8 @@
 require 'fileutils'
 require 'yajl'
 require 'erubis'
+require 'i18n'
 require 'sinatra/base'
-require 'sinatra/r18n'
 require 'runit-man/helpers'
 require 'runit-man/version'
 
@@ -21,8 +21,6 @@ class RunitMan < Sinatra::Base
     :json => 'application/json'
   }.freeze
 
-  R18n::Filters.on :variables
-
   set :environment,  :production
   set :static,       true
   set :logging,      true
@@ -30,12 +28,29 @@ class RunitMan < Sinatra::Base
   set :raise_errors, false
   set :root,         GEM_FOLDER
 
-  register Sinatra::R18n
-
   helpers do
     include Helpers
   end
 
+  def self.i18n_location
+    File.join(GEM_FOLDER, 'i18n') 
+  end
+
+  def self.setup_i18n_files
+    files = []
+    Dir.glob("#{i18n_location}/*.yml") do |full_path|
+      next unless File.file?(full_path)
+      files << full_path
+    end
+    I18n.load_path = files
+    I18n.reload!
+    nil 
+  end
+
+  configure do
+    RunitMan.setup_i18n_files
+  end
+
   before do
     @scripts = []
     base_content_type = CONTENT_TYPES.keys.detect do |t|
@@ -46,6 +61,38 @@ class RunitMan < Sinatra::Base
       'X-Powered-By' => 'runit-man',
       'X-Version' => RunitMan::VERSION
     })
+    parse_language(request.env['HTTP_ACCEPT_LANGUAGE'])
+  end
+
+
+  def setup_i18n(locales)
+    locales.each do |locale|
+      if I18n.available_locales.include?(locale)
+        I18n.locale = locale
+        break
+      end
+    end
+  end
+
+  def parse_language(header)
+    weighted_locales = []
+    if header
+      header.split(',').each do |s|
+        if s =~ /^(.+)\;q\=(\d(?:\.\d)?)$/
+          weighted_locales << { :locale => $1.to_sym, :weight => $2.to_f }
+        else
+          weighted_locales << { :locale => s.to_sym, :weight => 1.0 }
+        end
+      end
+    end
+    weighted_locales << { :locale => :en, :weight => 0.0 }
+    if weighted_locales.length >= 2
+      weighted_locales.sort! do |a, b|
+        b[:weight] <=> a[:weight]
+      end
+    end
+    locales = weighted_locales.map { |wl| wl[:locale] }
+    setup_i18n(locales)
   end
 
   get '/' do
@@ -79,7 +126,7 @@ class RunitMan < Sinatra::Base
   get %r[^/([^/]+)/log(?:/(\d+))?/?$] do |name, count|
     data = log_of_service(name, count)
     return not_found if data.nil?
-    @title = t.runit.services.log.title(h(name), h(host_name), h(count), h(data[:log_location]))
+    @title = t('runit.services.log.title', :name => h(name), :host => h(host_name), :count => h(count), :log_location => h(data[:log_location]))
     erubis :log, :locals => data
   end
 

data/lib/runit-man/helpers.rb

@@ -2,6 +2,7 @@ require 'runit-man/service_info'
 require 'runit-man/partials'
 require 'runit-man/utils'
 require 'sinatra/content_for2'
+require 'i18n'
 
 module Helpers
   include Rack::Utils
@@ -14,6 +15,11 @@ module Helpers
   def host_name
     Utils.host_name
   end
+
+
+  def t(*args)
+    Utils.t(*args)
+  end
   
   def service_infos
     ServiceInfo.all
@@ -62,7 +68,7 @@ module Helpers
   end
 
   def log_downloads_link(name)
-    "<a target=\"_blank\" href=\"/#{h(name)}/log-downloads\/\">#{h(t.runit.services.log.downloads)}&hellip;</a>"
+    "<a target=\"_blank\" href=\"/#{h(name)}/log-downloads\/\">#{h(t('runit.services.log.downloads'))}&hellip;</a>"
   end
 
   def even_or_odd
@@ -89,13 +95,18 @@ module Helpers
       suffix = 'Kb'
     end
     bytes = ((bytes * 100 + 0.5).to_i.to_f / 100)
-    "#{sign}#{bytes}#{t.runit.services.log[suffix]}"
+    "#{sign}#{bytes}#{t("runit.services.log.#{suffix}")}"
   end
 
   def stat_subst(s)
     s.split(/\s/).map do |s|
-      if s =~ /(\w+)/ && t.runit.services.table.subst[$1].translated?
-        s.sub(/\w+/, t.runit.services.table.subst[$1].to_s)
+      if s =~ /(\w+)/
+        word = $1
+        if t("runit.services.table.subst.#{word}") !~ /translation missing/
+          s.sub(word, t("runit.services.table.subst.#{word}"))
+        else
+          s
+        end
       else
         s
       end

data/lib/runit-man/service_info.rb

@@ -5,8 +5,6 @@ require 'runit-man/utils'
 class ServiceInfo
   SPECIAL_LOG_FILES = %w(lock config state newstate).freeze
 
-  include R18n::Helpers
-
   attr_reader :name
 
   def initialize(a_name)
@@ -109,11 +107,6 @@ class ServiceInfo
     File.expand_path(file_name, dir_name)
   end
 
-  # Localizes time and replaces some localized characters with more file system friendly characters
-  def fl(time)
-    l(time).gsub(/[\:\s]/, '-').gsub(/[\\\/]/, '.')
-  end
-
   def log_files
     r = []
     dir_name = File.dirname(log_file_location)
@@ -122,7 +115,8 @@ class ServiceInfo
       next if SPECIAL_LOG_FILES.include?(name)
       full_name = File.expand_path(name, dir_name)
       stats = File.stat(full_name)
-      label = "#{Utils.host_name}-#{self.name}-#{fl(stats.atime.utc)}-#{fl(stats.mtime.utc)}.log"
+      label = "#{Utils.host_name}-#{self.name}-#{I18n.l(stats.atime.utc)}-#{I18n.l(stats.mtime.utc)}.log"
+      label = label.gsub(/[\:\s\,]/, '-').gsub(/[\\\/]/, '.')
       r << {
         :name     => name,
         :label    => label,

data/lib/runit-man/utils.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'i18n'
 
 class Utils
   class << self
@@ -12,5 +13,9 @@ class Utils
       end
       @host_name
     end
+
+    def t(*args)
+      I18n.t(*args)
+    end
   end
 end

data/lib/runit-man/version.rb

@@ -1,4 +1,4 @@
 module RunitManVersion
-  VERSION = '1.10.3'.freeze
+  VERSION = '1.11.0'.freeze
 end
 

data/views/_service_info.erubis

@@ -8,41 +8,41 @@ need_second_row = !service_info.files_to_view.empty? || !service_info.urls_to_vi
   <td><%= stat_subst(service_info.stat) %></td>
   <td>
     <% if service_info.active? %>
-      <%= service_action service_info.name, :restart, t.runit.services.table.actions.restart, !service_info.down? %>
-      <%= service_action service_info.name, :down, t.runit.services.table.actions.stop, !service_info.down? %>
-      <%= service_action service_info.name, :up, t.runit.services.table.actions.start, service_info.down? %>
+      <%= service_action service_info.name, :restart, t('runit.services.table.actions.restart'), !service_info.down? %>
+      <%= service_action service_info.name, :down, t('runit.services.table.actions.stop'), !service_info.down? %>
+      <%= service_action service_info.name, :up, t('runit.services.table.actions.start'), service_info.down? %>
       <% unless service_info.down? %>
         <% service_info.allowed_signals.each do |signal| %>
-          <%= service_signal service_info.name, signal, t.runit.services.table.signals[signal] %>
+          <%= service_signal service_info.name, signal, t("runit.services.table.signals.#{signal}") %>
         <% end %>
       <% end %>
       <% if service_info.switchable? %>
-        <%= service_action service_info.name, :switch_down, t.runit.services.table.actions.switch_down %>
+        <%= service_action service_info.name, :switch_down, t('runit.services.table.actions.switch_down') %>
       <% end %>
     <% else %>
       <% if service_info.switchable? %>
-        <%= service_action service_info.name, :switch_up, t.runit.services.table.actions.switch_up %>
+        <%= service_action service_info.name, :switch_up, t('runit.services.table.actions.switch_up') %>
       <% end %>
     <% end %>
   </td>
   <td>
     <% if service_info.logged? %>
-      <%= log_link(service_info.name, :hint => t.runit.services.table.values.log_hint(service_info.name), :blank => true, :title => service_info.log_file_location) %>
+      <%= log_link(service_info.name, :hint => t('runit.services.table.values.log_hint', service_info.name), :blank => true, :title => service_info.log_file_location) %>
       <%= log_downloads_link(service_info.name) %>
     <% else %>
-      <%= t.runit.services.table.values.log_absent %>
+      <%= t('runit.services.table.values.log_absent') %>
     <% end %>
   </td>
 </tr>
 <% if need_second_row %><tr><td colspan="5">
 <% unless service_info.files_to_view.empty? %>
-  <%= h(t.runit.services.table.values.files_to_view) %>:
+  <%= h(t('runit.services.table.values.files_to_view')) %>:
   <% service_info.files_to_view.each do |f| %>
     <a href="/view?file=<%= h(f) %>"><%= h(f) %></a>
   <% end %>
 <% end %>
 <% unless service_info.urls_to_view.empty? %>
-  <%= h(t.runit.services.table.values.urls_to_view) %>:
+  <%= h(t('runit.services.table.values.urls_to_view')) %>:
   <% service_info.urls_to_view.each do |url| %>
     <a href="<%= h(url) %>"><%= h(url) %></a>
   <% end %>

data/views/_services.erubis

@@ -1,18 +1,18 @@
 <table>
-    <caption><%= h(t.runit.services.table.caption) %></caption>
+    <caption><%= h(t('runit.services.table.caption')) %></caption>
     <thead>
         <tr>
-            <th><%= h(t.runit.services.table.headers.pid) %></th>
-            <th><%= h(t.runit.services.table.headers.name) %></th>
-            <th><%= h(t.runit.services.table.headers.uptime) %></th>
-            <th><%= h(t.runit.services.table.headers.stat) %></th>
-            <th><%= h(t.runit.services.table.headers.actions) %></th>
-            <th><%= h(t.runit.services.table.headers.log_file) %></th>
+            <th><%= h(t('runit.services.table.headers.pid')) %></th>
+            <th><%= h(t('runit.services.table.headers.name')) %></th>
+            <th><%= h(t('runit.services.table.headers.uptime')) %></th>
+            <th><%= h(t('runit.services.table.headers.stat')) %></th>
+            <th><%= h(t('runit.services.table.headers.actions')) %></th>
+            <th><%= h(t('runit.services.table.headers.log_file')) %></th>
         </tr>
     </thead>
     <tfoot>
         <tr>
-            <td colspan="6"><%= t.runit.services.table.footer(h(Time.now.utc)) %></td>
+            <td colspan="6"><%= t('runit.services.table.footer', :time => h(Time.now.utc)) %></td>
         </tr>
     </tfoot>
     <tbody>

data/views/index.erubis

@@ -1,14 +1,14 @@
 <% content_for :content do %>
     <div id="error" class="error">
-        <%= h(t.runit.error('<span id="url"></span>')) %>.
+        <%= h(t('runit.error', :err => '<span id="url"></span>')) %>.
     </div>
     <div id="services">
-        <%= t.runit.loading %>
+        <%= t('runit.loading') %>
     </div>
 <% end %>
 <% content_for :footer do %>
     <p>
-        <%= t.runit.footer('<span id="service-refresh-interval">?</span>') %>
+        <%= t('runit.footer', :sec => '<span id="service-refresh-interval">?</span>') %>
     </p>
 <% end %>
 <% @scripts << 'runit-man' %>

data/views/layout.erubis

@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title><%= h(t.runit.title(@title, t.runit.label)) %></title>
+    <title><%= h(t('runit.title', :p1 => @title, :p2 => t('runit.label'))) %></title>
     <link href="/css/tripoli.simple.css" type="text/css" rel="stylesheet" />
     <link href="/css/tripoli.visual.css" type="text/css" rel="stylesheet" />
     <link href="/css/tripoli.type.css" type="text/css" rel="stylesheet" />
@@ -11,7 +11,7 @@
     <div id="container">
       <div id="header">
         <div class="content">
-          <strong><%= h(t.runit.header(host_name, t.runit.label)) %></strong>
+          <strong><%= h(t('runit.header', :p1 => host_name, :p2 => t('runit.label'))) %></strong>
         </div>
       </div>
 

data/views/log.erubis

@@ -1,8 +1,8 @@
 <% content_for :content do %>
-    <%= t.runit.services.log.header(h(name), h(host_name), h(count), h(log_location)) %> | <%= log_link(name, :count => count, :title => t.runit.services.log.raw, :raw => true) %>
+    <%= t('runit.services.log.header', :name => h(name), :host => h(host_name), :count => h(count), :log_location => h(log_location)) %> | <%= log_link(name, :count => count, :title => t('runit.services.log.raw'), :raw => true) %>
 
     <p>
-      <%= t.runit.services.log.counts([100, 250, 500, 1000, 5000].map { |n| log_link(name, :count => n, :title => n) }.join(' ')) %>
+      <%= t('runit.services.log.counts', :count => [100, 250, 500, 1000, 5000].map { |n| log_link(name, :count => n, :title => n) }.join(' ')) %>
       <%= log_downloads_link(name) %>
 
     </p>
@@ -10,6 +10,6 @@
 <% end %>
 <% content_for :footer do %>
     <p>
-        <%= t.runit.services.log.updated(Time.now.utc) %> <a href="javascript:;" rel="nofollow" onclick="window.location.reload()"><%= t.runit.services.log.reload %></a>
+        <%= t('runit.services.log.updated', :time => I18n.l(Time.now.utc)) %> <a href="javascript:;" rel="nofollow" onclick="window.location.reload()"><%= t('runit.services.log.reload') %></a>
     </p>
 <% end %>

data/views/log_downloads.erubis

@@ -1,27 +1,27 @@
 <% content_for :content do %>
 <h2><%= h(name) %></h2>
-<h3><%= h(t.runit.services.log.downloads) %></h3>
+<h3><%= h(t('runit.services.log.downloads')) %></h3>
 <table>
   <thead>
     <tr>
-      <th><%= h(t.runit.services.log.modified) %></th>
-      <th><%= h(t.runit.services.log.file_name) %></th>
-      <th><%= h(t.runit.services.log.file_size) %></th>
+      <th><%= h(t('runit.services.log.modified')) %></th>
+      <th><%= h(t('runit.services.log.file_name')) %></th>
+      <th><%= h(t('runit.services.log.file_size')) %></th>
       <th></th>
      </tr>
   </thead>
   <tfoot>
     <tr>
-      <td colspan="4"><%= h(t.runit.services.log.about_utc) %></td>
+      <td colspan="4"><%= h(t('runit.services.log.about_utc')) %></td>
     </tr>
   </tfoot>
   <tbody>
   <% files.each do |f| %>
     <tr class="<%= even_or_odd ? 'even' : 'odd' %>">
-      <td title="<%= h(l(f[:modified], :full)) %>"><%= h(l(f[:modified], :human)) %></td>
+      <td><%= h(I18n.l(f[:modified])) %></td>
       <td><%= h(f[:label]) %></td>
       <td title="<%= h(f[:size]) %>"><%= h(human_bytes(f[:size])) %></td>
-      <td><a href="/<%= h(name) %>/log-download/<%= h(f[:name]) %>"><%= h(t.runit.services.log.download) %>&hellip;</a></td>
+      <td><a href="/<%= h(name) %>/log-download/<%= h(f[:name]) %>"><%= h(t('runit.services.log.download')) %>&hellip;</a></td>
     </tr>
   <% end %>
   </tbody>

data/views/view_file.erubis

@@ -1,10 +1,10 @@
 <% content_for :content do %>
-    <%= t.runit.view_file.header(h(name), h(host_name)) %> | <a href="/view.txt?file=<%= h(name) %>"><%= t.runit.view_file.raw %></a>
+    <%= t('runit.view_file.header', :name =>h(name), :host => h(host_name)) %> | <a href="/view.txt?file=<%= h(name) %>"><%= t('runit.view_file.raw') %></a>
 
     <pre><%= h(text) %></pre>
 <% end %>
 <% content_for :footer do %>
     <p>
-        <%= t.runit.view_file.updated(Time.now.utc) %> <a href="javascript:;" rel="nofollow" onclick="window.location.reload()"><%= t.view_file.reload %></a>
+        <%= t('runit.view_file.updated', :time => Time.now.utc) %> <a href="javascript:;" rel="nofollow" onclick="window.location.reload()"><%= t('runit.view_file.reload') %></a>
     </p>
 <% end %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
+  hash: 59
+  prerelease: false
   segments: 
   - 1
-  - 10
-  - 3
-  version: 1.10.3
+  - 11
+  - 0
+  version: 1.11.0
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +03:00
+date: 2011-02-18 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,7 +78,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sinatra-r18n
+  name: i18n
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,9 +88,9 @@ dependencies:
         hash: 11
         segments: 
         - 0
-        - 4
-        - 2
-        version: 0.4.2
+        - 5
+        - 0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Runit web management tool.