Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Add missing method for gettext-string-converter.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-01-06 15:55:29 +01:00
parent 9f8d0d28ac
commit da309f03b0
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/views/ordering/order.rhtml
View file

@ -125,7 +125,7 @@
<%= button_to_function('-', "decreaseTolerance(#{i})") %> <%= button_to_function('-', "decreaseTolerance(#{i})") %>
<% end -%> <% end -%>
</td> </td>
<td id="td_price_<%= i %>" style="text-align:right; padding-right:10px; width:4em"><span id="price_<%= i %>_display"><%= number_to_currency(article_total, :unit => "") %></span> <%= l18n.number.currency.format.unit %></td> <td id="td_price_<%= i %>" style="text-align:right; padding-right:10px; width:4em"><span id="price_<%= i %>_display"><%= number_to_currency(article_total, :unit => "") %></span> <%= L18n.number.currency.format.unit %></td>
</tr> </tr>
<% unless order_article.article.note.empty? -%> <% unless order_article.article.note.empty? -%>
<tr id="note_<%= i %>" class="note" style="display:none"> <tr id="note_<%= i %>" class="note" style="display:none">
@ -139,7 +139,7 @@
<tfoot> <tfoot>
<tr> <tr>
<td colspan="6"></td> <td colspan="6"></td>
<td colspan="3" class="currency"><%=_ "Total amount" %>: <span id="total_price"><%= total %></span> <%= l18n.number.currency.format.unit %></td> <td colspan="3" class="currency"><%=_ "Total amount" %>: <span id="total_price"><%= total %></span> <%= L18n.number.currency.format.unit %></td>
</tr> </tr>
<tr> <tr>
<td colspan="6"></td> <td colspan="6"></td>
@ -147,7 +147,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="6"></td> <td colspan="6"></td>
<td colspan="3" class="currency"><%=_ "New account balance"%>: <strong><span id="new_balance"><%= @order_group.account_balance - total %></span> <%= l18n.number.currency.format.unit %></strong></td> <td colspan="3" class="currency"><%=_ "New account balance"%>: <strong><span id="new_balance"><%= @order_group.account_balance - total %></span> <%= L18n.number.currency.format.unit %></strong></td>
</tr> </tr>
<tr> <tr>
<td style="text-align:left;"><%= link_to_top %></td> <td style="text-align:left;"><%= link_to_top %></td>
@ -171,7 +171,7 @@
setGroupBalance(<%= @availableFunds %>); setGroupBalance(<%= @availableFunds %>);
// localization // localization
setDecimalSeparator("<%= l18n.number.currency.format.separator %>"); setDecimalSeparator("<%= L18n.number.currency.format.separator %>");
// initialize javascript // initialize javascript
updateBalance(); updateBalance();

2
config/app_config.yml.SAMPLE
View file

@ -26,6 +26,7 @@ development: &defaults
- benni@dresdener27.de - benni@dresdener27.de
sender_address: FoodSoft Error <foodsoft@foodcoops.net> sender_address: FoodSoft Error <foodsoft@foodcoops.net>
email_prefix: "[FoodSoft]" email_prefix: "[FoodSoft]"
# Access to sharedLists, the external article-database # Access to sharedLists, the external article-database
shared_lists: shared_lists:
adapter: mysql adapter: mysql
@ -35,6 +36,7 @@ development: &defaults
password: password:
encoding: utf8 encoding: utf8
socket: /opt/lampp/var/mysql/mysql.sock socket: /opt/lampp/var/mysql/mysql.sock
# auto-units-conversion # auto-units-conversion
# this is used for automatic article-synchronization to handle different units # this is used for automatic article-synchronization to handle different units
# e.g. when foodcoop-unit should be 500g and supplier-unit is 1kg # e.g. when foodcoop-unit should be 500g and supplier-unit is 1kg

10
config/initializers/gettext_helper.rb
View file

@ -1,5 +1,5 @@
# Remove this file, when every gettext-method <_("text to translate..")> # Remove this file, when every gettext-method <_("text to translate..")>
# is replaced by rails l18n method: l18n.name.name... # is replaced by rails L18n method: L18n.name.name...
module ActionView module ActionView
class Base class Base
@ -7,4 +7,12 @@ module ActionView
text text
end end
end end
end
module ActiveRecord
class Base
def _(text)
text
end
end
end end