diff --git a/.travis.yml b/.travis.yml index 93d28d4675..889302151f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,9 @@ before_install: - git checkout openproject/$TRAVIS_BRANCH # End of custom plugin instructions. - + - "rvm @default,@global do gem uninstall bundler -a -x" + - gem install bundler -v 1.12.5 + - echo `bundle -v` - "echo `firefox -v`" - "export DISPLAY=:99.0" - "/sbin/start-stop-daemon --start -v --pidfile ./tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1920x1080x16" diff --git a/app/views/meetings/index.html.erb b/app/views/meetings/index.html.erb index 9974a73b30..9fc189053e 100644 --- a/app/views/meetings/index.html.erb +++ b/app/views/meetings/index.html.erb @@ -23,9 +23,13 @@ See doc/COPYRIGHT.md for more details. <%= toolbar title: l(:label_meeting_plural) do %> <% if authorize_for(:meetings, :new) %> - + - <%= I18n.t(:label_meeting_new) %> + <%= t(:label_meeting) %> <% end %> <% end %>