Fixed issue #10286: Missing translations in plugin manager

LimeSurvey · Feb 5, 2016 · 13d0ead · 13d0ead
1 parent 08f7d9f
commit 13d0ead
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/application/views/admin/pluginmanager/configure.php b/application/views/admin/pluginmanager/configure.php
@@ -14,9 +14,9 @@
             <div class='col-xs-6 col-sm-3'>&nbsp;</div>  <!-- Clear row -->
             <div class='col-sm-5'></div>
             <div class='col-sm-7'>
-                <button name='save' class='btn btn-success' type='submit'><span class='glyphicon glyphicon-ok'></span>&nbsp;Save</button>
-                <button name='redirect' value='" . App()->createUrl("admin/pluginmanager/sa/index") . "' class='btn btn-default' type='submit'><span class='glyphicon glyphicon-saved'></span>&nbsp;Save and close</button>
-                <a class='btn btn-danger' href='" . App()->createurl('admin/pluginmanager/sa/index') . "'>Close</a>
+                <button name='save' class='btn btn-success' type='submit'><span class='glyphicon glyphicon-ok'></span>&nbsp;".gT('Save')."</button>
+                <button name='redirect' value='" . App()->createUrl("admin/pluginmanager/sa/index") . "' class='btn btn-default' type='submit'><span class='glyphicon glyphicon-saved'></span>&nbsp;".gT('Save and close')."</button>
+                <a class='btn btn-danger' href='" . App()->createurl('admin/pluginmanager/sa/index') . "'>".gT('Close')."</a>
             </div>"
     ));
 ?>
diff --git a/application/views/admin/pluginmanager/index.php b/application/views/admin/pluginmanager/index.php
@@ -1,17 +1,18 @@
 <?php
 
 /**
- * Index view for plugin manager
- *
- * @since 2015-10-02
- * @author Olle Haerstedt
- */
+* Index view for plugin manager
+*
+* @since 2015-10-02
+* @author Olle Haerstedt
+*/
 
 ?>
+<?php $pageSize=Yii::app()->user->getState('pageSize',Yii::app()->params['defaultPageSize']);?>
 
 <h3 class="pagetitle"><?php eT('Plugin manager'); ?></h3>
 <div style="width: 75%; margin: auto;">
-<?php
+    <?php
     /* @var $this ConfigController */
     /* @var $dataProvider CActiveDataProvider */
 
@@ -65,20 +66,26 @@
         ),
     );
 
-        /*
-            array(            // display a column with "view", "update" and "delete" buttons
-            'class' => 'CallbackColumn',
-            'label' => function($data) { return ($data->active == 1) ? "deactivate": "activate"; },
-            'url' => function($data) { return array("/plugins/activate", "id"=>$data["id"]); }
-        )
+    /*
+    array(            // display a column with "view", "update" and "delete" buttons
+    'class' => 'CallbackColumn',
+    'label' => function($data) { return ($data->active == 1) ? "deactivate": "activate"; },
+    'url' => function($data) { return array("/plugins/activate", "id"=>$data["id"]); }
+    )
     );
-        */
+    */
 
     $this->widget('bootstrap.widgets.TbGridView', array(
         'dataProvider'=>$dataProvider,
+        'summaryText'=>gT('Displaying {start}-{end} of {count} result(s).') .' '.sprintf(gT('%s rows per page'),
+            CHtml::dropDownList(
+                'pageSize',
+                $pageSize,
+                Yii::app()->params['pageSizeOptions'],
+                array('class'=>'changePageSize form-control', 'style'=>'display: inline; width: auto'))),
         'columns'=>$gridColumns,
         'rowCssClassExpression'=> function ($data, $row) { return ($row % 2 ? 'even' : 'odd') . ' ' . ($data['new']==1 ? "new" : "old"); },
         'itemsCssClass' => 'items table-condensed table-bordered'
     ));
-?>
+    ?>
 </div>