Skip to content

O
OHR Support
Commit 0fb08bdd authored by Francisco Juan's avatar Francisco Juan
Browse files
Options

change distance_of_time_in_words methods to actual date and time

parent b4cdfcdc
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
app/helpers/application_helper.rb
View file @ 0fb08bdd
......@@ -317,7 +317,7 @@ module ApplicationHelper
end
def time_tag(time)
text = distance_of_time_in_words(Time.now, time)
text = I18n.localize(time, :format => :short)
if @project
link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => time.to_date}, :title => format_time(time))
else
......
config/locales/en.yml
View file @ 0fb08bdd
......@@ -26,7 +26,7 @@ en:
formats:
default: "%m/%d/%Y %I:%M %p"
time: "%I:%M %p"
short: "%d %b %H:%M"
short: "%d %b at %H:%M"
long: "%B %d, %Y %H:%M"
am: "am"
pm: "pm"
......@@ -730,11 +730,11 @@ en:
label_send_test_email: Send a test email
label_feeds_access_key: RSS access key
label_missing_feeds_access_key: Missing a RSS access key
label_feeds_access_key_created_on: "RSS access key created %{value} ago"
label_feeds_access_key_created_on: "RSS access key created on %{value}"
label_module_plural: Modules
label_added_time_by: "Added by %{author} %{age} ago"
label_updated_time_by: "Updated by %{author} %{age} ago"
label_updated_time: "Updated %{value} ago"
label_added_time_by: "Added by %{author} on %{age}"
label_updated_time_by: "Updated by %{author} on %{age}"
label_updated_time: "Updated on %{value}"
label_jump_to_a_project: Jump to a project...
label_file_plural: Files
label_changeset_plural: Changesets
......@@ -796,7 +796,7 @@ en:
label_display_used_statuses_only: Only display statuses that are used by this tracker
label_api_access_key: API access key
label_missing_api_access_key: Missing an API access key
label_api_access_key_created_on: "API access key created %{value} ago"
label_api_access_key_created_on: "API access key created on %{value}"
label_profile: Profile
label_subtask_plural: Subtasks
label_project_copy_notifications: Send email notifications during the project copy
......
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