Merge branch 'develop'

rrrene · Jul 10, 2012 · 2abd9a3 · 2abd9a3
2 parents 501750e + 25e9f43
commit 2abd9a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb
@@ -9,11 +9,7 @@
     <%= f.input :password %>
     <%= f.input :password_confirmation %>
   <% end %>
-  
-  <%= f.inputs :posting do %>
-    <%= f.input :posting_type, :collection => [[t("activerecord.models.freight"), "Freight"], [t("activerecord.models.loading_space"), "LoadingSpace"]], :include_blank => false %>
-  <% end %>
-  
+
   <%= f.inputs :posting do %>
     <%= f.input :company %>
   <% end %>

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -167,6 +167,7 @@ de:
         password_confirmation: "Passwort wiederholen"
         posting_type: "Art der Inserate"
         user_roles: Berechtigungen
+        company: Unternehmen
         notify_by_email: "Ich möchte per E-Mail über neue Inserate benachrichtigt werden."
       station:
         name: Name