Merge branch 'develop'5.1-beta3

4 files changed, 35 insertions, 28 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index a1ee949..33e77ff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,7 @@ GEM
       compass (>= 0.12.2, < 0.14)
     cookiejar (0.3.0)
     daemons (1.1.9)
-    dalli (2.6.0)
+    dalli (2.6.2)
     delayed_job (3.0.4)
       activesupport (~> 3.0)
     delayed_job_active_record (0.3.3)
@@ -79,10 +79,10 @@ GEM
     eventmachine (1.0.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (4.1.0)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.1.0)
-      factory_girl (~> 4.1.0)
+    factory_girl_rails (4.2.0)
+      factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
     faye (0.8.8)
       cookiejar (>= 0.3.0)
@@ -93,20 +93,20 @@ GEM
       yajl-ruby (>= 1.0.0)
     faye-websocket (0.4.6)
       eventmachine (>= 0.12.0)
-    fssm (0.2.9)
+    fssm (0.2.10)
     haml (3.1.7)
     hike (1.2.1)
-    hirb (0.7.0)
+    hirb (0.7.1)
     http_accept_language (1.0.2)
     http_parser.rb (0.5.3)
     i18n (0.6.1)
     inifile (2.0.2)
     journey (1.0.4)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.6)
-    kgio (2.7.4)
+    kgio (2.8.0)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
     mail (2.4.4)
@@ -178,7 +178,7 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index c498943..97bf483 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -1,18 +1,19 @@
-- cache(['application_footer', I18n.locale]) do
-  %footer
-    %ul{:class => 'nav nav-pills'}
-      - if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil?
-        %li
-          %a{:href => '#', :rel => "tooltip", :title => "Build ##{GsParameter.get('GEMEINSCHAFT_BUILDNAME')}", :'data-trigger' => 'hover'}
-            = "Gemeinschaft Version #{GsParameter.get('GEMEINSCHAFT_VERSION')}"
-      - else
-        %li
-          %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft Version #{GsParameter.get('GEMEINSCHAFT_VERSION')}
-      - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user)
-        %li
-          %a{:href => "http://amooma.de"} Support und Consulting
-      - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user)
-        %li
-          %a{:href => "https://groups.google.com/group/gs5-users/"} Mailingliste
-      %li{:class => 'pull-right'}
-        = link_to 'brought to you by AMOOMA GmbH', 'http://amooma.de'
\ No newline at end of file
+%footer
+  %ul{:class => 'nav nav-pills'}
+    - if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil?
+      %li
+        %a{:href => '#', :rel => "tooltip", :title => "Build ##{GsParameter.get('GEMEINSCHAFT_BUILDNAME')}", :'data-trigger' => 'hover'}
+          = "GS #{GsParameter.get('GEMEINSCHAFT_VERSION')}"
+    - else
+      %li
+        %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}
+    - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user)
+      %li
+        = link_to t('misc.consulting'), "http://amooma.de"
+    - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user)
+      %li
+        = link_to 'GS5 Google Group', "https://groups.google.com/group/gs5-users/"
+      %li
+        =link_to t('misc.send_a_bugreport'), URI::escape("https://github.com/amooma/GS5/issues/new?title=Bugreport&body=URL which triggered the bugreport is: #{request.fullpath}\nGS5 buildname: #{(GsParameter.get('GEMEINSCHAFT_BUILDNAME').blank? ? 'unknown' : GsParameter.get('GEMEINSCHAFT_BUILDNAME'))}\n\nPlease provide your bugreport below this line and update the title of this issue to a more specific one.")
+    %li{:class => 'pull-right'}
+      = link_to 'brought to you by AMOOMA GmbH', 'http://amooma.de'
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index e82f513..9d85d8e 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -194,4 +194,7 @@ de:
       long: ! '%A, %d. %B %Y, %H:%M Uhr'
       short: ! '%d. %B, %H:%M Uhr'
     pm: nachmittags
-    date_only: '%d.%m.%Y'
\ No newline at end of file
+    date_only: '%d.%m.%Y'
+  misc:
+    send_a_bugreport: 'Fehler melden (Bugreport).'
+    consulting: 'Consulting'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dab4595..0ad4b1c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -4,3 +4,6 @@ en:
       date_only: '%m/%d/%Y'
       short: ! '%m/%d/%y %H:%M'
     date_only: '%m/%d/%Y'
+  misc:
+    send_a_bugreport: 'Send a bugreport.'
+    consulting: 'Consulting'
\ No newline at end of file