Skip to content

O
OHR Support
Commit 3c6ddc9c authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Changed author display on issues, news and document files. 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@732 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 89b34981
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 7 deletions
app/helpers/application_helper.rb
View file @ 3c6ddc9c
...@@ -73,6 +73,10 @@ module ApplicationHelper ...@@ -73,6 +73,10 @@ module ApplicationHelper
@date_format_setting == 0 ? l_datetime(time) : (time.strftime("%Y-%m-%d") + ' ' + l_time(time)) @date_format_setting == 0 ? l_datetime(time) : (time.strftime("%Y-%m-%d") + ' ' + l_time(time))
end end
def authoring(created, author)
l(:label_added_time_by, author.name, distance_of_time_in_words(Time.now, created))
end
def day_name(day) def day_name(day)
l(:general_day_names).split(',')[day-1] l(:general_day_names).split(',')[day-1]
end end
......
app/views/documents/show.rhtml
View file @ 3c6ddc9c
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</div> </div>
<%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %> <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
(<%= number_to_human_size attachment.filesize %>)<br /> (<%= number_to_human_size attachment.filesize %>)<br />
<em><%= attachment.author.name %>, <%= format_date(attachment.created_on) %></em><br /> <span class="author"><%= authoring attachment.created_on, attachment.author %></span><br />
<%= lwr(:label_download, attachment.downloads) %> <%= lwr(:label_download, attachment.downloads) %>
</li> </li>
<% end %> <% end %>
......
app/views/issues/show.rhtml
View file @ 3c6ddc9c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<h2><%= @issue.tracker.name %> #<%= @issue.id %>: <%=h @issue.subject %></h2> <h2><%= @issue.tracker.name %> #<%= @issue.id %>: <%=h @issue.subject %></h2>
<p class="author"> <p class="author">
<%= l(:label_added_time_by, distance_of_time_in_words(Time.now, @issue.created_on), link_to_user(@issue.author)) %>. <%= authoring @issue.created_on, @issue.author %>.
<%= l(:label_updated_time, distance_of_time_in_words(Time.now, @issue.updated_on)) if @issue.created_on != @issue.updated_on %>. <%= l(:label_updated_time, distance_of_time_in_words(Time.now, @issue.updated_on)) if @issue.created_on != @issue.updated_on %>.
</p> </p>
<div class="box"> <div class="box">
......
app/views/news/_news.rhtml
View file @ 3c6ddc9c
<p><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless @project %> <p><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless @project %>
<%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %><br /> <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %><br />
<% unless news.summary.blank? %><%=h news.summary %><br /><% end %> <% unless news.summary.blank? %><%=h news.summary %><br /><% end %>
<em><%= news.author.name %>, <%= format_time(news.created_on) %></em><br /> <span class="author"><%= authoring news.created_on, news.author %>
<%= news.comments_count %> <%= lwr(:label_comment, news.comments_count).downcase %><br /></p> <%= "<br />#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase}" if news.comments_count > 0 %></span></p>
app/views/news/show.rhtml
View file @ 3c6ddc9c
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<h2><%=h @news.title %></h2> <h2><%=h @news.title %></h2>
<p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %> <p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %>
<%= @news.author.name %>, <%= format_time(@news.created_on) %></em></p> <span class="author"><%= authoring @news.created_on, @news.author %></span></em></p>
<%= textilizable(@news.description) %> <%= textilizable(@news.description) %>
<br /> <br />
......
lang/bg.yml
View file @ 3c6ddc9c
...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue ...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue
field_delay: Delay field_delay: Delay
field_assignable: Issues can be assigned to this role field_assignable: Issues can be assigned to this role
field_redirect_existing_links: Redirect existing links field_redirect_existing_links: Redirect existing links
field_estimated_hours: Estimated time
setting_app_title: Заглавие setting_app_title: Заглавие
setting_app_subtitle: Описание setting_app_subtitle: Описание
...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s" ...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key_created_on: RSS access key created %s ago label_feeds_access_key_created_on: RSS access key created %s ago
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Added by %s %s ago
label_updated_time: Updated %s ago
button_login: Вход button_login: Вход
button_submit: Изпращане button_submit: Изпращане
......
lang/de.yml
View file @ 3c6ddc9c
...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue ...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue
field_delay: Delay field_delay: Delay
field_assignable: Issues can be assigned to this role field_assignable: Issues can be assigned to this role
field_redirect_existing_links: Redirect existing links field_redirect_existing_links: Redirect existing links
field_estimated_hours: Estimated time
setting_app_title: Applikation Titel setting_app_title: Applikation Titel
setting_app_subtitle: Applikation Untertitel setting_app_subtitle: Applikation Untertitel
...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s" ...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key_created_on: RSS access key created %s ago label_feeds_access_key_created_on: RSS access key created %s ago
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Added by %s %s ago
label_updated_time: Updated %s ago
button_login: Einloggen button_login: Einloggen
button_submit: OK button_submit: OK
......
lang/en.yml
View file @ 3c6ddc9c
...@@ -417,7 +417,7 @@ label_sort_by: Sort by "%s" ...@@ -417,7 +417,7 @@ label_sort_by: Sort by "%s"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key_created_on: RSS access key created %s ago label_feeds_access_key_created_on: RSS access key created %s ago
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Added %s ago by %s label_added_time_by: Added by %s %s ago
label_updated_time: Updated %s ago label_updated_time: Updated %s ago
button_login: Login button_login: Login
......
lang/es.yml
View file @ 3c6ddc9c
...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue ...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue
field_delay: Delay field_delay: Delay
field_assignable: Issues can be assigned to this role field_assignable: Issues can be assigned to this role
field_redirect_existing_links: Redirect existing links field_redirect_existing_links: Redirect existing links
field_estimated_hours: Estimated time
setting_app_title: Título del aplicación setting_app_title: Título del aplicación
setting_app_subtitle: Subtítulo del aplicación setting_app_subtitle: Subtítulo del aplicación
...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s" ...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key_created_on: RSS access key created %s ago label_feeds_access_key_created_on: RSS access key created %s ago
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Added by %s %s ago
label_updated_time: Updated %s ago
button_login: Conexión button_login: Conexión
button_submit: Someter button_submit: Someter
......
lang/fr.yml
View file @ 3c6ddc9c
...@@ -417,7 +417,7 @@ label_sort_by: Trier par "%s" ...@@ -417,7 +417,7 @@ label_sort_by: Trier par "%s"
label_send_test_email: Envoyer un email de test 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_feeds_access_key_created_on: Clé d'accès RSS créée il y a %s
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Ajouté il y a %s par %s label_added_time_by: Ajouté par %s il y a %s
label_updated_time: Mis à jour il y a %s label_updated_time: Mis à jour il y a %s
button_login: Connexion button_login: Connexion
......
lang/it.yml
View file @ 3c6ddc9c
...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue ...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue
field_delay: Delay field_delay: Delay
field_assignable: Issues can be assigned to this role field_assignable: Issues can be assigned to this role
field_redirect_existing_links: Redirect existing links field_redirect_existing_links: Redirect existing links
field_estimated_hours: Estimated time
setting_app_title: Titolo applicazione setting_app_title: Titolo applicazione
setting_app_subtitle: Sottotitolo applicazione setting_app_subtitle: Sottotitolo applicazione
...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s" ...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key_created_on: RSS access key created %s ago label_feeds_access_key_created_on: RSS access key created %s ago
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Added by %s %s ago
label_updated_time: Updated %s ago
button_login: Login button_login: Login
button_submit: Invia button_submit: Invia
......
lang/ja.yml
View file @ 3c6ddc9c
...@@ -159,6 +159,7 @@ field_issue_to_id: 関連する問題 ...@@ -159,6 +159,7 @@ field_issue_to_id: 関連する問題
field_delay: 遅延 field_delay: 遅延
field_assignable: Issues can be assigned to this role field_assignable: Issues can be assigned to this role
field_redirect_existing_links: Redirect existing links field_redirect_existing_links: Redirect existing links
field_estimated_hours: Estimated time
setting_app_title: アプリケーションのタイトル setting_app_title: アプリケーションのタイトル
setting_app_subtitle: アプリケーションのサブタイトル setting_app_subtitle: アプリケーションのサブタイトル
...@@ -417,6 +418,8 @@ label_sort_by: Sort by "%s" ...@@ -417,6 +418,8 @@ label_sort_by: Sort by "%s"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key_created_on: RSS access key created %s ago label_feeds_access_key_created_on: RSS access key created %s ago
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Added by %s %s ago
label_updated_time: Updated %s ago
button_login: ログイン button_login: ログイン
button_submit: 変更 button_submit: 変更
......
lang/nl.yml
View file @ 3c6ddc9c
...@@ -158,6 +158,7 @@ field_issue_to_id: Gerelateerd issue ...@@ -158,6 +158,7 @@ field_issue_to_id: Gerelateerd issue
field_delay: Vertraging field_delay: Vertraging
field_assignable: Issues can be assigned to this role field_assignable: Issues can be assigned to this role
field_redirect_existing_links: Redirect existing links field_redirect_existing_links: Redirect existing links
field_estimated_hours: Estimated time
setting_app_title: Applicatie titel setting_app_title: Applicatie titel
setting_app_subtitle: Applicatie ondertitel setting_app_subtitle: Applicatie ondertitel
...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s" ...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key_created_on: RSS access key created %s ago label_feeds_access_key_created_on: RSS access key created %s ago
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Added by %s %s ago
label_updated_time: Updated %s ago
button_login: Inloggen button_login: Inloggen
button_submit: Toevoegen button_submit: Toevoegen
......
lang/pt-br.yml
View file @ 3c6ddc9c
...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue ...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue
field_delay: Delay field_delay: Delay
field_assignable: Issues can be assigned to this role field_assignable: Issues can be assigned to this role
field_redirect_existing_links: Redirect existing links field_redirect_existing_links: Redirect existing links
field_estimated_hours: Estimated time
setting_app_title: Titulo da aplicacao setting_app_title: Titulo da aplicacao
setting_app_subtitle: Sub-titulo da aplicacao setting_app_subtitle: Sub-titulo da aplicacao
...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s" ...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key_created_on: RSS access key created %s ago label_feeds_access_key_created_on: RSS access key created %s ago
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Added by %s %s ago
label_updated_time: Updated %s ago
button_login: Login button_login: Login
button_submit: Enviar button_submit: Enviar
......
lang/pt.yml
View file @ 3c6ddc9c
...@@ -158,6 +158,7 @@ field_issue_to_id: Tarefa relacionada ...@@ -158,6 +158,7 @@ field_issue_to_id: Tarefa relacionada
field_delay: Atraso field_delay: Atraso
field_assignable: Issues can be assigned to this role field_assignable: Issues can be assigned to this role
field_redirect_existing_links: Redirect existing links field_redirect_existing_links: Redirect existing links
field_estimated_hours: Estimated time
setting_app_title: Título da aplicação setting_app_title: Título da aplicação
setting_app_subtitle: Sub-título da aplicação setting_app_subtitle: Sub-título da aplicação
...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s" ...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key_created_on: RSS access key created %s ago label_feeds_access_key_created_on: RSS access key created %s ago
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Added by %s %s ago
label_updated_time: Updated %s ago
button_login: Login button_login: Login
button_submit: Enviar button_submit: Enviar
......
lang/sv.yml
View file @ 3c6ddc9c
...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue ...@@ -158,6 +158,7 @@ field_issue_to_id: Related issue
field_delay: Delay field_delay: Delay
field_assignable: Issues can be assigned to this role field_assignable: Issues can be assigned to this role
field_redirect_existing_links: Redirect existing links field_redirect_existing_links: Redirect existing links
field_estimated_hours: Estimated time
setting_app_title: Applikationstitel setting_app_title: Applikationstitel
setting_app_subtitle: Applicationsunderrubrik setting_app_subtitle: Applicationsunderrubrik
...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s" ...@@ -416,6 +417,8 @@ label_sort_by: Sort by "%s"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key_created_on: RSS access key created %s ago label_feeds_access_key_created_on: RSS access key created %s ago
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Added by %s %s ago
label_updated_time: Updated %s ago
button_login: Logga in button_login: Logga in
button_submit: Skicka button_submit: Skicka
......
lang/zh.yml
View file @ 3c6ddc9c
...@@ -161,6 +161,7 @@ field_issue_to_id: Related issue ...@@ -161,6 +161,7 @@ field_issue_to_id: Related issue
field_delay: Delay field_delay: Delay
field_assignable: Issues can be assigned to this role field_assignable: Issues can be assigned to this role
field_redirect_existing_links: Redirect existing links field_redirect_existing_links: Redirect existing links
field_estimated_hours: Estimated time
setting_app_title: 应用程序标题 setting_app_title: 应用程序标题
setting_app_subtitle: 应用程序子标题 setting_app_subtitle: 应用程序子标题
...@@ -418,6 +419,8 @@ label_sort_by: Sort by "%s" ...@@ -418,6 +419,8 @@ label_sort_by: Sort by "%s"
label_send_test_email: Send a test email label_send_test_email: Send a test email
label_feeds_access_key_created_on: RSS access key created %s ago label_feeds_access_key_created_on: RSS access key created %s ago
label_module_plural: Modules label_module_plural: Modules
label_added_time_by: Added by %s %s ago
label_updated_time: Updated %s ago
button_login: 登录 button_login: 登录
button_submit: 提交 button_submit: 提交
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment