diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-08-23 09:01:56 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-08-23 09:01:56 +0100 |
| commit | 3084034493a428b2394a59b68921ed4b73a8cf7e (patch) | |
| tree | 65109c722dc69413bfa3b2bd9adc1bab894390bf | |
| parent | faabb4c5d37dc5c5bf1dd7f0ce877c8c7aa29c3a (diff) | |
| parent | b9c7136580e65be4f0eb5c7ebbeaf42aeb888d1f (diff) | |
merge from develop
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/general/_frontpage_search_examples.es.rhtml | 1 | ||||
| -rw-r--r-- | app/views/general/_frontpage_search_examples.rhtml | 1 | ||||
| -rw-r--r-- | app/views/general/frontpage.rhtml | 5 |
4 files changed, 4 insertions, 5 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 444129052..445a96920 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -187,7 +187,7 @@ module LinkToHelper # Basic date format def simple_date(date) - return date.strftime("%e %B %Y").strip + return I18n.l(date, :format => "%e %B %Y") end def simple_time(date) diff --git a/app/views/general/_frontpage_search_examples.es.rhtml b/app/views/general/_frontpage_search_examples.es.rhtml new file mode 100644 index 000000000..63c7c3c1e --- /dev/null +++ b/app/views/general/_frontpage_search_examples.es.rhtml @@ -0,0 +1 @@ +por ejemplo <a href="/es/search/El%20Geraldine%20Quango">El Geraldine Quango</a>, <a href="/search/fancy%20dog">Fancy Dog</a>. diff --git a/app/views/general/_frontpage_search_examples.rhtml b/app/views/general/_frontpage_search_examples.rhtml new file mode 100644 index 000000000..359a132e2 --- /dev/null +++ b/app/views/general/_frontpage_search_examples.rhtml @@ -0,0 +1 @@ +for example <a href="/search/Geraldine%20Quango">Geraldine Quango</a> or <a href="/search/fancy%20dog">Fancy Dog</a>. diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index 959ccd8c6..ee88d23a1 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -21,10 +21,7 @@ <%= hidden_field_tag 'bodies', 1 %> <%= image_submit_tag 'button-search.png', :title => 'Search' %> <br> - <%= _('e.g.') %> - <% @search_examples.each_with_index do |name, i| %> - <%=link_to name, search_url(name, 'bodies')%><% if i < 2 %>, <% else %>. <% break %><% end %> - <% end %> + <%= render :partial => 'frontpage_search_examples' %> <% end %> </div> </div> |