diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-02 14:59:48 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-02 14:59:48 +0100 |
| commit | fd7947966be2cd07caefd68c35e6f2d73d0693c1 (patch) | |
| tree | b37a6c89e8a66c4a0ccaa81c886144e63a76671d /app | |
| parent | 091dfe1df5d47ada296f5bb2f6fc5ef8633c0934 (diff) | |
| parent | a7073881fed6ec3f46841da96380d4b5643393a2 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into purge-requests
Diffstat (limited to 'app')
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/user/show.rhtml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 56c33e512..74c56dc8c 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -204,7 +204,9 @@ module LinkToHelper # Basic date format def simple_date(date) - return I18n.l(date, :format => "%e %B %Y") + date_format = _("simple_date_format") + date_format = :long if date_format == "simple_date_format" + return I18n.l(date.to_date, :format => date_format) end def simple_time(date) diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 8f1803442..bb509ec51 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -139,7 +139,7 @@ <% if !@xapian_requests.nil? %> <% if @xapian_requests.results.empty? %> <% if @page == 1 %> - <h2 class="foi_results" id="foi_requests"><%= @is_you ? 'Freedom of Information requests made by you' : 'Freedom of Information requests made by this person' %> <%= @match_phrase %> + <h2 class="foi_results" id="foi_requests"><%= @is_you ? _('Freedom of Information requests made by you') : _('Freedom of Information requests made by this person') %> <%= @match_phrase %> </h2> <p><%= @is_you ? _('You have made no Freedom of Information requests using this site.') : _('This person has made no Freedom of Information requests using this site.') %> <%= @page_desc %> |