Changes issue history headings.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2094 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
cf77c93cb4
commit
8a0a25fceb
|
@ -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={})
|
||||
|
|
|
@ -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 %>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -695,3 +695,4 @@ default_activity_development: 开发
|
|||
enumeration_issue_priorities: 问题优先级
|
||||
enumeration_doc_categories: 文档类别
|
||||
enumeration_activities: 活动(时间跟踪)
|
||||
label_updated_time_by: Updated by %s %s ago
|
||||
|
|
Loading…
Reference in New Issue