From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 6 Dec 2008 11:21:10 +0000 (+0000)
Subject: Changes issue history headings.
X-Git-Tag: 0.8.0-RC1~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8a0a25fcebef8b08b1913181e9f82b76ad85e14e;p=redmine.git

Changes issue history headings.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2094 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index dbc016b57..0e02e5692 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -156,13 +156,13 @@ module ApplicationHelper
     text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
   end
 
-  def authoring(created, author)
+  def authoring(created, author, options={})
     time_tag = @project.nil? ? content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created)) :
                                link_to(distance_of_time_in_words(Time.now, created), 
                                        {:controller => 'projects', :action => 'activity', :id => @project, :from => created.to_date},
                                        :title => format_time(created))
     author_tag = (author.is_a?(User) && !author.anonymous?) ? link_to(h(author), :controller => 'account', :action => 'show', :id => author) : h(author || 'Anonymous')
-    l(:label_added_time_by, author_tag, time_tag)
+    l(options[:label] || :label_added_time_by, author_tag, time_tag)
   end
 
   def l_or_humanize(s, options={})
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index 2704b6742..267263b72 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -3,7 +3,7 @@
   <div id="change-<%= journal.id %>" class="journal">
     <h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
     <%= content_tag('a', '', :name => "note-#{journal.indice}")%>
-    <%= format_time(journal.created_on) %> - <%= link_to_user(journal.user) %></h4>
+		<%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4>
     <%= avatar(journal.user, :size => "32") %>
     <ul>
     <% for detail in journal.details %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 40a7b6c8c..9bce327c6 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -693,3 +693,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/ca.yml b/lang/ca.yml
index 66805c45d..250bb1d8d 100644
--- a/lang/ca.yml
+++ b/lang/ca.yml
@@ -694,3 +694,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/cs.yml b/lang/cs.yml
index e458b31b8..cb7f361bc 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -698,3 +698,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/da.yml b/lang/da.yml
index d4bce1d50..a8acfa49b 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -694,3 +694,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/de.yml b/lang/de.yml
index ee38db54e..82c91d991 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -695,3 +695,4 @@ enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/en.yml b/lang/en.yml
index 1d5a66443..256141d07 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -544,6 +544,7 @@ label_send_test_email: Send a test email
 label_feeds_access_key_created_on: RSS access key created %s ago
 label_module_plural: Modules
 label_added_time_by: Added by %s %s ago
+label_updated_time_by: Updated by %s %s ago
 label_updated_time: Updated %s ago
 label_jump_to_a_project: Jump to a project...
 label_file_plural: Files
diff --git a/lang/es.yml b/lang/es.yml
index 65d08b2ce..0c773496d 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -678,3 +678,4 @@ text_user_wrote: '%s escribió:'
 text_wiki_destroy_confirmation: ¿Seguro que quiere borrar el wiki y todo su contenido?
 text_workflow_edit: Seleccionar un flujo de trabajo para actualizar
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/fi.yml b/lang/fi.yml
index fb245412b..ac41f411d 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -693,3 +693,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/fr.yml b/lang/fr.yml
index 730a43d26..ffc1b75f3 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -544,6 +544,7 @@ label_send_test_email: Envoyer un email de test
 label_feeds_access_key_created_on: Clé d'accès RSS créée il y a %s
 label_module_plural: Modules
 label_added_time_by: Ajouté par %s il y a %s
+label_updated_time_by: Mis à jour par %s il y a %s
 label_updated_time: Mis à jour il y a %s
 label_jump_to_a_project: Aller à un projet...
 label_file_plural: Fichiers
diff --git a/lang/he.yml b/lang/he.yml
index 87d3b0851..da9160809 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -693,3 +693,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/hu.yml b/lang/hu.yml
index 11f48cd2f..e3c649026 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -694,3 +694,4 @@ text_repository_usernames_mapping: "Állítsd be a felhasználó összerendelés
 permission_edit_own_messages: Saját üzenetek szerkesztése
 permission_delete_own_messages: Saját üzenetek törlése
 label_user_activity: "%s tevékenységei"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/it.yml b/lang/it.yml
index 1ee5b72bb..3ae2a323d 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -693,3 +693,4 @@ text_repository_usernames_mapping: "Seleziona per aggiornare la corrispondenza t
 permission_edit_own_messages: Modifica propri messaggi
 permission_delete_own_messages: Elimina propri messaggi
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/ja.yml b/lang/ja.yml
index 3e9240330..71e50a794 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -694,3 +694,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/ko.yml b/lang/ko.yml
index b3cc59793..94b3b1045 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -693,3 +693,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/lt.yml b/lang/lt.yml
index 2e2018f47..8a7db6b40 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -695,3 +695,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/nl.yml b/lang/nl.yml
index 216f238f6..e70fd9997 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -695,3 +695,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/no.yml b/lang/no.yml
index 6cde8edc6..afad80787 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -694,3 +694,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/pl.yml b/lang/pl.yml
index 9fe8e2c70..7aea9bbfd 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -712,3 +712,4 @@ text_wiki_destroy_confirmation: Jesteś pewien, że chcesz usunąć to wiki i ca
 text_workflow_edit: Zaznacz rolę i typ zagadnienia do edycji przepływu
 
 label_user_activity: "Aktywność: %s"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 3acd8cf0a..5f202de50 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -694,3 +694,4 @@ text_repository_usernames_mapping: "Seleciona ou atualiza os usuários do Redmin
 permission_edit_own_messages: Editar próprias mensagens
 permission_delete_own_messages: Excluir próprias mensagens
 label_user_activity: "Atividade de %s"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/pt.yml b/lang/pt.yml
index 7bc467e0f..0df3cda38 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -695,3 +695,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/ro.yml b/lang/ro.yml
index f3a59b20d..27d9c8e16 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -693,3 +693,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/ru.yml b/lang/ru.yml
index c50af3d93..4d7807cb1 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -727,3 +727,4 @@ text_user_wrote: '%s написал(а):'
 text_wiki_destroy_confirmation: Вы уверены, что хотите удалить данную Wiki и все ее содержимое?
 text_workflow_edit: Выберите роль и трекер для редактирования последовательности состояний
 
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/sk.yml b/lang/sk.yml
index 09a5f6b5c..9cea7d006 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -699,3 +699,4 @@ permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/sr.yml b/lang/sr.yml
index 702dad7a2..797e94f54 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -694,3 +694,4 @@ permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/sv.yml b/lang/sv.yml
index 8c9b6f6ef..f15febe70 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -694,3 +694,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/th.yml b/lang/th.yml
index 3611b790c..2689c9889 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -696,3 +696,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/tr.yml b/lang/tr.yml
index 8b6ccc6c9..bdd971268 100644
--- a/lang/tr.yml
+++ b/lang/tr.yml
@@ -694,3 +694,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/uk.yml b/lang/uk.yml
index b84392c16..7b3c446f4 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -695,3 +695,4 @@ text_repository_usernames_mapping: "Select ou update the Redmine user mapped to
 permission_edit_own_messages: Edit own messages
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/vn.yml b/lang/vn.yml
index ecdfba533..93a243ff3 100644
--- a/lang/vn.yml
+++ b/lang/vn.yml
@@ -696,3 +696,4 @@ label_example: Ví dụ
 text_repository_usernames_mapping: "Chọn hoặc cập nhật ánh xạ người dùng hệ thống với người dùng trong kho lưu trữ.\nNhững trường hợp trùng hợp về tên và email sẽ được tự động ánh xạ."
 permission_delete_own_messages: Delete own messages
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 879e47ca3..666df51b6 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -695,3 +695,4 @@ enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
 label_user_activity: "%s's activity"
+label_updated_time_by: Updated by %s %s ago
diff --git a/lang/zh.yml b/lang/zh.yml
index c20d47566..721d21719 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -695,3 +695,4 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
+label_updated_time_by: Updated by %s %s ago