Download as
Browse Code »

Commit a6c28c6118171cf907287379e56f29fb5ad6f065

Authored by Rodrigo Souto
2 parents 131144ba 251e6406
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

Merge branch 'ai3041' into 'stable' 

Rename shopping basket configuration fields

http://noosfero.org/Development/ActionItem3041
Showing 2 changed files with 12 additions and 12 deletions   Show diff stats
plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
  Diff comments   View file @a6c28c6
1 <h1> <%= _('Basket options') %> </h1> 1 <h1> <%= _('Basket options') %> </h1>
2 2
3 <% form_for(:settings, @settings, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %> 3 <% form_for(:settings, @settings, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
4 - <%= labelled_form_field(_('Enabled?'), f.check_box(:enabled)) %>  
5 - <%= labelled_form_field(_('Delivery?'), f.check_box(:delivery)) %> 4 + <%= labelled_form_field(_('Enable shopping basket'), f.check_box(:enabled)) %>
  5 + <%= labelled_form_field(_('Enable delivery fields on orders'), f.check_box(:delivery)) %>
6 <% display_delivery_settings = @settings.delivery ? 'auto' : 'none' %> 6 <% display_delivery_settings = @settings.delivery ? 'auto' : 'none' %>
7 <fieldset id='delivery_settings' style="display: <%= display_delivery_settings %>"><legend><%=_('Delivery')%></legend> 7 <fieldset id='delivery_settings' style="display: <%= display_delivery_settings %>"><legend><%=_('Delivery')%></legend>
8 <table> 8 <table>
@@ -33,8 +33,8 @@ @@ -33,8 +33,8 @@
33 </tr> 33 </tr>
34 </table> 34 </table>
35 35
36 - <%= labelled_form_field(_('Free delivery price:'), f.text_field(:free_delivery_price)) %>  
37 - <%= content_tag('small', _('Empty stands for no free delivery price.')) %> 36 + <%= labelled_form_field(_("Order's minimum price for free delivery:"), f.text_field(:free_delivery_price)) %>
  37 + <%= content_tag('small', _('Leave empty to always charge the delivery.')) %>
38 </fieldset> 38 </fieldset>
39 <br style='clear: both'/> 39 <br style='clear: both'/>
40 <br style='clear: both'/> 40 <br style='clear: both'/>
po/pt/noosfero.po
  Diff comments   View file @a6c28c6
@@ -7218,8 +7218,8 @@ msgstr &quot;Funcionalidade&quot; @@ -7218,8 +7218,8 @@ msgstr &quot;Funcionalidade&quot;
7218 7218
7219 #: app/views/features/index.rhtml:16 7219 #: app/views/features/index.rhtml:16
7220 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:4 7220 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:4
7221 -msgid "Enabled?"  
7222 -msgstr "Habilitada?" 7221 +msgid "Enable shopping basket"
  7222 +msgstr "Habilitar cesto de compras"
7223 7223
7224 #: app/views/features/index.rhtml:27 7224 #: app/views/features/index.rhtml:27
7225 msgid "Configure features" 7225 msgid "Configure features"
@@ -12292,8 +12292,8 @@ msgid &quot;Basket options&quot; @@ -12292,8 +12292,8 @@ msgid &quot;Basket options&quot;
12292 msgstr "Opções do cesto" 12292 msgstr "Opções do cesto"
12293 12293
12294 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:5 12294 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:5
12295 -msgid "Delivery?"  
12296 -msgstr "Entrega?" 12295 +msgid "Enable delivery fields on orders"
  12296 +msgstr "Ativar campos de entrega para pedidos"
12297 12297
12298 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 12298 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10
12299 msgid "Option" 12299 msgid "Option"
@@ -12310,12 +12310,12 @@ msgid &quot;ADD NEW OPTION&quot; @@ -12310,12 +12310,12 @@ msgid &quot;ADD NEW OPTION&quot;
12310 msgstr "ADCIONAR NOVA OPÇÂO" 12310 msgstr "ADCIONAR NOVA OPÇÂO"
12311 12311
12312 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36 12312 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36
12313 -msgid "Free delivery price:"  
12314 -msgstr "Preço de entrega grátis:" 12313 +msgid "Order's minimum price for free delivery:"
  12314 +msgstr "Preço mínimo do pedido para entrega grátis:"
12315 12315
12316 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37 12316 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37
12317 -msgid "Empty stands for no free delivery price."  
12318 -msgstr "Vazio significa sem preço de frete grátis." 12317 +msgid "Leave empty to always charge the delivery."
  12318 +msgstr "Deixe vazio para sempre cobrar a entrega."
12319 12319
12320 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb:1 12320 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb:1
12321 msgid "Purchase Reports" 12321 msgid "Purchase Reports"