Merge pull request #384 from kubabrecka/fix_html_escapes

fix wrongly escaped HTML in <noscript> tags
This commit is contained in:
Robin Ward 2013-03-07 09:24:16 -08:00
commit c7359145aa
5 changed files with 8 additions and 8 deletions

View File

@ -8,7 +8,7 @@
<p><a href="<%= @list.more_topics_url.sub('.json?','?') %>"><%= t 'next_page'%></a></p>
<% end %>
<p><%= t 'powered_by' %></p>
<p><%= t 'powered_by_html' %></p>
<% if @category %>
<% content_for :head do %>

View File

@ -20,7 +20,7 @@
<% end %>
<p><%= t 'powered_by' %></p>
<p><%= t 'powered_by_html' %></p>
<% content_for :head do %>
<%= auto_discovery_link_tag(@topic_view, {action: :feed, format: :rss}, title: t('rss_posts_in_topic', topic: @topic_view.title), type: 'application/rss+xml') %>

View File

@ -2,7 +2,7 @@ cs:
title: "Discourse"
topics: "Témata"
loading: "Nahrávám"
powered_by: 'Systém běží na <a href="http://www.discourse.org">Discourse</a>, nejlepší zážitek je se zapnutým JavaScriptem'
powered_by_html: 'Systém běží na <a href="http://www.discourse.org">Discourse</a>, nejlepší zážitek je se zapnutým JavaScriptem'
via: "%{username} přes %{site_name}"
is_reserved: "je rezervováno"
@ -13,7 +13,7 @@ cs:
has_already_been_used: "již bylo použito"
invalid_characters: "obsahuje neplatné znaky"
is_invalid: "je neplatné; zkuste se vyjádřit více popisně"
next_page: "další strana &rarr;"
next_page: "další strana "
by: "Od"
topics_in_category: "Témata v kategorii '%{category}'"
rss_posts_in_topic: "RSS feed tématu '%{topic}'"

View File

@ -2,7 +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'
powered_by_html: 'Powered by <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled'
via: "%{username} via %{site_name}"
is_reserved: "is reserved"
@ -13,7 +13,7 @@ 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;"
next_page: "next page "
by: "By"
topics_in_category: "Topics in the '%{category}' category"
rss_posts_in_topic: "RSS feed of '%{topic}'"

View File

@ -9,7 +9,7 @@ fr:
title: "Discourse"
topics: "Discussions"
loading: "Chargement"
powered_by: 'Propulsé par <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled'
powered_by_html: 'Propulsé par <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled'
via: "%{username} via %{site_name}"
is_reserved: "est réservé"
@ -20,7 +20,7 @@ fr:
has_already_been_used: "a déjà été utilisé"
invalid_characters: "contient des caractères invalides"
is_invalid: "est invalide; essayez d'être plus précis"
next_page: "page suivante &rarr;"
next_page: "page suivante "
by: "Par"
topics_in_category: "Discussions dans la catégorie '%{category}'"
rss_posts_in_topic: "Flux RSS de '%{topic}'"