changeset 1310:c0eedaadb1f2 redmine-2.2-integration

Fix some HTML labels

--- 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 @@
     <p>
     <% 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 %>
       &nbsp;
@@ -35,7 +35,7 @@
   <% if repository.is_external? %>
     <div style="clear: left">
     </div>
-    <p class="topline" style="padding-top: 1em"><%= l(:text_repository_external, :location => repository.external_url) %></p>
+    <p class="topline" style="padding-top: 1em"><%= (l(:text_repository_external, :location => repository.external_url)).html_safe %></p>
   <% end %>
 </div>
 <div style="clear: left"></div>

--- 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 <span id="checkout_access">{{type}}</span> access to this URL.'
-  label_access_type_all: 'All access to this URL is <span id="checkout_access">{{type}}</span>.'
+  label_access_type: 'You have <span id="checkout_access">%{type}</span> access to this URL.'
+  label_access_type_all: 'All access to this URL is <span id="checkout_access">%{type}</span>.'
   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 <code>{{location}}</code> .<br>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 <code>%{location}</code> .<br>This repository is a read-only copy which is updated automatically every hour."