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 #314 from kubabrecka/extract_strings2 

extracting some more hardcoded strings
This commit is contained in:
Robin Ward 2013-03-01 08:36:46 -08:00
parent b66b17bf19 9993e0e665
commit 25494529d2
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/list/list.erb
View File

@ -5,7 +5,7 @@
</div>
<% if @list.topics.length > 0 %>
<p><a href="<%= @list.more_topics_url.sub('.json?','?') %>">next page &rarr;</a></p>
<p><a href="<%= @list.more_topics_url.sub('.json?','?') %>"><%= t 'next_page'%></a></p>
<% end %>
<p>Powered by <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled</p>
<p><%= t 'powered_by' %></p>

8
app/views/topics/show.html.erb
View File

@ -5,7 +5,7 @@
<% @topic_view.posts.each do |post| %>
<div class='creator'>
#<%=post.post_number%> By: <b><%= post.user.name %></b>, <%= post.created_at.to_formatted_s(:long_ordinal) %>
#<%=post.post_number%> <%= t 'by'%>: <b><%= post.user.name %></b>, <%= post.created_at.to_formatted_s(:long_ordinal) %>
</div>
<div class='post'>
<%= post.cooked.html_safe %>
@ -15,13 +15,13 @@
<% if @topic_view.next_page %>
<p>
<b><%= link_to("next page &rarr;".html_safe, @topic_view.next_page_path ) %></b>
<b><%= link_to(t('next_page').html_safe, @topic_view.next_page_path ) %></b>
</p>
<% end %>
<p>Powered by <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled</p>
<p><%= t 'powered_by' %></p>
<% content_for :head do %>
<%= auto_discovery_link_tag(@topic_view, {action: :feed, format: :rss}, title: "RSS feed of '#{@topic_view.title}'", type: 'application/rss+xml') %>
<%= auto_discovery_link_tag(@topic_view, {action: :feed, format: :rss}, title: t('rss_feed', topic: @topic_view.title), type: 'application/rss+xml') %>
<% end %>

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

@ -2,6 +2,7 @@ en:
title: "Discourse"
topics: "Topics"
loading: "Loading"
powered_by: 'Powered by <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled'
via: "%{username} via %{site_name}"
is_reserved: "is reserved"
@ -12,6 +13,9 @@ en:
has_already_been_used: "has already been used"
invalid_characters: "contains invalid characters"
is_invalid: "is invalid; try to be a little more descriptive"
next_page: "next page &rarr;"
by: "By"
rss_feed: "RSS feed of %{topic}"
education:
until_posts: