Skip to content

Commit

Permalink
18n rejigger footer
Browse files Browse the repository at this point in the history
  • Loading branch information
jrochkind committed Jun 26, 2014
1 parent 67a693c commit f922a7f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
6 changes: 2 additions & 4 deletions app/helpers/umlaut/footer_helper.rb
Expand Up @@ -11,7 +11,7 @@ def render_service_credits
if @collection
content = "".html_safe

content << t(:powered_by).html_safe + " " + link_to("Umlaut", "https://github.com/team-umlaut/umlaut") + ". ".html_safe
content << t('umlaut.misc.powered_by_umlaut').html_safe + " " + link_to("Umlaut", "https://github.com/team-umlaut/umlaut") + ". ".html_safe

credit_segments = []

Expand All @@ -31,9 +31,7 @@ def render_service_credits


if credit_segments.length > 0
content << t(:using_services_from).html_safe + ' '
content << credit_segments.join(', ').html_safe
content << ' ' + t(:and_others).html_safe + '.'
content << t("umlaut.misc.credits_html", :credits => safe_join(credit_segments, ", "))
end

return content
Expand Down
11 changes: 5 additions & 6 deletions config/locales/en.yml
Expand Up @@ -85,6 +85,11 @@ en:
service_errors_title: 'Some content may not be included due to errors:'
services_missing: 'Some'
technical_error_info: Technical Error Information
misc:
powered_by_umlaut: Powered by
credits_html: "Using services from %{credits} and others"


# Names and optionally sub-head prompts for umlaut display sections,
# keyed by section id. If not given in i18n here, the name will be
# automatically taken from the display_name of the first ServiceTypeValue
Expand Down Expand Up @@ -203,10 +208,4 @@ en:
short_link: Short link
no_item_found_warning: 'Warning: %{app_name} does not know about a %{format_searched} with this name. Please check your entry'
sent: sent


powered_by: Powered by
using_services_from: Using services from
and_others: and others


0 comments on commit f922a7f

Please sign in to comment.