@@ -73,6 +73,10 module ApplicationHelper | |||||
73 | @date_format_setting == 0 ? l_datetime(time) : (time.strftime("%Y-%m-%d") + ' ' + l_time(time)) |
|
73 | @date_format_setting == 0 ? l_datetime(time) : (time.strftime("%Y-%m-%d") + ' ' + l_time(time)) | |
74 | end |
|
74 | end | |
75 |
|
75 | |||
|
76 | def authoring(created, author) | |||
|
77 | l(:label_added_time_by, author.name, distance_of_time_in_words(Time.now, created)) | |||
|
78 | end | |||
|
79 | ||||
76 | def day_name(day) |
|
80 | def day_name(day) | |
77 | l(:general_day_names).split(',')[day-1] |
|
81 | l(:general_day_names).split(',')[day-1] | |
78 | end |
|
82 | end |
@@ -19,7 +19,7 | |||||
19 | </div> |
|
19 | </div> | |
20 | <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %> |
|
20 | <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %> | |
21 | (<%= number_to_human_size attachment.filesize %>)<br /> |
|
21 | (<%= number_to_human_size attachment.filesize %>)<br /> | |
22 | <em><%= attachment.author.name %>, <%= format_date(attachment.created_on) %></em><br /> |
|
22 | <span class="author"><%= authoring attachment.created_on, attachment.author %></span><br /> | |
23 | <%= lwr(:label_download, attachment.downloads) %> |
|
23 | <%= lwr(:label_download, attachment.downloads) %> | |
24 | </li> |
|
24 | </li> | |
25 | <% end %> |
|
25 | <% end %> |
@@ -8,7 +8,7 | |||||
8 |
|
8 | |||
9 | <h2><%= @issue.tracker.name %> #<%= @issue.id %>: <%=h @issue.subject %></h2> |
|
9 | <h2><%= @issue.tracker.name %> #<%= @issue.id %>: <%=h @issue.subject %></h2> | |
10 | <p class="author"> |
|
10 | <p class="author"> | |
11 | <%= l(:label_added_time_by, distance_of_time_in_words(Time.now, @issue.created_on), link_to_user(@issue.author)) %>. |
|
11 | <%= authoring @issue.created_on, @issue.author %>. | |
12 | <%= l(:label_updated_time, distance_of_time_in_words(Time.now, @issue.updated_on)) if @issue.created_on != @issue.updated_on %>. |
|
12 | <%= l(:label_updated_time, distance_of_time_in_words(Time.now, @issue.updated_on)) if @issue.created_on != @issue.updated_on %>. | |
13 | </p> |
|
13 | </p> | |
14 | <div class="box"> |
|
14 | <div class="box"> |
@@ -1,5 +1,5 | |||||
1 | <p><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless @project %> |
|
1 | <p><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless @project %> | |
2 | <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %><br /> |
|
2 | <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %><br /> | |
3 | <% unless news.summary.blank? %><%=h news.summary %><br /><% end %> |
|
3 | <% unless news.summary.blank? %><%=h news.summary %><br /><% end %> | |
4 | <em><%= news.author.name %>, <%= format_time(news.created_on) %></em><br /> |
|
4 | <span class="author"><%= authoring news.created_on, news.author %> | |
5 |
<%= news.comments_count |
|
5 | <%= "<br />#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase}" if news.comments_count > 0 %></span></p> |
@@ -6,7 +6,7 | |||||
6 | <h2><%=h @news.title %></h2> |
|
6 | <h2><%=h @news.title %></h2> | |
7 |
|
7 | |||
8 | <p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %> |
|
8 | <p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %> | |
9 | <%= @news.author.name %>, <%= format_time(@news.created_on) %></em></p> |
|
9 | <span class="author"><%= authoring @news.created_on, @news.author %></span></em></p> | |
10 | <%= textilizable(@news.description) %> |
|
10 | <%= textilizable(@news.description) %> | |
11 | <br /> |
|
11 | <br /> | |
12 |
|
12 |
@@ -158,6 +158,7 field_issue_to_id: Related issue | |||||
158 | field_delay: Delay |
|
158 | field_delay: Delay | |
159 | field_assignable: Issues can be assigned to this role |
|
159 | field_assignable: Issues can be assigned to this role | |
160 | field_redirect_existing_links: Redirect existing links |
|
160 | field_redirect_existing_links: Redirect existing links | |
|
161 | field_estimated_hours: Estimated time | |||
161 |
|
162 | |||
162 | setting_app_title: Заглавие |
|
163 | setting_app_title: Заглавие | |
163 | setting_app_subtitle: Описание |
|
164 | setting_app_subtitle: Описание | |
@@ -416,6 +417,8 label_sort_by: Sort by "%s" | |||||
416 | label_send_test_email: Send a test email |
|
417 | label_send_test_email: Send a test email | |
417 | label_feeds_access_key_created_on: RSS access key created %s ago |
|
418 | label_feeds_access_key_created_on: RSS access key created %s ago | |
418 | label_module_plural: Modules |
|
419 | label_module_plural: Modules | |
|
420 | label_added_time_by: Added by %s %s ago | |||
|
421 | label_updated_time: Updated %s ago | |||
419 |
|
422 | |||
420 | button_login: Вход |
|
423 | button_login: Вход | |
421 | button_submit: Изпращане |
|
424 | button_submit: Изпращане |
@@ -158,6 +158,7 field_issue_to_id: Related issue | |||||
158 | field_delay: Delay |
|
158 | field_delay: Delay | |
159 | field_assignable: Issues can be assigned to this role |
|
159 | field_assignable: Issues can be assigned to this role | |
160 | field_redirect_existing_links: Redirect existing links |
|
160 | field_redirect_existing_links: Redirect existing links | |
|
161 | field_estimated_hours: Estimated time | |||
161 |
|
162 | |||
162 | setting_app_title: Applikation Titel |
|
163 | setting_app_title: Applikation Titel | |
163 | setting_app_subtitle: Applikation Untertitel |
|
164 | setting_app_subtitle: Applikation Untertitel | |
@@ -416,6 +417,8 label_sort_by: Sort by "%s" | |||||
416 | label_send_test_email: Send a test email |
|
417 | label_send_test_email: Send a test email | |
417 | label_feeds_access_key_created_on: RSS access key created %s ago |
|
418 | label_feeds_access_key_created_on: RSS access key created %s ago | |
418 | label_module_plural: Modules |
|
419 | label_module_plural: Modules | |
|
420 | label_added_time_by: Added by %s %s ago | |||
|
421 | label_updated_time: Updated %s ago | |||
419 |
|
422 | |||
420 | button_login: Einloggen |
|
423 | button_login: Einloggen | |
421 | button_submit: OK |
|
424 | button_submit: OK |
@@ -417,7 +417,7 label_sort_by: Sort by "%s" | |||||
417 | label_send_test_email: Send a test email |
|
417 | label_send_test_email: Send a test email | |
418 | label_feeds_access_key_created_on: RSS access key created %s ago |
|
418 | label_feeds_access_key_created_on: RSS access key created %s ago | |
419 | label_module_plural: Modules |
|
419 | label_module_plural: Modules | |
420 |
label_added_time_by: Added %s ago |
|
420 | label_added_time_by: Added by %s %s ago | |
421 | label_updated_time: Updated %s ago |
|
421 | label_updated_time: Updated %s ago | |
422 |
|
422 | |||
423 | button_login: Login |
|
423 | button_login: Login |
@@ -158,6 +158,7 field_issue_to_id: Related issue | |||||
158 | field_delay: Delay |
|
158 | field_delay: Delay | |
159 | field_assignable: Issues can be assigned to this role |
|
159 | field_assignable: Issues can be assigned to this role | |
160 | field_redirect_existing_links: Redirect existing links |
|
160 | field_redirect_existing_links: Redirect existing links | |
|
161 | field_estimated_hours: Estimated time | |||
161 |
|
162 | |||
162 | setting_app_title: Título del aplicación |
|
163 | setting_app_title: Título del aplicación | |
163 | setting_app_subtitle: Subtítulo del aplicación |
|
164 | setting_app_subtitle: Subtítulo del aplicación | |
@@ -416,6 +417,8 label_sort_by: Sort by "%s" | |||||
416 | label_send_test_email: Send a test email |
|
417 | label_send_test_email: Send a test email | |
417 | label_feeds_access_key_created_on: RSS access key created %s ago |
|
418 | label_feeds_access_key_created_on: RSS access key created %s ago | |
418 | label_module_plural: Modules |
|
419 | label_module_plural: Modules | |
|
420 | label_added_time_by: Added by %s %s ago | |||
|
421 | label_updated_time: Updated %s ago | |||
419 |
|
422 | |||
420 | button_login: Conexión |
|
423 | button_login: Conexión | |
421 | button_submit: Someter |
|
424 | button_submit: Someter |
@@ -417,7 +417,7 label_sort_by: Trier par "%s" | |||||
417 | label_send_test_email: Envoyer un email de test |
|
417 | label_send_test_email: Envoyer un email de test | |
418 | label_feeds_access_key_created_on: Clé d'accès RSS créée il y a %s |
|
418 | label_feeds_access_key_created_on: Clé d'accès RSS créée il y a %s | |
419 | label_module_plural: Modules |
|
419 | label_module_plural: Modules | |
420 |
label_added_time_by: Ajouté il y a %s |
|
420 | label_added_time_by: Ajouté par %s il y a %s | |
421 | label_updated_time: Mis à jour il y a %s |
|
421 | label_updated_time: Mis à jour il y a %s | |
422 |
|
422 | |||
423 | button_login: Connexion |
|
423 | button_login: Connexion |
@@ -158,6 +158,7 field_issue_to_id: Related issue | |||||
158 | field_delay: Delay |
|
158 | field_delay: Delay | |
159 | field_assignable: Issues can be assigned to this role |
|
159 | field_assignable: Issues can be assigned to this role | |
160 | field_redirect_existing_links: Redirect existing links |
|
160 | field_redirect_existing_links: Redirect existing links | |
|
161 | field_estimated_hours: Estimated time | |||
161 |
|
162 | |||
162 | setting_app_title: Titolo applicazione |
|
163 | setting_app_title: Titolo applicazione | |
163 | setting_app_subtitle: Sottotitolo applicazione |
|
164 | setting_app_subtitle: Sottotitolo applicazione | |
@@ -416,6 +417,8 label_sort_by: Sort by "%s" | |||||
416 | label_send_test_email: Send a test email |
|
417 | label_send_test_email: Send a test email | |
417 | label_feeds_access_key_created_on: RSS access key created %s ago |
|
418 | label_feeds_access_key_created_on: RSS access key created %s ago | |
418 | label_module_plural: Modules |
|
419 | label_module_plural: Modules | |
|
420 | label_added_time_by: Added by %s %s ago | |||
|
421 | label_updated_time: Updated %s ago | |||
419 |
|
422 | |||
420 | button_login: Login |
|
423 | button_login: Login | |
421 | button_submit: Invia |
|
424 | button_submit: Invia |
@@ -159,6 +159,7 field_issue_to_id: 関連する問題 | |||||
159 | field_delay: 遅延 |
|
159 | field_delay: 遅延 | |
160 | field_assignable: Issues can be assigned to this role |
|
160 | field_assignable: Issues can be assigned to this role | |
161 | field_redirect_existing_links: Redirect existing links |
|
161 | field_redirect_existing_links: Redirect existing links | |
|
162 | field_estimated_hours: Estimated time | |||
162 |
|
163 | |||
163 | setting_app_title: アプリケーションのタイトル |
|
164 | setting_app_title: アプリケーションのタイトル | |
164 | setting_app_subtitle: アプリケーションのサブタイトル |
|
165 | setting_app_subtitle: アプリケーションのサブタイトル | |
@@ -417,6 +418,8 label_sort_by: Sort by "%s" | |||||
417 | label_send_test_email: Send a test email |
|
418 | label_send_test_email: Send a test email | |
418 | label_feeds_access_key_created_on: RSS access key created %s ago |
|
419 | label_feeds_access_key_created_on: RSS access key created %s ago | |
419 | label_module_plural: Modules |
|
420 | label_module_plural: Modules | |
|
421 | label_added_time_by: Added by %s %s ago | |||
|
422 | label_updated_time: Updated %s ago | |||
420 |
|
423 | |||
421 | button_login: ログイン |
|
424 | button_login: ログイン | |
422 | button_submit: 変更 |
|
425 | button_submit: 変更 |
@@ -158,6 +158,7 field_issue_to_id: Gerelateerd issue | |||||
158 | field_delay: Vertraging |
|
158 | field_delay: Vertraging | |
159 | field_assignable: Issues can be assigned to this role |
|
159 | field_assignable: Issues can be assigned to this role | |
160 | field_redirect_existing_links: Redirect existing links |
|
160 | field_redirect_existing_links: Redirect existing links | |
|
161 | field_estimated_hours: Estimated time | |||
161 |
|
162 | |||
162 | setting_app_title: Applicatie titel |
|
163 | setting_app_title: Applicatie titel | |
163 | setting_app_subtitle: Applicatie ondertitel |
|
164 | setting_app_subtitle: Applicatie ondertitel | |
@@ -416,6 +417,8 label_sort_by: Sort by "%s" | |||||
416 | label_send_test_email: Send a test email |
|
417 | label_send_test_email: Send a test email | |
417 | label_feeds_access_key_created_on: RSS access key created %s ago |
|
418 | label_feeds_access_key_created_on: RSS access key created %s ago | |
418 | label_module_plural: Modules |
|
419 | label_module_plural: Modules | |
|
420 | label_added_time_by: Added by %s %s ago | |||
|
421 | label_updated_time: Updated %s ago | |||
419 |
|
422 | |||
420 | button_login: Inloggen |
|
423 | button_login: Inloggen | |
421 | button_submit: Toevoegen |
|
424 | button_submit: Toevoegen |
@@ -158,6 +158,7 field_issue_to_id: Related issue | |||||
158 | field_delay: Delay |
|
158 | field_delay: Delay | |
159 | field_assignable: Issues can be assigned to this role |
|
159 | field_assignable: Issues can be assigned to this role | |
160 | field_redirect_existing_links: Redirect existing links |
|
160 | field_redirect_existing_links: Redirect existing links | |
|
161 | field_estimated_hours: Estimated time | |||
161 |
|
162 | |||
162 | setting_app_title: Titulo da aplicacao |
|
163 | setting_app_title: Titulo da aplicacao | |
163 | setting_app_subtitle: Sub-titulo da aplicacao |
|
164 | setting_app_subtitle: Sub-titulo da aplicacao | |
@@ -416,6 +417,8 label_sort_by: Sort by "%s" | |||||
416 | label_send_test_email: Send a test email |
|
417 | label_send_test_email: Send a test email | |
417 | label_feeds_access_key_created_on: RSS access key created %s ago |
|
418 | label_feeds_access_key_created_on: RSS access key created %s ago | |
418 | label_module_plural: Modules |
|
419 | label_module_plural: Modules | |
|
420 | label_added_time_by: Added by %s %s ago | |||
|
421 | label_updated_time: Updated %s ago | |||
419 |
|
422 | |||
420 | button_login: Login |
|
423 | button_login: Login | |
421 | button_submit: Enviar |
|
424 | button_submit: Enviar |
@@ -158,6 +158,7 field_issue_to_id: Tarefa relacionada | |||||
158 | field_delay: Atraso |
|
158 | field_delay: Atraso | |
159 | field_assignable: Issues can be assigned to this role |
|
159 | field_assignable: Issues can be assigned to this role | |
160 | field_redirect_existing_links: Redirect existing links |
|
160 | field_redirect_existing_links: Redirect existing links | |
|
161 | field_estimated_hours: Estimated time | |||
161 |
|
162 | |||
162 | setting_app_title: Título da aplicação |
|
163 | setting_app_title: Título da aplicação | |
163 | setting_app_subtitle: Sub-título da aplicação |
|
164 | setting_app_subtitle: Sub-título da aplicação | |
@@ -416,6 +417,8 label_sort_by: Sort by "%s" | |||||
416 | label_send_test_email: Send a test email |
|
417 | label_send_test_email: Send a test email | |
417 | label_feeds_access_key_created_on: RSS access key created %s ago |
|
418 | label_feeds_access_key_created_on: RSS access key created %s ago | |
418 | label_module_plural: Modules |
|
419 | label_module_plural: Modules | |
|
420 | label_added_time_by: Added by %s %s ago | |||
|
421 | label_updated_time: Updated %s ago | |||
419 |
|
422 | |||
420 | button_login: Login |
|
423 | button_login: Login | |
421 | button_submit: Enviar |
|
424 | button_submit: Enviar |
@@ -158,6 +158,7 field_issue_to_id: Related issue | |||||
158 | field_delay: Delay |
|
158 | field_delay: Delay | |
159 | field_assignable: Issues can be assigned to this role |
|
159 | field_assignable: Issues can be assigned to this role | |
160 | field_redirect_existing_links: Redirect existing links |
|
160 | field_redirect_existing_links: Redirect existing links | |
|
161 | field_estimated_hours: Estimated time | |||
161 |
|
162 | |||
162 | setting_app_title: Applikationstitel |
|
163 | setting_app_title: Applikationstitel | |
163 | setting_app_subtitle: Applicationsunderrubrik |
|
164 | setting_app_subtitle: Applicationsunderrubrik | |
@@ -416,6 +417,8 label_sort_by: Sort by "%s" | |||||
416 | label_send_test_email: Send a test email |
|
417 | label_send_test_email: Send a test email | |
417 | label_feeds_access_key_created_on: RSS access key created %s ago |
|
418 | label_feeds_access_key_created_on: RSS access key created %s ago | |
418 | label_module_plural: Modules |
|
419 | label_module_plural: Modules | |
|
420 | label_added_time_by: Added by %s %s ago | |||
|
421 | label_updated_time: Updated %s ago | |||
419 |
|
422 | |||
420 | button_login: Logga in |
|
423 | button_login: Logga in | |
421 | button_submit: Skicka |
|
424 | button_submit: Skicka |
@@ -161,6 +161,7 field_issue_to_id: Related issue | |||||
161 | field_delay: Delay |
|
161 | field_delay: Delay | |
162 | field_assignable: Issues can be assigned to this role |
|
162 | field_assignable: Issues can be assigned to this role | |
163 | field_redirect_existing_links: Redirect existing links |
|
163 | field_redirect_existing_links: Redirect existing links | |
|
164 | field_estimated_hours: Estimated time | |||
164 |
|
165 | |||
165 | setting_app_title: 应用程序标题 |
|
166 | setting_app_title: 应用程序标题 | |
166 | setting_app_subtitle: 应用程序子标题 |
|
167 | setting_app_subtitle: 应用程序子标题 | |
@@ -418,6 +419,8 label_sort_by: Sort by "%s" | |||||
418 | label_send_test_email: Send a test email |
|
419 | label_send_test_email: Send a test email | |
419 | label_feeds_access_key_created_on: RSS access key created %s ago |
|
420 | label_feeds_access_key_created_on: RSS access key created %s ago | |
420 | label_module_plural: Modules |
|
421 | label_module_plural: Modules | |
|
422 | label_added_time_by: Added by %s %s ago | |||
|
423 | label_updated_time: Updated %s ago | |||
421 |
|
424 | |||
422 | button_login: 登录 |
|
425 | button_login: 登录 | |
423 | button_submit: 提交 |
|
426 | button_submit: 提交 |
General Comments 0
You need to be logged in to leave comments.
Login now