diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index dbc016b57a8606c130c08228483063e1a2987bed..0e02e56924f0a64c811830caeba79648cf027dff 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 2704b6742991f61bb782575baf93c753bd1d9739..267263b72d2764c8458e28b86453ca249ffbce46 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 40a7b6c8cfc6e8e01a8bc3837adab772ab42ac36..9bce327c6c72a8a0e8407ef25ac6b9b199940628 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 66805c45d5caf10b319c6cf107c2512657a2c7c5..250bb1d8dc3c48465198fe252b728d381144331b 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 e458b31b80a729762fd1e636347f74917168abb5..cb7f361bceb44887fdd532c8600fdf51104bfc3f 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 d4bce1d50a9ec03ea068071868bc46c0492a2b37..a8acfa49bae78d6840668a2fee469eef7d0d1d61 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 ee38db54e7b2e11bd19cdef6e398294d013feb92..82c91d991c9d4f07d61c0a8df9ca578ba9a9f680 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 1d5a664432539194ce8970edd23540353e979eb5..256141d079dce201637649177ea34bc058fec40a 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 65d08b2cea45db659d2dda48e5088eab7aa8eaf9..0c773496d652df5c9173043a76f001a1c0037cc8 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 fb245412bbce86cfcfb83710cb54805affb7eecf..ac41f411dbe7aba44e783a813966f7191c5c29e7 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 730a43d264bbbd2b443529b87d27812bf411dfa0..ffc1b75f395a3f27c16b258d38c9c1c0041adee8 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 87d3b0851d5c4ca3408707dada1f305b93616375..da9160809c8b0952580cd4f725d029afbe7d1d29 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 11f48cd2fd2c2bd6d7e0c47db6a8039026e54d6c..e3c649026ee607d821d20639b2e5fa37a5ef6592 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 1ee5b72bb5d4a82140a94a3e8c3d55e9f7401ef8..3ae2a323df7cb02f881efccfe3cf8aa8a7f35278 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 3e9240330570d6f2ccf21fb35df309bf8d54ee88..71e50a794cab03df3312f37770b4c98c862e3076 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 b3cc59793edebe6783e6b4d1c64eb54567e22fe6..94b3b1045ac09ad33cab29cbfe2b629330ac5775 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 2e2018f477659b2741907e759c1ba349b25b8c01..8a7db6b40d17bdfd6912047e963f635e2acf510c 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 216f238f64b38907cdafd7d4f904fb04c7524795..e70fd999711204331474d5b27f90d80de3a4dfdf 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 6cde8edc62909eeedb5a4c86dc6bfce7bef2d6ee..afad807871ca6fd3dc5c840f40820aa9284b9747 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 9fe8e2c7029ca2a8762a3eb7f7f5d5dd93bb156b..7aea9bbfda9e6b84dd4c6d6ab1558b0feded0a23 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 3acd8cf0a51101f6dbf9c119a657bcc0030ef304..5f202de50dc9be69d7772db9f610065051e8783d 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 7bc467e0f09190c6ec6c156d60f2591dca569fce..0df3cda381dbd05fc65ba6b68d2698d37c76ff37 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 f3a59b20d1b7063497256fa2c3ce0c56dd637fb8..27d9c8e160c00d060e28a48985eadd1b30caa691 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 c50af3d9399d44356aad63fb5efb956ff7e1ceed..4d7807cb12489e8790750a96105c633dbd310315 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 09a5f6b5cebc47d80924dbcf7ac4a5d220fde0cb..9cea7d0060584a33b68eecec8169057f639ce7ea 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 702dad7a295c5dd017a7d0be6bd880fd5b987ab1..797e94f54b2780964012a605521dc6568a5e2972 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 8c9b6f6efe6de618e63452b93963c9782f5d1696..f15febe70062d18853f9c5fe9add8f8b9328f3f2 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 3611b790cfa53c8e9b622793f43a4dbe99153302..2689c988972c89d231003cecc71c06c5deb83329 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 8b6ccc6c9e71056f99b9484bce75ce224e09a89a..bdd971268a7fa71342505b3921f0ac7505e6c102 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 b84392c1670ef76f275c7e084c880a1ce4ccf6b5..7b3c446f4d494fe97190b12cdf5ea7fc0c21a1a6 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 ecdfba533291901fe03e41bd324f7d18b0197182..93a243ff3e61d3e41a041e75e06754788e650ab5 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 879e47ca38c4142fed862d3d0a4ff1f34ae6f0ca..666df51b61dfbd8be02bff32af14533b1d04c836 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 c20d47566f92227baab48fd88dd4459a53e0a11f..721d21719f5ff7fb43b9f41ffcf7e36843222ce8 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