From 1394dfc58c2c05c7941590c51932fe662497c76b Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 19 Oct 2014 17:00:05 +0200 Subject: [PATCH 1/2] rm gemfile.lock --- Gemfile.lock | 316 --------------------------------------------------- 1 file changed, 316 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 105de97..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,316 +0,0 @@ -GIT - remote: git://github.com/matenia/bootstrap-kaminari-views.git - revision: 411876644d4231433ed73af8655affa33a35eadc - specs: - bootstrap-kaminari-views (0.0.5) - kaminari (>= 0.13) - rails (>= 3.1) - -GIT - remote: git://github.com/rgrove/sanitize - revision: c62e83b34296f6433213cc008af8dee1421c5d1e - specs: - sanitize (3.0.2) - crass (~> 0.2.0) - nokogiri (>= 1.4.4) - nokogumbo (= 1.1.12) - -GEM - remote: https://rubygems.org/ - specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - builder (~> 3.0.0) - erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) - builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) - multi_json (~> 1.0) - acts_as_votable (0.10.0) - annotate (2.6.1) - activerecord (>= 2.3.0) - rake (>= 0.8.7) - arel (3.0.3) - attr_required (1.0.0) - awesome_nested_set (2.1.6) - activerecord (>= 3.0.0) - bcrypt-ruby (3.1.2) - bootstrap-addons-rails (0.1.2) - rails - bootstrap-sass (2.3.2.2) - sass (~> 3.2) - builder (3.0.4) - cancan (1.6.10) - carrierwave (0.9.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) - climate_control (0.0.3) - activesupport (>= 3.0) - cocaine (0.5.3) - climate_control (>= 0.0.3, < 1.0) - coffee-rails (3.2.2) - coffee-script (>= 2.2.0) - railties (~> 3.2.0) - coffee-script (2.2.0) - coffee-script-source - execjs - coffee-script-source (1.6.3) - crass (0.2.1) - devise (2.2.8) - bcrypt-ruby (~> 3.0) - orm_adapter (~> 0.1) - railties (~> 3.1) - warden (~> 1.2.1) - diff-lcs (1.2.5) - erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - factory_girl (4.3.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.3.0) - factory_girl (~> 4.3.0) - railties (>= 3.0.0) - faraday (0.8.8) - multipart-post (~> 1.2.0) - fb_graph (2.7.15) - httpclient (>= 2.2.0.2) - multi_json (>= 1.3) - rack-oauth2 (>= 0.14.4) - tzinfo - font-awesome-rails (4.0.3.1) - railties (>= 3.2, < 5.0) - formtastic (2.2.1) - actionpack (>= 3.0) - formtastic-bootstrap (3.0.0) - formtastic (>= 2.2) - git (1.2.6) - globalize (3.0.4) - activemodel (>= 3.0.0, < 4.0.0) - activerecord (>= 3.0.0, < 4.0.0) - globalize-versioning (0.1.0.alpha.1) - globalize (>= 3, < 5) - paper_trail (~> 3.0.0) - haml (4.0.5) - tilt - hashie (2.0.5) - hike (1.2.3) - httpauth (0.2.0) - httpclient (2.4.0) - i18n (0.6.1) - journey (1.0.4) - jquery-datetimepicker-rails (2.2.5.0) - jquery-fileupload-rails (0.4.1) - actionpack (>= 3.1) - railties (>= 3.1) - jquery-rails (3.0.4) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) - jquery-ui-rails (4.1.1) - railties (>= 3.1.0) - json (1.8.1) - jwt (0.1.8) - multi_json (>= 1.5) - kaminari (0.16.1) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - libv8 (3.16.14.3) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - meta-tags (2.0.0) - actionpack (>= 3.0.0) - mime-types (1.25.1) - mini_portile (0.6.0) - multi_json (1.8.4) - multipart-post (1.2.0) - mysql2 (0.3.14) - net-ldap (0.3.1) - nokogiri (1.6.3.1) - mini_portile (= 0.6.0) - nokogumbo (1.1.12) - nokogiri - oauth2 (0.8.1) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) - rack (~> 1.2) - omniauth (1.1.4) - hashie (>= 1.2, < 3) - rack - omniauth-facebook (1.5.1) - omniauth-oauth2 (~> 1.1.0) - omniauth-ldap (1.0.4) - net-ldap (~> 0.3.1) - omniauth (~> 1.0) - pyu-ruby-sasl (~> 0.0.3.1) - rubyntlm (~> 0.1.1) - omniauth-oauth2 (1.1.1) - oauth2 (~> 0.8.0) - omniauth (~> 1.0) - orm_adapter (0.5.0) - paper_trail (3.0.5) - activerecord (>= 3.0, < 5.0) - activesupport (>= 3.0, < 5.0) - paperclip (3.4.2) - activemodel (>= 3.0.0) - activerecord (>= 3.0.0) - activesupport (>= 3.0.0) - cocaine (~> 0.5.0) - mime-types - polyglot (0.3.3) - pyu-ruby-sasl (0.0.3.3) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) - rack-oauth2 (1.0.8) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.2.0.2) - multi_json (>= 1.3.6) - rack (>= 1.1) - rack-ssl (1.3.3) - rack - rack-test (0.6.2) - rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) - bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (10.1.1) - rdoc (3.12.2) - json (~> 1.4) - ref (1.0.5) - rmagick (2.13.2) - rolify (3.2.0) - rspec-core (2.14.7) - rspec-expectations (2.14.4) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.4) - rspec-rails (2.14.1) - actionpack (>= 3.0) - activemodel (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rubyntlm (0.1.1) - rubyzip (1.1.6) - sass (3.2.13) - sass-rails (3.2.6) - railties (~> 3.2.0) - sass (>= 3.1.10) - tilt (~> 1.3) - seed_dump (0.5.3) - simple_calendar (0.1.9) - rails (>= 3.0) - sprockets (2.2.2) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.8) - themes_for_rails (0.5.1) - rails (>= 3.0.0) - therubyracer (0.12.0) - libv8 (~> 3.16.14.0) - ref - thor (0.18.1) - tilt (1.4.1) - tinymce-rails (4.1.0) - railties (>= 3.1.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.38) - uglifier (2.4.0) - execjs (>= 0.3.0) - json (>= 1.8.0) - warden (1.2.3) - rack (>= 1.0) - webrick (1.3.1) - -PLATFORMS - ruby - -DEPENDENCIES - acts_as_votable - annotate (>= 2.5.0) - awesome_nested_set - bootstrap-addons-rails - bootstrap-kaminari-views! - bootstrap-sass (~> 2.3.2.1) - cancan - carrierwave (~> 0.9.0) - coffee-rails (~> 3.2.1) - devise (~> 2.2.3) - execjs (~> 1.4.0) - factory_girl_rails - fb_graph - font-awesome-rails - formtastic (~> 2.2.1) - formtastic-bootstrap (~> 3.0.0) - git - globalize (~> 3.0.4) - globalize-versioning - haml - jquery-datetimepicker-rails - jquery-fileupload-rails - jquery-rails - jquery-ui-rails (~> 4.1.1) - kaminari - meta-tags - mysql2 - omniauth - omniauth-facebook - omniauth-ldap - paper_trail (~> 3.0.5) - paperclip (~> 3.4.0) - rails (= 3.2.13) - rmagick - rolify - rspec-rails - rubyzip - sanitize! - sass-rails (~> 3.2) - seed_dump (~> 0.5.3) - simple_calendar (~> 0.1.9) - sprockets (= 2.2.2) - sqlite3 - themes_for_rails - therubyracer - tinymce-rails (~> 4.1.0) - uglifier (>= 1.0.3) - webrick (= 1.3.1) From 2de81b5cc774e3acd6d3450106c555776fc789d1 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 19 Oct 2014 17:10:04 +0200 Subject: [PATCH 2/2] translate lva --- app/views/lvas/show.html.erb | 6 +++--- config/locales/studien_public.de.yml | 4 ++++ config/locales/studien_public.en.yml | 32 ++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 config/locales/studien_public.en.yml diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb index 0d0940a..0cc48225 100755 --- a/app/views/lvas/show.html.erb +++ b/app/views/lvas/show.html.erb @@ -17,17 +17,17 @@ -

Prüfungsinformation

+

<%= I18n.t('lva.pruefungsinfo')

<%= @lva.pruefungsinformation.to_s.html_safe %>
-

Lernaufwand

+

<%= I18n.t('lva.lernaufwand')

<%= @lva.lernaufwand %>
-

Beschreibung

+

<%= I18n.t('lva.desc')

<%= @lva.desc.to_s.html_safe %>
diff --git a/config/locales/studien_public.de.yml b/config/locales/studien_public.de.yml index cfe7e8b..dc855f8 100644 --- a/config/locales/studien_public.de.yml +++ b/config/locales/studien_public.de.yml @@ -24,5 +24,9 @@ de: semester: ohne: "Ohne Semesterzuordnung" semester: "Semester" + lva: + pruefungsinfo: "Prüfungsinformationen" + lernaufwand: "Lernaufwand" + desc: "Beschreibung" home: newexamples: "Neueste Beispiele" \ No newline at end of file diff --git a/config/locales/studien_public.en.yml b/config/locales/studien_public.en.yml new file mode 100644 index 0000000..e6f98d9 --- /dev/null +++ b/config/locales/studien_public.en.yml @@ -0,0 +1,32 @@ +en: + studien: + desc: "Description" + studien: "study programs" + list: "Study program of Electrical Engineering Faculty" + anzeigen: "Show study program" + new: "New study program" + allestudien: "All study programs" + loeschen: "Delete study program" + edit: "Edit study program" + ansicht: + modulgruppe: "Modul view" + semester: "Semester view" + info: "Info view" + keine: + beschreibung: "No desciption available" + beispiel: + add: "Add Examples" + zip: "Download all as ZIP File" + lecturers: + lecturers: "Lecturers" + file: + size: "Filesize" + semester: + ohne: "Ohne Semesterzuordnung" + semester: "Semester" + lva: + pruefungsinfo: "Exam informations" + lernaufwand: "Workload for exams" + desc: "Description" + home: + newexamples: "Newest Examples" \ No newline at end of file