From f50e9efe9fe498c53c5da11db6ccfb53b6328afc Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <carsten.schmitz@limesurvey.org>
Date: Wed, 27 Apr 2016 13:41:03 +0200
Subject: [PATCH] Dev Added translations for datetimepicker popup buttons Dev
 Removed obsolete libraries

---
 application/config/third_party.php                 | 14 --------------
 application/controllers/admin/dataentry.php        |  3 ++-
 application/views/admin/dataentry/content_view.php |  3 ++-
 .../export/statistics_subviews/_submissiondate.php |  9 ++++++---
 .../subview/accordion/_publication_panel.php       |  6 ++++--
 application/views/admin/token/dummytokenform.php   |  6 ++++--
 application/views/admin/token/token_bar.php        |  3 ---
 application/views/admin/token/tokenform.php        | 10 +++++++---
 .../survey/questions/date/selector/answer.php      |  3 ++-
 9 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/application/config/third_party.php b/application/config/third_party.php
index 2136400d32f..12def08a076 100755
--- a/application/config/third_party.php
+++ b/application/config/third_party.php
@@ -254,20 +254,6 @@
         )
     ),
 
-    // jQuery timepicker
-    'jqueryui-timepicker' => array(
-        'baseUrl' => 'third_party/jquery-ui-timepicker-addon/',
-        'js' => array(
-            'jquery-ui-timepicker-addon.js'
-        ),
-        'css' => array(
-            'jquery-ui-timepicker-addon.css'
-        ),
-        'depends' => array(
-            'jqueryui'
-        )
-    ),
-
     // select2
     'select2' => array(
         'baseUrl' => 'styles/limebootstrap/assets/',
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
index 1ff6b0e3b55..5b15b3c3f96 100644
--- a/application/controllers/admin/dataentry.php
+++ b/application/controllers/admin/dataentry.php
@@ -749,7 +749,8 @@ public function editdata($subaction, $id, $surveyid, $language='')
                                             'prevDecade'=> gT('Previous decade'),
                                             'nextDecade'=> gT('Next decade'),
                                             'prevCentury'=> gT('Previous century'),
-                                            'nextCentury'=> gT('Next century')
+                                            'nextCentury'=> gT('Next century'),
+                                'selectTime'=> gT('Select time')
                                         ),
                                         'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                                     )
diff --git a/application/views/admin/dataentry/content_view.php b/application/views/admin/dataentry/content_view.php
index 4200a4e016c..235ba1f5635 100644
--- a/application/views/admin/dataentry/content_view.php
+++ b/application/views/admin/dataentry/content_view.php
@@ -72,7 +72,8 @@
                                 'prevDecade'=> gT('Previous decade'),
                                 'nextDecade'=> gT('Next decade'),
                                 'prevCentury'=> gT('Previous century'),
-                                'nextCentury'=> gT('Next century')
+                                'nextCentury'=> gT('Next century'),
+                                'selectTime'=> gT('Select time')
                             ),
                             'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                         )
diff --git a/application/views/admin/export/statistics_subviews/_submissiondate.php b/application/views/admin/export/statistics_subviews/_submissiondate.php
index 5cfb86efa3e..606ff2ca39a 100644
--- a/application/views/admin/export/statistics_subviews/_submissiondate.php
+++ b/application/views/admin/export/statistics_subviews/_submissiondate.php
@@ -26,7 +26,8 @@
                                     'prevDecade'=> gT('Previous decade'),
                                     'nextDecade'=> gT('Next decade'),
                                     'prevCentury'=> gT('Previous century'),
-                                    'nextCentury'=> gT('Next century')
+                                    'nextCentury'=> gT('Next century'),
+                                'selectTime'=> gT('Select time')
                                 ),
                                 'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                             )
@@ -56,7 +57,8 @@
                                     'prevDecade'=> gT('Previous decade'),
                                     'nextDecade'=> gT('Next decade'),
                                     'prevCentury'=> gT('Previous century'),
-                                    'nextCentury'=> gT('Next century')
+                                    'nextCentury'=> gT('Next century'),
+                                'selectTime'=> gT('Select time')
                                 ),
 
                                 'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
@@ -87,7 +89,8 @@
                                     'prevDecade'=> gT('Previous decade'),
                                     'nextDecade'=> gT('Next decade'),
                                     'prevCentury'=> gT('Previous century'),
-                                    'nextCentury'=> gT('Next century')
+                                    'nextCentury'=> gT('Next century'),
+                                'selectTime'=> gT('Select time')
                                 ),
                                 'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                             )
diff --git a/application/views/admin/survey/subview/accordion/_publication_panel.php b/application/views/admin/survey/subview/accordion/_publication_panel.php
index 5648f0e0185..871daecf640 100755
--- a/application/views/admin/survey/subview/accordion/_publication_panel.php
+++ b/application/views/admin/survey/subview/accordion/_publication_panel.php
@@ -50,7 +50,8 @@
                             'prevDecade'=> gT('Previous decade'),
                             'nextDecade'=> gT('Next decade'),
                             'prevCentury'=> gT('Previous century'),
-                            'nextCentury'=> gT('Next century')
+                            'nextCentury'=> gT('Next century'),
+                            'selectTime'=> gT('Select time')
                         ),
                         'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                     )
@@ -82,7 +83,8 @@
                             'prevDecade'=> gT('Previous decade'),
                             'nextDecade'=> gT('Next decade'),
                             'prevCentury'=> gT('Previous century'),
-                            'nextCentury'=> gT('Next century')
+                            'nextCentury'=> gT('Next century'),
+                                'selectTime'=> gT('Select time')
                         ),
                         'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                     )
diff --git a/application/views/admin/token/dummytokenform.php b/application/views/admin/token/dummytokenform.php
index a8bb8cda009..a64cd0a8460 100644
--- a/application/views/admin/token/dummytokenform.php
+++ b/application/views/admin/token/dummytokenform.php
@@ -97,7 +97,8 @@
                                         'prevDecade'=> gT('Previous decade'),
                                         'nextDecade'=> gT('Next decade'),
                                         'prevCentury'=> gT('Previous century'),
-                                        'nextCentury'=> gT('Next century')
+                                        'nextCentury'=> gT('Next century'),
+                                        'selectTime'=> gT('Select time')
                                     ),
                                     'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                                 )
@@ -126,7 +127,8 @@
                                         'prevDecade'=> gT('Previous decade'),
                                         'nextDecade'=> gT('Next decade'),
                                         'prevCentury'=> gT('Previous century'),
-                                        'nextCentury'=> gT('Next century')
+                                        'nextCentury'=> gT('Next century'),
+                                'selectTime'=> gT('Select time')
                                     ),
                                     'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                                 )
diff --git a/application/views/admin/token/token_bar.php b/application/views/admin/token/token_bar.php
index 0f6719013bf..e2d545c4463 100644
--- a/application/views/admin/token/token_bar.php
+++ b/application/views/admin/token/token_bar.php
@@ -1,6 +1,3 @@
-<?php
-App()->getClientScript()->registerPackage('jqueryui-timepicker');
-?>
 <div class='menubar surveybar' id="tokenbarid">
     <div class='row container-fluid'>
 
diff --git a/application/views/admin/token/tokenform.php b/application/views/admin/token/tokenform.php
index 778729e2de6..51e95009987 100644
--- a/application/views/admin/token/tokenform.php
+++ b/application/views/admin/token/tokenform.php
@@ -155,7 +155,8 @@
                                 'prevDecade'=> gT('Previous decade'),
                                 'nextDecade'=> gT('Next decade'),
                                 'prevCentury'=> gT('Previous century'),
-                                'nextCentury'=> gT('Next century')
+                                'nextCentury'=> gT('Next century'),
+                                'selectTime'=> gT('Select time')
                             ),
                             'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                         )
@@ -166,7 +167,8 @@
 
                 <label class="col-sm-2 control-label"  for='validuntil'><?php eT('Until:'); ?></label>
                 <div class="col-sm-2 has-feedback">
-                    <?php Yii::app()->getController()->widget('yiiwheels.widgets.datetimepicker.WhDateTimePicker', array(
+                    <?php
+                    Yii::app()->getController()->widget('yiiwheels.widgets.datetimepicker.WhDateTimePicker', array(
                         'name' => "validuntil",
                         'value' => isset($validuntil) ? $validuntil : '',
                         'pluginOptions' => array(
@@ -184,7 +186,9 @@
                                 'prevDecade'=> gT('Previous decade'),
                                 'nextDecade'=> gT('Next decade'),
                                 'prevCentury'=> gT('Previous century'),
-                                'nextCentury'=> gT('Next century')
+                                'nextCentury'=> gT('Next century'),
+                                'selectTime'=> gT('Select time')
+
                             ),
                             'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                         )
diff --git a/application/views/survey/questions/date/selector/answer.php b/application/views/survey/questions/date/selector/answer.php
index 6a6198e6be0..d4b10842e75 100644
--- a/application/views/survey/questions/date/selector/answer.php
+++ b/application/views/survey/questions/date/selector/answer.php
@@ -60,7 +60,8 @@ class='form-control'
                                 'prevDecade'=> gT('Previous decade'),
                                 'nextDecade'=> gT('Next decade'),
                                 'prevCentury'=> gT('Previous century'),
-                                'nextCentury'=> gT('Next century')
+                                'nextCentury'=> gT('Next century'),
+                                'selectTime'=> gT('Select time')
                             ),
                     'locale' => convertLStoDateTimePickerLocale($language),
                     'maxDate' => $maxdate,