Download as
Browse Code »

Commit ee7ff773023a8054c195aea5d87b25042729e1b3

Authored by Rodrigo Souto
1 parent 7c772534
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fixing terms

Showing 5 changed files with 8 additions and 8 deletions   Show diff stats
app/models/approve_comment.rb
  Diff comments   View file @ee7ff77
@@ -42,9 +42,9 @@ class ApproveComment < Task @@ -42,9 +42,9 @@ class ApproveComment < Task
42 def information 42 def information
43 if article 43 if article
44 if requestor 44 if requestor
45 - {:message => _('%{requestor} commented on the the article: %{linked_subject}.')} 45 + {:message => _('%{requestor} commented on the article: %{linked_subject}.')}
46 else 46 else
47 - { :message => _('%{requestor} commented on the the article: %{linked_subject}.'), 47 + { :message => _('%{requestor} commented on the article: %{linked_subject}.'),
48 :variables => {:requestor => requestor_name} } 48 :variables => {:requestor => requestor_name} }
49 end 49 end
50 else 50 else
plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
  Diff comments   View file @ee7ff77
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <%= labelled_form_field('* ' + _("Email"), f.text_field(:email, :class => 'required email') ) %> 7 <%= labelled_form_field('* ' + _("Email"), f.text_field(:email, :class => 'required email') ) %>
8 <%= labelled_form_field('* ' + _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %> 8 <%= labelled_form_field('* ' + _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
9 <%= 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) %> 9 <%= 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) %>
10 - <%= labelled_form_field(_('Payment'), select_tag('customer[payment]', options_for_select([[_("Money"), :money],[_('Check'), :check]]))) %> 10 + <%= labelled_form_field(_('Payment'), select_tag('customer[payment]', options_for_select([[_("Money"), :money],[_('shopping_cart|Check'), :check]]))) %>
11 <%= labelled_form_field(s_('shopping_cart|Change'), text_field_tag('customer[change]')) %> 11 <%= labelled_form_field(s_('shopping_cart|Change'), text_field_tag('customer[change]')) %>
12 </div> 12 </div>
13 <% if @settings.delivery %> 13 <% if @settings.delivery %>
plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb
  Diff comments   View file @ee7ff77
@@ -17,9 +17,9 @@ @@ -17,9 +17,9 @@
17 <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li> 17 <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li>
18 <li><b><%= _('Email') %>: </b><%= @customer[:email] %></li> 18 <li><b><%= _('Email') %>: </b><%= @customer[:email] %></li>
19 <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li> 19 <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
20 - <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('Check') %></li> 20 + <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('shopping_cart|Check') %></li>
21 <% if @customer[:payment] == 'money' %> 21 <% if @customer[:payment] == 'money' %>
22 - <li><b><%= _('Change') %>: </b><%= @customer[:change] %></li> 22 + <li><b><%= _('shopping_cart|Change') %>: </b><%= @customer[:change] %></li>
23 <% end %> 23 <% end %>
24 <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %> 24 <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
25 <li><b><%= _('Address') %>:</b> 25 <li><b><%= _('Address') %>:</b>
plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
  Diff comments   View file @ee7ff77
@@ -15,9 +15,9 @@ @@ -15,9 +15,9 @@
15 <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li> 15 <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li>
16 <li><b><%= _('Email') %>: </b><%= @customer[:email] %></li> 16 <li><b><%= _('Email') %>: </b><%= @customer[:email] %></li>
17 <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li> 17 <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
18 - <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('Check') %></li> 18 + <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('shopping_cart|Check') %></li>
19 <% if @customer[:payment] == 'money' %> 19 <% if @customer[:payment] == 'money' %>
20 - <li><b><%= _('Change') %>: </b><%= @customer[:change] %></li> 20 + <li><b><%= _('shopping_cart|Change') %>: </b><%= @customer[:change] %></li>
21 <% end %> 21 <% end %>
22 <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %> 22 <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
23 <li><b><%= _('Address') %>:</b> 23 <li><b><%= _('Address') %>:</b>
plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb
  Diff comments   View file @ee7ff77
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <td class="order-info" colspan="5"> 32 <td class="order-info" colspan="5">
33 <div style="display:none"> 33 <div style="display:none">
34 <ul class="customer-details"> 34 <ul class="customer-details">
35 - <% [['name', _('Name')], ['email', _('E-mail')], ['contact_phone', _('Contact phone')], ['address', _('Address')], ['district', _('District')], ['city', _('City')], ['zip_code', _('Zip code')], ['delivery_option', _('Delivery option')], ['payment', _('Payment')], ['change', _('Change')]].each do |field| %> 35 + <% [['name', _('Name')], ['email', _('E-mail')], ['contact_phone', _('Contact phone')], ['address', _('Address')], ['district', _('District')], ['city', _('City')], ['zip_code', _('Zip code')], ['delivery_option', _('Delivery option')], ['payment', _('Payment')], ['change', _('shopping_cart|Change')]].each do |field| %>
36 <% attribute = field.first %> 36 <% attribute = field.first %>
37 <% name = field.last %> 37 <% name = field.last %>
38 <%= content_tag('li', content_tag('strong', name+': ') + order.send('customer_'+attribute)) if !order.send('customer_'+attribute).blank? %> 38 <%= content_tag('li', content_tag('strong', name+': ') + order.send('customer_'+attribute)) if !order.send('customer_'+attribute).blank? %>