From 9993e0e6658e1254a3c85a434bef283cc45d253c Mon Sep 17 00:00:00 2001 From: Kuba Brecka Date: Fri, 1 Mar 2013 17:04:13 +0100 Subject: [PATCH] extracting some more hardcoded strings --- app/views/list/list.erb | 4 ++-- app/views/topics/show.html.erb | 8 ++++---- config/locales/server.en.yml | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/views/list/list.erb b/app/views/list/list.erb index 468841f1594..f056217525c 100644 --- a/app/views/list/list.erb +++ b/app/views/list/list.erb @@ -5,7 +5,7 @@ <% if @list.topics.length > 0 %> -

next page →

+

<%= t 'next_page'%>

<% end %> -

Powered by Discourse, best viewed with JavaScript enabled

\ No newline at end of file +

<%= t 'powered_by' %>

\ No newline at end of file diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 6841bb4c2b8..124d818d183 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -5,7 +5,7 @@ <% @topic_view.posts.each do |post| %>
- #<%=post.post_number%> By: <%= post.user.name %>, <%= post.created_at.to_formatted_s(:long_ordinal) %> + #<%=post.post_number%> <%= t 'by'%>: <%= post.user.name %>, <%= post.created_at.to_formatted_s(:long_ordinal) %>
<%= post.cooked.html_safe %> @@ -15,13 +15,13 @@ <% if @topic_view.next_page %>

- <%= link_to("next page →".html_safe, @topic_view.next_page_path ) %> + <%= link_to(t('next_page').html_safe, @topic_view.next_page_path ) %>

<% end %> -

Powered by Discourse, best viewed with JavaScript enabled

+

<%= t 'powered_by' %>

<% 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 %> diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index ea24c5f611b..9c24333242f 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2,6 +2,7 @@ en: title: "Discourse" topics: "Topics" loading: "Loading" + powered_by: 'Powered by Discourse, 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 →" + by: "By" + rss_feed: "RSS feed of %{topic}" education: until_posts: