TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #555 from paulwilde/upstream 

Couple more translation strings along with a typo fix.
This commit is contained in:
Samuel Georges 2014-08-16 14:33:50 +10:00
parent 96926256c2 2c46036d2c
commit d59c469a99
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/lang/en/lang.php
View File

@ -47,6 +47,7 @@ return [
'menu_label' => 'Dashboard',
'widget_label' => 'Widget',
'widget_width' => 'Width',
'full_width' => 'full width',
'add_widget' => 'Add widget',
'widget_inspector_title' => 'Widget configuration',
'widget_inspector_description' => 'Configure the report widget',
@ -163,6 +164,7 @@ return [
'select' => 'Select',
'select_all' => 'all',
'select_none' => 'none',
'select_placeholder' => 'please select',
'insert_row' => 'Insert Row',
'delete_row' => 'Delete Row'
],

2
modules/backend/widgets/ReportContainer.php
View File

@ -117,7 +117,7 @@ class ReportContainer extends WidgetBase
{
$sizes = [];
for ($i = 1; $i <= 10; $i++)
$sizes[$i] = $i < 10 ? $i : $i.' (full width)';
$sizes[$i] = $i < 10 ? $i : $i.' (' . Lang::get('backend::lang.dashboard.full_width') . ')';
$this->vars['sizes'] = $sizes;
$this->vars['widgets'] = WidgetManager::instance()->listReportWidgets();

2
modules/backend/widgets/reportcontainer/partials/_new_widget_popup.htm
View File

@ -10,7 +10,7 @@
<div class="modal-body">
<div class="form-group">
<label><?= e(trans('backend::lang.dashboard.widget_label')) ?></label>
<select class="form-control custom-select" name="className" data-placeholder="please select">
<select class="form-control custom-select" name="className" data-placeholder="<?= e(trans('backend::lang.form.select_placeholder')) ?>">
<option></option>
<?php foreach ($widgets as $className => $widgetInfo):?>
<option value="<?= e($className) ?>"><?= isset($widgetInfo['label']) ? e(trans($widgetInfo['label'])) : $className ?></option>

2
modules/system/controllers/RequestLogs.php
View File

@ -45,7 +45,7 @@ class RequestLogs extends Controller
public function onEmptyLog()
{
RequestLog::truncate();
Flash::success(Lang::get('system::lang.event_log.empty_success'));
Flash::success(Lang::get('system::lang.request_log.empty_success'));
return $this->listRefresh();
}