# HG changeset patch # User Chris Cannam # Date 1371562308 -3600 # Node ID c0eedaadb1f2769317c6d491e5a9d30e44258e7b # Parent 5ed688bfd4413338135cce7eb21eb0692c909c56 Fix some HTML labels diff -r 5ed688bfd441 -r c0eedaadb1f2 plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.html.erb --- a/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.html.erb Tue Jun 18 14:10:51 2013 +0100 +++ b/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.html.erb Tue Jun 18 14:31:48 2013 +0100 @@ -16,9 +16,9 @@

<% if User.current.logged? %> <% if repository.is_external? %> - <%=l :label_access_type_all, :type => l(:label_access_read_only) %> + <%= (l :label_access_type_all, :type => l(:label_access_read_only)).html_safe %> <% else %> - <% if default_protocol %><%=l :label_access_type, :type => l(default_protocol.access_label(User.current)) %><% end %> + <% if default_protocol %><%= (l :label_access_type, :type => l(default_protocol.access_label(User.current))).html_safe %><% end %> <% end %> <% else %>   @@ -35,7 +35,7 @@ <% if repository.is_external? %>

-

<%= l(:text_repository_external, :location => repository.external_url) %>

+

<%= (l(:text_repository_external, :location => repository.external_url)).html_safe %>

<% end %>
diff -r 5ed688bfd441 -r c0eedaadb1f2 plugins/redmine_checkout/config/locales/en.yml --- a/plugins/redmine_checkout/config/locales/en.yml Tue Jun 18 14:10:51 2013 +0100 +++ b/plugins/redmine_checkout/config/locales/en.yml Tue Jun 18 14:31:48 2013 +0100 @@ -16,8 +16,8 @@ label_protocol_plural: "Protocols" button_add_protocol: "Add Protocol" - label_access_type: 'You have {{type}} access to this URL.' - label_access_type_all: 'All access to this URL is {{type}}.' + label_access_type: 'You have %{type} access to this URL.' + label_access_type_all: 'All access to this URL is %{type}.' label_access_read_only: 'Read Only' label_access_read_write: "Read and Write" label_access_permission: "Depending on user's permissions" @@ -36,8 +36,8 @@ supports back-references to braced expressions using the \1 notation. help_repository_checkout_protocols: | Leave the Checkout URL field empty to use the defined repository URL. - help_moved_settings: "The settings page has been moved to {{link}}." + help_moved_settings: "The settings page has been moved to %{link}." label_settings_location: "Administration -> Settings -> Checkout" - text_repository_external: "The primary repository for this project is hosted at {{location}} .
This repository is a read-only copy which is updated automatically every hour." + text_repository_external: "The primary repository for this project is hosted at %{location} .
This repository is a read-only copy which is updated automatically every hour."