From 44be3cf540c103f1e59567197150856fe73320e6 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Tue, 15 Nov 2016 14:03:34 +0100
Subject: [PATCH] modern upload file type don't work #593

---
 app/controllers/dmsf_files_controller.rb             |  1 +
 app/helpers/dmsf_helper.rb                           | 12 +++++++++++-
 app/views/dmsf_files/show.html.erb                   |  7 +------
 app/views/dmsf_upload/_multi_upload.html.erb         |  2 +-
 .../plupload/js/i18n/{ku_IQ.js => ku-IQ.js}          |  0
 .../plupload/js/i18n/{pt_BR.js => pt-BR.js}          |  0
 .../plupload/js/i18n/{th_TH.js => th-TH.js}          |  0
 .../plupload/js/i18n/{uk_UA.js => uk-UA.js}          |  0
 .../plupload/js/i18n/{zh_CN.js => zh-CN.js}          |  0
 .../plupload/js/i18n/{zh_TW.js => zh-TW.js}          |  0
 10 files changed, 14 insertions(+), 8 deletions(-)
 rename assets/javascripts/plupload/js/i18n/{ku_IQ.js => ku-IQ.js} (100%)
 rename assets/javascripts/plupload/js/i18n/{pt_BR.js => pt-BR.js} (100%)
 rename assets/javascripts/plupload/js/i18n/{th_TH.js => th-TH.js} (100%)
 rename assets/javascripts/plupload/js/i18n/{uk_UA.js => uk-UA.js} (100%)
 rename assets/javascripts/plupload/js/i18n/{zh_CN.js => zh-CN.js} (100%)
 rename assets/javascripts/plupload/js/i18n/{zh_TW.js => zh-TW.js} (100%)

diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb
index e1351811..ee2dc557 100644
--- a/app/controllers/dmsf_files_controller.rb
+++ b/app/controllers/dmsf_files_controller.rb
@@ -33,6 +33,7 @@ class DmsfFilesController < ApplicationController
 
   helper :all
   helper :dmsf_workflows
+  helper :dmsf
 
   def view
     begin
diff --git a/app/helpers/dmsf_helper.rb b/app/helpers/dmsf_helper.rb
index 3982c3c0..383eb82c 100644
--- a/app/helpers/dmsf_helper.rb
+++ b/app/helpers/dmsf_helper.rb
@@ -69,7 +69,7 @@ module DmsfHelper
 
   def json_url
     if I18n.locale
-      ret = "jquery.dataTables/#{I18n.locale.to_s.downcase}.json"
+      ret = "jquery.dataTables/#{I18n.locale}.json"
       path = "#{File.dirname(__FILE__)}/../../assets/javascripts/#{ret}"
       return ret if File.exist?(path)
       Rails.logger.warn "#{path} not found"
@@ -77,6 +77,16 @@ module DmsfHelper
     'jquery.dataTables/en.json'
   end
 
+  def js_url
+    if I18n.locale
+      ret = "plupload/js/i18n/#{I18n.locale}.js"
+      path = "#{File.dirname(__FILE__)}/../../assets/javascripts/#{ret}"
+      return ret if File.exist?(path)
+      Rails.logger.warn "#{path} not found"
+    end
+    'plupload/js/i18n/en.js'
+  end
+
   def self.all_children_sorted(parent, pos, ident)
     # Folders && files && links
     nodes = parent.dmsf_folders.visible + parent.dmsf_links.visible + parent.dmsf_files.visible
diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb
index 7c53f8b1..b14b6c70 100644
--- a/app/views/dmsf_files/show.html.erb
+++ b/app/views/dmsf_files/show.html.erb
@@ -170,11 +170,6 @@
 
 <span class="pagination"><%= pagination_links_full @revision_pages, @file.dmsf_file_revisions.visible.count %></span>
 
-<%
-  url = 'jquery.dataTables/en.json'
-  url = "jquery.dataTables/#{I18n.locale.to_s.downcase}.json" if I18n.locale && !I18n.locale.to_s.match(/^en.*/)
-%>
-
 <script type="text/javascript">
   $('a.delete-revision').click(function(event) {
     if(!window.confirm('<%= l(:text_are_you_sure) %>')) {
@@ -209,7 +204,7 @@
   $('.dmsf_list').dataTable({
     'bJQueryUI': true,
     'oLanguage': {
-      'sUrl': '/plugin_assets/<%= :redmine_dmsf %>/javascripts/<%= url %>'
+      'sUrl': "<%= plugin_asset_path(:redmine_dmsf, 'javascripts', json_url) %>"
     }
   });
 </script>
diff --git a/app/views/dmsf_upload/_multi_upload.html.erb b/app/views/dmsf_upload/_multi_upload.html.erb
index addcafcb..20dc8dc3 100644
--- a/app/views/dmsf_upload/_multi_upload.html.erb
+++ b/app/views/dmsf_upload/_multi_upload.html.erb
@@ -71,7 +71,7 @@
   <%= stylesheet_link_tag 'plupload/jquery.ui.plupload.css', :plugin => 'redmine_dmsf' %>  
   <%= javascript_include_tag 'plupload/js/plupload.full.min.js', :plugin => 'redmine_dmsf' %>
   <%= javascript_include_tag 'plupload/js/jquery.ui.plupload/jquery.ui.plupload.js', :plugin => 'redmine_dmsf' %>
-  <%= javascript_include_tag("plupload/js/i18n/#{I18n.locale.to_s.downcase}.js", :plugin => 'redmine_dmsf') if I18n.locale && !I18n.locale.to_s.match(/^en.*/) %>
+  <%= javascript_include_tag(js_url, :plugin => 'redmine_dmsf') %>
 
   <script type="text/javascript">
     function initPlUploader(uploader) {
diff --git a/assets/javascripts/plupload/js/i18n/ku_IQ.js b/assets/javascripts/plupload/js/i18n/ku-IQ.js
similarity index 100%
rename from assets/javascripts/plupload/js/i18n/ku_IQ.js
rename to assets/javascripts/plupload/js/i18n/ku-IQ.js
diff --git a/assets/javascripts/plupload/js/i18n/pt_BR.js b/assets/javascripts/plupload/js/i18n/pt-BR.js
similarity index 100%
rename from assets/javascripts/plupload/js/i18n/pt_BR.js
rename to assets/javascripts/plupload/js/i18n/pt-BR.js
diff --git a/assets/javascripts/plupload/js/i18n/th_TH.js b/assets/javascripts/plupload/js/i18n/th-TH.js
similarity index 100%
rename from assets/javascripts/plupload/js/i18n/th_TH.js
rename to assets/javascripts/plupload/js/i18n/th-TH.js
diff --git a/assets/javascripts/plupload/js/i18n/uk_UA.js b/assets/javascripts/plupload/js/i18n/uk-UA.js
similarity index 100%
rename from assets/javascripts/plupload/js/i18n/uk_UA.js
rename to assets/javascripts/plupload/js/i18n/uk-UA.js
diff --git a/assets/javascripts/plupload/js/i18n/zh_CN.js b/assets/javascripts/plupload/js/i18n/zh-CN.js
similarity index 100%
rename from assets/javascripts/plupload/js/i18n/zh_CN.js
rename to assets/javascripts/plupload/js/i18n/zh-CN.js
diff --git a/assets/javascripts/plupload/js/i18n/zh_TW.js b/assets/javascripts/plupload/js/i18n/zh-TW.js
similarity index 100%
rename from assets/javascripts/plupload/js/i18n/zh_TW.js
rename to assets/javascripts/plupload/js/i18n/zh-TW.js