Merge pull request #114 from finnlabs/feature/webpack-i18n-support

Fix loading of I18n in plugins from Angular application; Reorganise frontend code
pull/6827/head
ulferts 10 years ago
commit c49127f15e
  1. 1
      .gitignore
  2. 37
      app/views/hooks/backlogs/_view_work_package_overview_attributes.html.erb
  3. 4
      frontend/app/openproject-backlogs-app.js
  4. 1
      lib/open_project/backlogs/engine.rb
  5. 2
      lib/open_project/backlogs/hooks.rb
  6. 6
      package.json

1
.gitignore vendored

@ -4,3 +4,4 @@ _posts
assets/styles
graph.dot
*.swp
node_modules

@ -1,37 +0,0 @@
<%#-- copyright
OpenProject Backlogs Plugin
Copyright (C)2013-2014 the OpenProject Foundation (OPF)
Copyright (C)2011 Stephan Eckardt, Tim Felgentreff, Marnen Laibow-Koser, Sandro Munda
Copyright (C)2010-2011 friflaj
Copyright (C)2010 Maxime Guilbot, Andrew Vit, Joakim Kolsjö, ibussieres, Daniel Passos, Jason Vasquez, jpic, Emiliano Heyns
Copyright (C)2009-2010 Mark Maglana
Copyright (C)2009 Joe Heck, Nate Lowrie
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License version 3.
OpenProject Backlogs is a derivative work based on ChiliProject Backlogs.
The copyright follows:
Copyright (C) 2010-2011 - Emiliano Heyns, Mark Maglana, friflaj
Copyright (C) 2011 - Jens Ulferts, Gregor Schmidt - Finn GmbH - Berlin, Germany
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<%= javascript_include_tag 'angular/openproject-backlogs-app.js' %>

@ -33,6 +33,10 @@
// See doc/COPYRIGHT.rdoc for more details.
//++
// standard locales
I18n.addTranslations('en', require('../../config/locales/js-en.yml').en);
I18n.addTranslations('de', require('../../config/locales/js-de.yml').de);
// main app
var openprojectBacklogsApp = angular.module('openproject');

@ -126,7 +126,6 @@ module OpenProject::Backlogs
backlogs/taskboard.css
backlogs/jquery.flot/excanvas.js
backlogs/burndown.js
angular/openproject-backlogs-app.js
)
patches [:PermittedParams, :WorkPackage, :Status, :MyController, :Project,

@ -72,8 +72,6 @@ module OpenProject::Backlogs::Hooks
class LayoutHook < Redmine::Hook::ViewListener
include RbCommonHelper
render_on :view_work_package_overview_attributes, partial: 'hooks/backlogs/view_work_package_overview_attributes'
def view_work_packages_form_details_bottom(context = {})
snippet = ''
work_package = context[:issue]

@ -0,0 +1,6 @@
{
"name": "openproject-backlogs",
"version": "0.1.0",
"main": "frontend/app/openproject-backlogs-app.js",
"dependencies": {}
}
Loading…
Cancel
Save