Merge remote-tracking branch 'hausdorff/master'

config/application.rb

@@ -31,7 +31,8 @@ module Fetsite
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
+    config.i18n.default_locale = :de
+    config.i18n.fallbacks = [:en, :de]
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"

config/environments/development.rb~

@@ -0,0 +1,37 @@
+Fetsite::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+config.action_mailer.default_url_options = { :host => 'glonass.htu.tuwien.ac.at' }
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end

config/initializers/inflections.rb

@@ -25,4 +25,10 @@ inflect.plural 'rubrik', 'rubriken'
 inflect.singular 'rubriken', 'rubrik'
 inflect.plural 'beispiel', 'beispiele'
 inflect.singular 'beispiele', 'beispiel'
+inflect.plural 'themengruppe', 'themengruppen'
+inflect.singular 'themengruppen', 'themengruppe'
+inflect.plural /thema$/, 'themen'
+inflect.singular /themen$/, 'thema'
+inflect.plural 'frage', 'fragen'
+inflect.singular 'fragen', 'frage'
 end

config/initializers/inflections.rb~

@@ -0,0 +1,34 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+#
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.acronym 'RESTful'
+# end
+ActiveSupport::Inflector.inflections do |inflect|
+inflect.plural 'studium', 'studien'
+inflect.singular 'studien', 'studium'
+inflect.plural 'neuigkeit', 'neuigkeiten'
+inflect.singular 'neuigkeiten', 'neuigkeit'
+inflect.plural 'modulgruppe', 'modulgruppen'
+inflect.singular 'modulgruppen', 'modulgruppe'
+inflect.irregular 'modulgruppe', 'modulgruppen'
+inflect.plural 'rubrik', 'rubriken'
+inflect.singular 'rubriken', 'rubrik'
+inflect.plural 'beispiel', 'beispiele'
+inflect.singular 'beispiele', 'beispiel'
+inflect.plural 'themengruppe', 'themengruppen'
+inflect.singular 'themengruppen', 'themengruppe'
+inflect.plural /thema$/, 'themen'
+inflect.singular /^themen$/, 'thema'
+inflect.plural 'frage', 'fragen'
+inflect.singular 'fragen', 'frage'
+end

config/routes.rb

@@ -46,6 +46,10 @@
      resources :home, :only=>[:index]
      get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
      resources :beispiele
+     resources :themen
+	 resources :themengruppen do
+	 resources :themen, :only=>[:new, :show]
+	 end
  
   resources :calendars
   resources :calentries