Merge branch 'release/4.3' into feature/rails4

pull/6827/head
Alex Coles 9 years ago
commit 21aa5defee
  1. 8
      frontend/app/openproject-xls_export-app.js
  2. 2
      lib/open_project/xls_export/version.rb

@ -1,2 +1,6 @@
I18n.addTranslations('en', require('../../config/locales/js-en.yml').en);
I18n.addTranslations('de', require('../../config/locales/js-de.yml').de);
// load all js locales
var localeFiles = require.context('../../config/locales', false, /js-[\w|-]{2,5}\.yml$/);
localeFiles.keys().forEach(function(localeFile) {
var locale = localeFile.match(/js-([\w|-]{2,5})\.yml/)[1];
I18n.addTranslations(locale, localeFiles(localeFile)[locale]);
});

@ -1,5 +1,5 @@
module OpenProject
module XlsExport
VERSION = "4.3.0-alpha"
VERSION = "4.3.0"
end
end

Loading…
Cancel
Save