Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
This commit is contained in:
parent
5b9a7e05df
commit
9f8d0d28ac
121 changed files with 1197 additions and 15237 deletions
|
|
@ -2,7 +2,7 @@
|
|||
%li
|
||||
= image_tag 'b_user.png' , :size => '7x10', :border => 0, :alt => _("User")
|
||||
= link_to h(@current_user.nick), { :controller => 'index', :action => 'myProfile' }, { :title => _("User Settings") }
|
||||
- if FoodSoft::getFoodcoopUrl
|
||||
%li= link_to FoodSoft::getFoodcoopName, FoodSoft::getFoodcoopUrl, { :title => _("Go to your FoodCoop-Hompage") }
|
||||
- if APP_CONFIG[:base_url]
|
||||
%li= link_to APP_CONFIG[:name], APP_CONFIG[:base_url], { :title => _("Go to your FoodCoop-Hompage") }
|
||||
%li= link_to _("Help"), 'http://dev.foodcoops.net/wiki/FoodsoftDoku'
|
||||
%li= link_to _("Logout"), :controller => '/login', :action => 'logout'
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
--
|
||||
FoodSoft: <%= @foodsoftUrl %>
|
||||
Foodcoop-Homepage: <%= FoodSoft::getFoodcoopUrl %>
|
||||
Hilfe/Help: <%= FoodSoft::getHelp %>
|
||||
Foodcoop-Homepage: <%= APP_CONFIG[:base_url] %>
|
||||
Hilfe/Help: <%= APP_CONFIG[:help_url] %>
|
||||
Loading…
Add table
Add a link
Reference in a new issue