[Kimchi-devel] [PATCH] [Wok 15/16] Remove jquery.i18n.min.js as it is not in use

Aline Manera aline.manera at gmail.com
Thu Sep 7 21:50:32 UTC 2017


Wok and neither any plugin is using jquery.i18n.min.js so remove it.
Instead of that, jquery-ui-i18n.min.js is used.

Signed-off-by: Aline Manera <aline.manera at gmail.com>
---
 COPYING                                |  4 ----
 IBM-license-blacklist                  |  2 --
 configure.ac                           |  1 -
 ui/libs/Makefile.am                    |  2 +-
 ui/libs/jquery-i18n/LICENSE            | 19 -------------------
 ui/libs/jquery-i18n/Makefile.am        | 22 ----------------------
 ui/libs/jquery-i18n/jquery.i18n.min.js |  1 -
 ui/pages/login.html.tmpl               |  1 -
 ui/pages/wok-ui.html.tmpl              |  1 -
 9 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 ui/libs/jquery-i18n/LICENSE
 delete mode 100644 ui/libs/jquery-i18n/Makefile.am
 delete mode 100644 ui/libs/jquery-i18n/jquery.i18n.min.js

diff --git a/COPYING b/COPYING
index 45a71f8d..d36645f4 100644
--- a/COPYING
+++ b/COPYING
@@ -29,10 +29,6 @@ Files: ui/libs/jquery-containsNC/*
 Source: https://github.com/friedolinfoerder/jquery.containsNC
 License: MIT
 
-Files: ui/libs/jquery-i18n/jquery.i18n.min.js
-Source: https://github.com/recurser/jquery-i18n
-License: MIT
-
 The rest of this distribution is governed by the GNU Lesser General Public
 License version 2.1.
 
diff --git a/IBM-license-blacklist b/IBM-license-blacklist
index 7cd9cc8d..ec14fe06 100644
--- a/IBM-license-blacklist
+++ b/IBM-license-blacklist
@@ -67,8 +67,6 @@ ui/css/src/vendor/compass-mixins/lib/compass/utilities/text/.*.scss
 ui/config/tab-ext.xml
 ui/images/.*.svg
 ui/images/theme-default/.*.svg
-ui/libs/jquery-i18n/LICENSE
-ui/libs/jquery-i18n/jquery.i18n.min.js
 ui/libs/jquery-ui/LICENSE
 ui/libs/jquery-ui/jquery-ui-i18n.min.js
 ui/libs/jquery-ui/jquery-ui.min.js
diff --git a/configure.ac b/configure.ac
index 36fda429..ca0e21df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,6 @@ AC_CONFIG_FILES([
     ui/js/Makefile
     ui/libs/Makefile
     ui/libs/jquery-containsNC/Makefile
-    ui/libs/jquery-i18n/Makefile
     ui/pages/Makefile
     ui/pages/help/Makefile
     ui/pages/tabs/Makefile
diff --git a/ui/libs/Makefile.am b/ui/libs/Makefile.am
index da17c36b..8c8681ad 100644
--- a/ui/libs/Makefile.am
+++ b/ui/libs/Makefile.am
@@ -17,4 +17,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = jquery-i18n jquery-containsNC
+SUBDIRS = jquery-containsNC
diff --git a/ui/libs/jquery-i18n/LICENSE b/ui/libs/jquery-i18n/LICENSE
deleted file mode 100644
index 978ee2ae..00000000
--- a/ui/libs/jquery-i18n/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2010 Dave Perrett, http://recursive-design.com/
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/ui/libs/jquery-i18n/Makefile.am b/ui/libs/jquery-i18n/Makefile.am
deleted file mode 100644
index d5443ba3..00000000
--- a/ui/libs/jquery-i18n/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Project Wok
-#
-# Copyright IBM Corp, 2015-2016
-#
-# Code derived from Project Kimchi
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-jqueryi18ndir = $(datadir)/wok/ui/libs/jquery-i18n
-
-dist_jqueryi18n_DATA = $(wildcard *.js) $(NULL)
diff --git a/ui/libs/jquery-i18n/jquery.i18n.min.js b/ui/libs/jquery-i18n/jquery.i18n.min.js
deleted file mode 100644
index fead704f..00000000
--- a/ui/libs/jquery-i18n/jquery.i18n.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){var b=Array.prototype.slice,c={dict:null,load:function(b){null!==this.dict?a.extend(this.dict,b):this.dict=b},_:function(a){return dict=this.dict,dict&&dict.hasOwnProperty(a)&&(a=dict[a]),args=b.call(arguments),args[0]=a,this.printf.apply(this,args)},printf:function(c,d){return arguments.length<2?c:(d=a.isArray(d)?d:b.call(arguments,1),c.replace(/([^%]|^)%(?:(\d+)\$)?s/g,function(a,b,c){return c?b+d[parseInt(c)-1]:b+d.shift()}).replace(/%%s/g,"%s"))}};a.fn._t=function(){return a(this).html(c._.apply(c,arguments))},a.i18n=c}(jQuery);
\ No newline at end of file
diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl
index 63b12560..4e3975af 100644
--- a/ui/pages/login.html.tmpl
+++ b/ui/pages/login.html.tmpl
@@ -70,7 +70,6 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/i18n/jquery-ui-i18n.min.js"></script>
-    <script src="$href('libs/jquery-i18n/jquery.i18n.min.js')"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.12.4/js/bootstrap-select.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl
index ddb848d4..d36e3dca 100644
--- a/ui/pages/wok-ui.html.tmpl
+++ b/ui/pages/wok-ui.html.tmpl
@@ -74,7 +74,6 @@
     <script src="$href('libs/jquery-containsNC/jquery.containsNC.js')"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/i18n/jquery-ui-i18n.min.js"></script>
-    <script src="$href('libs/jquery-i18n/jquery.i18n.min.js')"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/list.js/1.5.0/list.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.12.4/js/bootstrap-select.min.js"></script>
-- 
2.13.5



More information about the Kimchi-devel mailing list