Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #231 from shapkin/master 

Add english locale to page.
This commit is contained in:
Robin Ward 2013-02-22 10:58:31 -08:00
parent 1c55683f49 ee8825408b
commit 1c5afc9686
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/exceptions/not_found.html.erb
View File

@ -1,31 +1,31 @@
<% local_domain = "#{request.protocol}#{request.host_with_port}" %>
<p>The page you requested doesn't exist on this discussion forum. Perhaps we can help find it, or another topic like it:</p>
<p><%= t 'page_not_found.title' %></p>
<table>
<tr>
<td style="vertical-align:top; padding:0 20px 20px 0;">
<h2>Popular topics</h2>
<h2><%= t 'page_not_found.popular_topics' %></h2>
<% @popular.each do |t| %>
<%= link_to t.title, t.relative_url %><br/>
<% end %>
<br/>
<a href="/popular" class="btn">See More&hellip;</a>
<a href="/popular" class="btn"><%= t 'page_not_found.see_more' %>&hellip;</a>
</td>
<td style="vertical-align:top; padding:0 0 20px 0;">
<h2>Recent topics</h2>
<h2><%= t 'page_not_found.recent_topics' %></h2>
<% @recent.each do |t| %>
<%= link_to t.title, t.relative_url %><br/>
<% end %>
<br/>
<a href="/popular" class="btn">See More&hellip;</a>
<a href="/popular" class="btn"><%= t 'page_not_found.see_more' %>&hellip;</a>
</td>
</tr>
</table>
<h2>Search for this topic</h2>
<h2><%= t 'page_not_found.search_title' %></h2>
<p>
<form action='http://google.com'>
<input type="text" name='q' value="site:<%= local_domain %> <%= @slug %>">
<!--<input type="button" class="btn" value="Search Here" onclick="alert('single page search results not implemented yet');" />-->
<input type="submit" class="btn btn-primary" value="Search Google" />
<input type="submit" class="btn btn-primary" value="<%= t 'page_not_found.search_google' %>" />
</form>
</p>

8
config/locales/server.en.yml
View File

@ -705,3 +705,11 @@ en:
discourse_hub:
access_token_problem: "Tell an admin: Please update the site settings to include the correct discourse_org_access_key."
page_not_found:
title: "The page you requested doesn't exist on this discussion forum. Perhaps we can help find it, or another topic like it:"
popular_topics: "Popular topics"
recent_topics: "Recent topics"
see_more: "See More"
search_title: "Search for this topic"
search_google: "Search Google"