diff --git a/app/models/approve_comment.rb b/app/models/approve_comment.rb index 13c9cc1..49d2802 100644 --- a/app/models/approve_comment.rb +++ b/app/models/approve_comment.rb @@ -42,9 +42,9 @@ class ApproveComment < Task def information if article if requestor - {:message => _('%{requestor} commented on the the article: %{linked_subject}.')} + {:message => _('%{requestor} commented on the article: %{linked_subject}.')} else - { :message => _('%{requestor} commented on the the article: %{linked_subject}.'), + { :message => _('%{requestor} commented on the article: %{linked_subject}.'), :variables => {:requestor => requestor_name} } end else diff --git a/plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb index 5f030d9..e4ebb27 100644 --- a/plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb +++ b/plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb @@ -7,7 +7,7 @@ <%= labelled_form_field('* ' + _("Email"), f.text_field(:email, :class => 'required email') ) %> <%= labelled_form_field('* ' + _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %> <%= labelled_form_field(_('Delivery option'), select_tag(:delivery_option, options_for_select(select_delivery_options(@settings.delivery_options, environment)), 'data-profile-identifier' => @enterprise.identifier)) unless !@settings.delivery || (@settings.free_delivery_price && get_total(@cart[:items]) >= @settings.free_delivery_price) %> - <%= labelled_form_field(_('Payment'), select_tag('customer[payment]', options_for_select([[_("Money"), :money],[_('Check'), :check]]))) %> + <%= labelled_form_field(_('Payment'), select_tag('customer[payment]', options_for_select([[_("Money"), :money],[_('shopping_cart|Check'), :check]]))) %> <%= labelled_form_field(s_('shopping_cart|Change'), text_field_tag('customer[change]')) %> <% if @settings.delivery %> diff --git a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb index 64ee611..9da1d25 100644 --- a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb +++ b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb @@ -17,9 +17,9 @@
  • <%= _('Full name') %>: <%= @customer[:name] %>
  • <%= _('Email') %>: <%= @customer[:email] %>
  • <%= _('Phone number') %>: <%= @customer[:contact_phone] %>
  • -
  • <%= _('Payment') %>: <%= @customer[:payment] == 'money' ? _('Money') : _('Check') %>
  • +
  • <%= _('Payment') %>: <%= @customer[:payment] == 'money' ? _('Money') : _('shopping_cart|Check') %>
  • <% if @customer[:payment] == 'money' %> -
  • <%= _('Change') %>: <%= @customer[:change] %>
  • +
  • <%= _('shopping_cart|Change') %>: <%= @customer[:change] %>
  • <% end %> <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
  • <%= _('Address') %>: diff --git a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb index 50029cd..e400a35 100644 --- a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb +++ b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb @@ -15,9 +15,9 @@
  • <%= _('Full name') %>: <%= @customer[:name] %>
  • <%= _('Email') %>: <%= @customer[:email] %>
  • <%= _('Phone number') %>: <%= @customer[:contact_phone] %>
  • -
  • <%= _('Payment') %>: <%= @customer[:payment] == 'money' ? _('Money') : _('Check') %>
  • +
  • <%= _('Payment') %>: <%= @customer[:payment] == 'money' ? _('Money') : _('shopping_cart|Check') %>
  • <% if @customer[:payment] == 'money' %> -
  • <%= _('Change') %>: <%= @customer[:change] %>
  • +
  • <%= _('shopping_cart|Change') %>: <%= @customer[:change] %>
  • <% end %> <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
  • <%= _('Address') %>: diff --git a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb index 8b42627..4ce5c3b 100644 --- a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb +++ b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb @@ -32,7 +32,7 @@