Commit c44e24b6c8289693bd18a38848e8a4bcd8a8af1d
Exists in
master
and in
29 other branches
Merge commit 'refs/merge-requests/296' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/296
Showing
2 changed files
with
5 additions
and
2 deletions
Show diff stats
plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 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],[_('Check'), :check]]))) %> |
| 11 | - <%= labelled_form_field(_('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 %> |
| 14 | <fieldset><legend><%=_('Delivery Address')%></legend> | 14 | <fieldset><legend><%=_('Delivery Address')%></legend> |
po/pt/noosfero.po
| @@ -11086,6 +11086,10 @@ msgstr "Tempo de tolerância para edição de comentários" | @@ -11086,6 +11086,10 @@ msgstr "Tempo de tolerância para edição de comentários" | ||
| 11086 | msgid "Empty means unlimited and zero means right away." | 11086 | msgid "Empty means unlimited and zero means right away." |
| 11087 | msgstr "Vazio significa ilimitado e zero significa imediatamente." | 11087 | msgstr "Vazio significa ilimitado e zero significa imediatamente." |
| 11088 | 11088 | ||
| 11089 | +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11 | ||
| 11090 | +msgid "shopping_cart|Change" | ||
| 11091 | +msgstr "Troco" | ||
| 11092 | + | ||
| 11089 | #: plugins/shopping_cart/views/cart.html.erb:2 | 11093 | #: plugins/shopping_cart/views/cart.html.erb:2 |
| 11090 | msgid "Are you sure you want to remove this item?" | 11094 | msgid "Are you sure you want to remove this item?" |
| 11091 | msgstr "Tem certeza de que quer excluir este ítem?" | 11095 | msgstr "Tem certeza de que quer excluir este ítem?" |
| @@ -11163,7 +11167,6 @@ msgstr "Pagamento" | @@ -11163,7 +11167,6 @@ msgstr "Pagamento" | ||
| 11163 | #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 | 11167 | #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 |
| 11164 | #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22 | 11168 | #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22 |
| 11165 | #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20 | 11169 | #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20 |
| 11166 | -#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11 | ||
| 11167 | #, fuzzy | 11170 | #, fuzzy |
| 11168 | msgid "Change" | 11171 | msgid "Change" |
| 11169 | msgstr "Mudar imagem" | 11172 | msgstr "Mudar imagem" |