jro_apps/redmine Commit - r11352:06a92fe0d0b7

0

app/helpers/timelog_helper.rb +2 -2

                    # Column headers
                    headers = report.criteria.collect {|criteria| l(report.available_criteria[criteria][:label]) }
                    headers += report.periods
-                   headers << l(:label_total)
+                   headers << l(:label_total_time)
                    csv << headers.collect {|c| Redmine::CodesetUtil.from_utf8(
                                                  c.to_s,
                                                  l(:general_csv_encoding) ) }
                    # Content
                    report_criteria_to_csv(csv, report.available_criteria, report.columns, report.criteria, report.periods, report.hours)
                    # Total row
-                   str_total = Redmine::CodesetUtil.from_utf8(l(:label_total), l(:general_csv_encoding))
+                   str_total = Redmine::CodesetUtil.from_utf8(l(:label_total_time), l(:general_csv_encoding))
                    row = [ str_total ] + [''] * (report.criteria.size - 1)
                    total = 0
                    report.periods.each do |period|

0

app/views/my/blocks/_timelog.html.erb +1 -1

              %>
              <div class="total-hours">
-             <p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
+             <p><%= l(:label_total_time) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
              </div>
              <% if entries.any? %>

0

app/views/timelog/index.html.erb +1 -1

              <% end %>
              <div class="total-hours">
-             <p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
+             <p><%= l(:label_total_time) %>: <%= html_hours(l_hours(@total_hours)) %></p>
              </div>
              <% unless @entries.empty? %>

0

app/views/timelog/report.html.erb +3 -3

              <% unless @report.criteria.empty? %>
              <div class="total-hours">
-             <p><%= l(:label_total) %>: <%= html_hours(l_hours(@report.total_hours)) %></p>
+             <p><%= l(:label_total_time) %>: <%= html_hours(l_hours(@report.total_hours)) %></p>
              </div>
              <% unless @report.hours.empty? %>
              <% @report.periods.each do |period| %>
                <th class="period" width="<%= columns_width %>%"><%= period %></th>
              <% end %>
-               <th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
+               <th class="total" width="<%= columns_width %>%"><%= l(:label_total_time) %></th>
              </tr>
              </thead>
              <tbody>
              <%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
                <tr class="total">
-               <td><%= l(:label_total) %></td>
+               <td><%= l(:label_total_time) %></td>
                <%= ('<td></td>' * (@report.criteria.size - 1)).html_safe %>
                <% total = 0 -%>
                <% @report.periods.each do |period| -%>

0

config/locales/ar.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: الإجمالي

0

config/locales/az.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Cəmi

0

config/locales/bg.yml +1 0

                description_date_from: Въведете начална дата
                description_date_to: Въведете крайна дата
                text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
+               label_total_time: Общо

0

config/locales/bs.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Ukupno

0

config/locales/ca.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Total

0

config/locales/cs.yml +1 0

                field_closed_on: Uzavřeno
                field_generate_password: Generovat heslo
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Celkem

0

config/locales/da.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Total

0

config/locales/de.yml +1 -1

                version_status_open: offen
                warning_attachments_not_saved: "%{count} Datei(en) konnten nicht gespeichert werden."
+               label_total_time: Gesamtzeit

0

config/locales/el.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Σύνολο

0

config/locales/en-GB.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Total

0

config/locales/en.yml +1 0

                  one:   1 issue
                  other: "%{count} issues"
                label_total: Total
+               label_total_time: Total time
                label_permissions: Permissions
                label_current_status: Current status
                label_new_statuses_allowed: New statuses allowed

0

config/locales/es.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Total

0

config/locales/et.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: "Kokku"

0

config/locales/eu.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Guztira

0

config/locales/fa.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: جمله

0

config/locales/fi.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Yhteensä

0

config/locales/fr.yml +1 0

                  one:   1 demande
                  other: "%{count} demandes"
                label_total: Total
+               label_total_time: Temps total
                label_permissions: Permissions
                label_current_status: Statut actuel
                label_new_statuses_allowed: Nouveaux statuts autorisés

0

config/locales/gl.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Total

0

config/locales/he.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: סה"כ

0

config/locales/hr.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Ukupno

0

config/locales/hu.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Összesen

0

config/locales/id.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Total

0

config/locales/it.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Totale

0

config/locales/ja.yml +1 0

                field_inherit_members: メンバーを継承
                field_closed_on: 終了日
                field_generate_password: パスワードを自動生成
+               label_total_time: 合計

0

config/locales/ko.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: 합계

0

config/locales/lt.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Iš viso

0

config/locales/lv.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Kopā

0

config/locales/mk.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Вкупно

0

config/locales/mn.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Нийт

0

config/locales/nl.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Totaal

0

config/locales/no.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Totalt

0

config/locales/pl.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Ogółem

0

config/locales/pt-BR.yml +1 0

                field_closed_on: Fechado
                field_generate_password: Gerar senha
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Total

0

config/locales/pt.yml +1 0

                field_closed_on: Fechado
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Total

0

config/locales/ro.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Total

0

config/locales/ru.yml +1 0

                field_closed_on: Закрыта
                field_generate_password: Создание пароля
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Общее время

0

config/locales/sk.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Celkovo

0

config/locales/sl.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Skupaj

0

config/locales/sq.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Total

0

config/locales/sr-YU.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Ukupno

0

config/locales/sr.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Укупно

0

config/locales/sv.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Total

0

config/locales/th.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: จำนวนรวม

0

config/locales/tr.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Toplam

0

config/locales/uk.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Всього

0

config/locales/vi.yml +1 0

                field_closed_on: Đã đóng
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: Tổng cộng

0

config/locales/zh-TW.yml +1 0

                description_date_to: 輸入結束日期
                text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: 總計

0

config/locales/zh.yml +1 0

                field_closed_on: Closed
                field_generate_password: Generate password
                setting_default_projects_tracker_ids: Default trackers for new projects
+               label_total_time: 合计

0

test/functional/time_entry_reports_controller_test.rb +7 -7

                    assert_select 'th:nth-child(2)', :text => '2009-52'
                    assert_select 'th:nth-child(3)', :text => '2009-53'
                    assert_select 'th:nth-child(4)', :text => '2010-1'
-                   assert_select 'th:nth-child(5)', :text => 'Total'
+                   assert_select 'th:nth-child(5)', :text => 'Total time'
                  end
                  assert_select '#time-report tbody tr' do
                    assert_select 'td:nth-child(1)', :text => 'eCookbook'
                  assert_equal 'text/csv; header=present', @response.content_type
                  lines = @response.body.chomp.split("\n")
                  # Headers
-                 assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
+                 assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first
                  # Total row
-                 assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
+                 assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last
                end
                def test_report_csv_export
                  assert_equal 'text/csv; header=present', @response.content_type
                  lines = @response.body.chomp.split("\n")
                  # Headers
-                 assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
+                 assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first
                  # Total row
-                 assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
+                 assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last
                end
                def test_csv_big_5
                    assert_equal 'text/csv; header=present', @response.content_type
                    lines = @response.body.chomp.split("\n")
                    # Headers
-                   s1 = "Utilisateur;2011-11-11;Total"
-                   s2 = "Total"
+                   s1 = "Utilisateur;2011-11-11;Temps total"
+                   s2 = "Temps total"
                    if s1.respond_to?(:force_encoding)
                      s1.force_encoding('ISO-8859-1')
                      s2.force_encoding('ISO-8859-1')

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages