Updated to rails 3.0.12. remove old gettext code.

app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class ApplicationController < ActionController::Base
 
   protect_from_forgery

app/controllers/home_controller.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class HomeController < ApplicationController
 
   def index

app/helpers/application_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+#
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
 

app/helpers/orders_helper.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module OrdersHelper
 
   def update_articles_link(order, text, view)

app/models/user.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'digest/sha1'
 # specific user rights through memberships (see Group)
 class User < ActiveRecord::Base

app/models/workgroup.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Workgroup < Group
   
   has_many :tasks

app/views/foodcoop/users/_users.html.haml

@@ -20,7 +20,7 @@
     - users = params[:sort_by_ordergroups] ? @users.sort { |a,b| a.ordergroup.name <=> b.ordergroup.name } : @users
     - for user in users
       %tr{:class => cycle('even','odd', :name => 'users')}
-        %td= link_to user.nick, new_message_path(:message => {:mail_to => user.id}), :title => _('Send user an email')
+        %td= link_to user.nick, new_message_path(:message => {:mail_to => user.id}), :title => 'Send user an email'
         %td=h user.name if @current_user.role_admin? || user.settings["profile.nameIsPublic"] == '1'
         %td=h user.email if @current_user.role_admin? ||  user.settings["profile.emailIsPublic"] == '1'
         %td=h user.phone if @current_user.role_admin? ||  user.settings["profile.phoneIsPublic"] == '1'

app/views/home/index.html.haml

@@ -17,7 +17,7 @@
                 %td= format_date task.due_date
                 %td
                   %b= task.name
-          
+
       - unless @unaccepted_tasks.empty?
         %h3 Aufgaben übernehmen
         Du bis für Aufgaben verantwortlich.
@@ -74,4 +74,4 @@
               - color = ft.amount < 0 ? 'red' : 'black'
               %td{:style => "color:#{color}; width:5em", :class => "currency"}= number_to_currency(ft.amount)
         %br/
-        = link_to _("mehr ..."), my_ordergroup_path
+        = link_to "mehr ...", my_ordergroup_path

app/views/home/profile.html.haml

@@ -19,4 +19,5 @@
       %p
         = membership.group.name
         - if membership.group.type != 'Ordergroup'
-          (#{link_to _("Mitgliedschaft beenden"), { :action => 'cancel_membership', :membership_id => membership }, :confirm => _("Bist Du sicher, dass Du Deine Mitgliedschaft beenden willst?"), :method => :post})
+          (#{link_to "Mitgliedschaft beenden", { :action => 'cancel_membership', :membership_id => membership },
+            :confirm => "Bist Du sicher, dass Du Deine Mitgliedschaft beenden willst?", :method => :post})

app/views/orders/show.html.haml

@@ -66,7 +66,7 @@
         |
         Faxvorlage:
         = link_to_pdf(@order, 'faxPdf')
-        = link_to image_tag("text_file.png", :size => "16x16", :border => "0", :alt => "Textdatei erstellen"), { :action => 'text_fax_template', :id => @order }, { :title => _("Download file") }
+        = link_to image_tag("text_file.png", :size => "16x16", :border => "0", :alt => "Textdatei erstellen"), { :action => 'text_fax_template', :id => @order }, { :title => "Download file" }
         |
         = link_to 'Kommentare', '#comments'
       

app/views/shared/_loginInfo.haml

@@ -3,7 +3,7 @@
     = image_tag 'b_user.png' , :size => '7x10',  :border => 0, :alt => "Profil"
     = link_to h(@current_user.nick), my_profile_path, { :title => "Profil bearbeiten" }
   - if Foodsoft.config[:homepage]
-    %li= link_to Foodsoft.config[:name], Foodsoft.config[:homepage], { :title => _("Go to your FoodCoop-Hompage") }
+    %li= link_to Foodsoft.config[:name], Foodsoft.config[:homepage], { :title => "Go to your FoodCoop-Hompage" }
   %li= link_to "Hilfe", 'http://dev.foodcoops.net/wiki/FoodsoftDoku'
   %li= link_to "Feedback", new_feedback_path, :title => "Fehler gefunden? Vorschlag? Idee? Kritik?"
   %li= link_to "Abmelden", logout_path