forked from bofh/fetsite
Merge branch 'kalender' of https://github.com/andreassteph/fetsite into calendar
Conflicts: app/assets/stylesheets/formtastic-changes.css.scss app/controllers/beispiele_controller.rb app/views/studien/_form.html.erb config/locales/de.yml config/routes.rb
This commit is contained in:
Thomas Blazek
@@ -105,6 +105,7 @@ de:
|
||||
blank: "Geben Sie den Namen des Studiums ein"
|
||||
taken: "Der Name ist bereits vergeben"
|
||||
typ:
|
||||
<<<<<<< HEAD
|
||||
inclusion: 'Wählen Sie "Bachelor" oder "Master" aus'
|
||||
modul:
|
||||
attributes:
|
||||
@@ -125,3 +126,202 @@ de:
|
||||
array:
|
||||
two_words_connector: ', '
|
||||
|
||||
=======
|
||||
inclusion: 'Wählen Sie "Bachelor" oder "Master" aus'
|
||||
|
||||
date:
|
||||
abbr_day_names:
|
||||
- So
|
||||
- Mo
|
||||
- Di
|
||||
- Mi
|
||||
- Do
|
||||
- Fr
|
||||
- Sa
|
||||
abbr_month_names:
|
||||
-
|
||||
- Jan
|
||||
- Feb
|
||||
- Mär
|
||||
- Apr
|
||||
- Mai
|
||||
- Jun
|
||||
- Jul
|
||||
- Aug
|
||||
- Sep
|
||||
- Okt
|
||||
- Nov
|
||||
- Dez
|
||||
day_names:
|
||||
- Sonntag
|
||||
- Montag
|
||||
- Dienstag
|
||||
- Mittwoch
|
||||
- Donnerstag
|
||||
- Freitag
|
||||
- Samstag
|
||||
formats:
|
||||
default: ! '%d.%m.%Y'
|
||||
long: ! '%e. %B %Y'
|
||||
short: ! '%e. %b'
|
||||
month_names:
|
||||
-
|
||||
- Januar
|
||||
- Februar
|
||||
- März
|
||||
- April
|
||||
- Mai
|
||||
- Juni
|
||||
- Juli
|
||||
- August
|
||||
- September
|
||||
- Oktober
|
||||
- November
|
||||
- Dezember
|
||||
order:
|
||||
- :day
|
||||
- :month
|
||||
- :year
|
||||
datetime:
|
||||
distance_in_words:
|
||||
about_x_hours:
|
||||
one: etwa eine Stunde
|
||||
other: etwa %{count} Stunden
|
||||
about_x_months:
|
||||
one: etwa ein Monat
|
||||
other: etwa %{count} Monate
|
||||
about_x_years:
|
||||
one: etwa ein Jahr
|
||||
other: etwa %{count} Jahre
|
||||
almost_x_years:
|
||||
one: fast ein Jahr
|
||||
other: fast %{count} Jahre
|
||||
half_a_minute: eine halbe Minute
|
||||
less_than_x_minutes:
|
||||
one: weniger als eine Minute
|
||||
other: weniger als %{count} Minuten
|
||||
less_than_x_seconds:
|
||||
one: weniger als eine Sekunde
|
||||
other: weniger als %{count} Sekunden
|
||||
over_x_years:
|
||||
one: mehr als ein Jahr
|
||||
other: mehr als %{count} Jahre
|
||||
x_days:
|
||||
one: ein Tag
|
||||
other: ! '%{count} Tage'
|
||||
x_minutes:
|
||||
one: eine Minute
|
||||
other: ! '%{count} Minuten'
|
||||
x_months:
|
||||
one: ein Monat
|
||||
other: ! '%{count} Monate'
|
||||
x_seconds:
|
||||
one: eine Sekunde
|
||||
other: ! '%{count} Sekunden'
|
||||
prompts:
|
||||
day: Tag
|
||||
hour: Stunden
|
||||
minute: Minuten
|
||||
month: Monat
|
||||
second: Sekunden
|
||||
year: Jahr
|
||||
errors:
|
||||
format: ! '%{attribute} %{message}'
|
||||
messages:
|
||||
accepted: muss akzeptiert werden
|
||||
blank: muss ausgefüllt werden
|
||||
confirmation: stimmt nicht mit der Bestätigung überein
|
||||
empty: muss ausgefüllt werden
|
||||
equal_to: muss genau %{count} sein
|
||||
even: muss gerade sein
|
||||
exclusion: ist nicht verfügbar
|
||||
greater_than: muss größer als %{count} sein
|
||||
greater_than_or_equal_to: muss größer oder gleich %{count} sein
|
||||
inclusion: ist kein gültiger Wert
|
||||
invalid: ist nicht gültig
|
||||
less_than: muss kleiner als %{count} sein
|
||||
less_than_or_equal_to: muss kleiner oder gleich %{count} sein
|
||||
not_a_number: ist keine Zahl
|
||||
not_an_integer: muss ganzzahlig sein
|
||||
odd: muss ungerade sein
|
||||
record_invalid: ! 'Gültigkeitsprüfung ist fehlgeschlagen: %{errors}'
|
||||
taken: ist bereits vergeben
|
||||
too_long: ist zu lang (nicht mehr als %{count} Zeichen)
|
||||
too_short: ist zu kurz (nicht weniger als %{count} Zeichen)
|
||||
wrong_length: hat die falsche Länge (muss genau %{count} Zeichen haben)
|
||||
template:
|
||||
body: ! 'Bitte überprüfen Sie die folgenden Felder:'
|
||||
header:
|
||||
one: ! 'Konnte %{model} nicht speichern: ein Fehler.'
|
||||
other: ! 'Konnte %{model} nicht speichern: %{count} Fehler.'
|
||||
helpers:
|
||||
select:
|
||||
prompt: Bitte wählen
|
||||
submit:
|
||||
create: ! '%{model} erstellen'
|
||||
submit: ! '%{model} speichern'
|
||||
update: ! '%{model} aktualisieren'
|
||||
number:
|
||||
currency:
|
||||
format:
|
||||
delimiter: .
|
||||
format: ! '%n %u'
|
||||
precision: 2
|
||||
separator: ! ','
|
||||
significant: false
|
||||
strip_insignificant_zeros: false
|
||||
unit: €
|
||||
format:
|
||||
delimiter: .
|
||||
precision: 2
|
||||
separator: ! ','
|
||||
significant: false
|
||||
strip_insignificant_zeros: false
|
||||
human:
|
||||
decimal_units:
|
||||
format: ! '%n %u'
|
||||
units:
|
||||
billion:
|
||||
one: Milliarde
|
||||
other: Milliarden
|
||||
million: Millionen
|
||||
quadrillion:
|
||||
one: Billiarde
|
||||
other: Billiarden
|
||||
thousand: Tausend
|
||||
trillion: Billionen
|
||||
unit: ''
|
||||
format:
|
||||
delimiter: ''
|
||||
precision: 1
|
||||
significant: true
|
||||
strip_insignificant_zeros: true
|
||||
storage_units:
|
||||
format: ! '%n %u'
|
||||
units:
|
||||
byte:
|
||||
one: Byte
|
||||
other: Bytes
|
||||
gb: GB
|
||||
kb: KB
|
||||
mb: MB
|
||||
tb: TB
|
||||
percentage:
|
||||
format:
|
||||
delimiter: ''
|
||||
precision:
|
||||
format:
|
||||
delimiter: ''
|
||||
support:
|
||||
array:
|
||||
last_word_connector: ! ' und '
|
||||
two_words_connector: ! ' und '
|
||||
words_connector: ! ', '
|
||||
time:
|
||||
am: vormittags
|
||||
formats:
|
||||
default: ! '%d.%m.%Y, %H:%M Uhr'
|
||||
long: ! '%A, %d. %B %Y, %H:%M Uhr'
|
||||
short: ! '%d.%m.%Y, %H:%M Uhr'
|
||||
pm: nachmittags
|
||||
>>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca
|
||||
|
||||
114
config/routes.rb
114
config/routes.rb
@@ -1,3 +1,4 @@
|
||||
<<<<<<< HEAD
|
||||
Fetsite::Application.routes.draw do
|
||||
|
||||
devise_for :users
|
||||
@@ -106,3 +107,116 @@
|
||||
# Note: This route will make all actions in every controller accessible via GET requests.
|
||||
# match ':controller(/:action(/:id))(.:format)'
|
||||
end
|
||||
=======
|
||||
Fetsite::Application.routes.draw do
|
||||
|
||||
resources :calendars
|
||||
|
||||
|
||||
resources :calentries
|
||||
|
||||
|
||||
devise_for :users
|
||||
resources :home, :only=>[:index]
|
||||
#get 'home',:controller=>home,:action=>:index,:as=>"home_index"
|
||||
scope '(:locale)/admin' do
|
||||
resources :users
|
||||
get 'config',:controller=>:config,:action=>:index , :as => 'config'
|
||||
get 'config/get_git_update',:controller=>:config,:action=>:get_git_update, :as=>'config_getgitupdate'
|
||||
get 'config/get_git_update',:controller=>:config,:action=>:get_git_update
|
||||
end
|
||||
|
||||
devise_for :users
|
||||
|
||||
resources :pages, :except => [:index] do
|
||||
member do
|
||||
post 'preview'
|
||||
end
|
||||
end
|
||||
get 'pages', :to =>'pages#show'
|
||||
scope '(:locale)' do
|
||||
|
||||
resources :studien, :only=>[:show,:new,:edit,:update,:destroy]
|
||||
resources :modulgruppen,:only =>[:create,:index]
|
||||
|
||||
resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do
|
||||
resources :modulgruppen, :path => "(:locale)/modulgruppen"
|
||||
|
||||
end
|
||||
get 'studien/:id/semesteransicht', :controller=>:studien, :action=>:semesteransicht, :as=>'studium_semesteransicht'
|
||||
resources :semesters
|
||||
resources :moduls
|
||||
resources :lvas
|
||||
resources :neuigkeiten
|
||||
get 'rubriken/verwalten', :controller=>:rubriken, :action=>:alle_verwalten, :as=>'alle_verwalten_rubrik'
|
||||
|
||||
resources :rubriken do
|
||||
resources :neuigkeiten, :only=>[:new, :show]
|
||||
end
|
||||
put 'rubriken/(:id)/addmoderator',:controller=>:rubriken,:action=>:addmoderator
|
||||
get 'rubriken/:id/verwalten',:controller=>:rubriken,:action=>:verwalten, :as=>'verwalten_rubrik'
|
||||
resources :home, :only=>[:index]
|
||||
get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
|
||||
resources :beispiele
|
||||
|
||||
end
|
||||
|
||||
# The priority is based upon order of creation:
|
||||
# first created -> highest priority.
|
||||
|
||||
# Sample of regular route:
|
||||
# match 'products/:id' => 'catalog#view'
|
||||
# Keep in mind you can assign values other than :controller and :action
|
||||
|
||||
# Sample of named route:
|
||||
# match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
|
||||
# This route can be invoked with purchase_url(:id => product.id)
|
||||
|
||||
# Sample resource route (maps HTTP verbs to controller actions automatically):
|
||||
# resources :products
|
||||
|
||||
# Sample resource route with options:
|
||||
# resources :products do
|
||||
# member do
|
||||
# get 'short'
|
||||
# post 'toggle'
|
||||
# end
|
||||
#
|
||||
# collection do
|
||||
# get 'sold'
|
||||
# end
|
||||
# end
|
||||
|
||||
# Sample resource route with sub-resources:
|
||||
# resources :products do
|
||||
# resources :comments, :sales
|
||||
# resource :seller
|
||||
# end
|
||||
|
||||
# Sample resource route with more complex sub-resources
|
||||
# resources :products do
|
||||
# resources :comments
|
||||
# resources :sales do
|
||||
# get 'recent', :on => :collection
|
||||
# end
|
||||
# end
|
||||
|
||||
# Sample resource route within a namespace:
|
||||
# namespace :admin do
|
||||
# # Directs /admin/products/* to Admin::ProductsController
|
||||
# # (app/controllers/admin/products_controller.rb)
|
||||
# resources :products
|
||||
# end
|
||||
|
||||
# You can have the root of your site routed with "root"
|
||||
# just remember to delete public/index.html.
|
||||
|
||||
root :to => 'home#index'
|
||||
|
||||
# See how all your routes lay out with "rake routes"
|
||||
|
||||
# This is a legacy wild controller route that's not recommended for RESTful applications.
|
||||
# Note: This route will make all actions in every controller accessible via GET requests.
|
||||
# match ':controller(/:action(/:id))(.:format)'
|
||||
end
|
||||
>>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca
|
||||
|
||||
Reference in New Issue
Block a user