Skip to content

Commit

Permalink
Dev Added translations for datetimepicker popup buttons
Browse files Browse the repository at this point in the history
Dev Removed obsolete libraries
  • Loading branch information
c-schmitz committed Apr 27, 2016
1 parent 23c5254 commit f50e9ef
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 30 deletions.
14 changes: 0 additions & 14 deletions application/config/third_party.php
Expand Up @@ -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/',
Expand Down
3 changes: 2 additions & 1 deletion application/controllers/admin/dataentry.php
Expand Up @@ -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'])
)
Expand Down
3 changes: 2 additions & 1 deletion application/views/admin/dataentry/content_view.php
Expand Up @@ -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'])
)
Expand Down
Expand Up @@ -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'])
)
Expand Down Expand Up @@ -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'])
Expand Down Expand Up @@ -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'])
)
Expand Down
Expand Up @@ -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'])
)
Expand Down Expand Up @@ -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'])
)
Expand Down
6 changes: 4 additions & 2 deletions application/views/admin/token/dummytokenform.php
Expand Up @@ -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'])
)
Expand Down Expand Up @@ -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'])
)
Expand Down
3 changes: 0 additions & 3 deletions 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'>

Expand Down
10 changes: 7 additions & 3 deletions application/views/admin/token/tokenform.php
Expand Up @@ -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'])
)
Expand All @@ -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(
Expand All @@ -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'])
)
Expand Down
3 changes: 2 additions & 1 deletion application/views/survey/questions/date/selector/answer.php
Expand Up @@ -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,
Expand Down

0 comments on commit f50e9ef

Please sign in to comment.