mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 14:18:27 +01:00
Merge pull request #4011 from humhub/fix/4004
Fix #4004: Missing translation strings
This commit is contained in:
Lucas Bartholemy
GitHub
commit
11ac8dd32c
@ -2,10 +2,11 @@ HumHub Change Log
|
||||
=================
|
||||
|
||||
|
||||
1.5.1 (April 16, 2020)
|
||||
1.5.1 (April 17, 2020)
|
||||
----------------------
|
||||
|
||||
- Fix #4001: LDAP user sync error
|
||||
- Fix #4004: Missing translation strings
|
||||
- Fix #4009: Yii queue error handling broken
|
||||
|
||||
|
||||
|
||||
@ -35,16 +35,16 @@ use yii\log\Logger;
|
||||
switch ($entry->level) {
|
||||
case Logger::LEVEL_INFO:
|
||||
$labelClass = 'label-info';
|
||||
$levelName = 'Info';
|
||||
$levelName = Yii::t('AdminModule.information', 'Info');
|
||||
break;
|
||||
case Logger::LEVEL_WARNING:
|
||||
$labelClass = 'label-warning';
|
||||
$levelName = 'Warning';
|
||||
$levelName = Yii::t('AdminModule.information', 'Warning');
|
||||
break;
|
||||
case Logger::LEVEL_ERROR:
|
||||
default:
|
||||
$labelClass = 'label-danger';
|
||||
$levelName = 'Error';
|
||||
$levelName = Yii::t('AdminModule.information', 'Error');
|
||||
}
|
||||
?>
|
||||
|
||||
@ -61,7 +61,8 @@ use yii\log\Logger;
|
||||
</ul>
|
||||
|
||||
<?php if ($pagination->totalCount): ?>
|
||||
<div class="pull-right"><?= Link::danger(Yii::t('AdminModule.information', 'Flush entries'))->post(['flush']) ?></div>
|
||||
<div
|
||||
class="pull-right"><?= Link::danger(Yii::t('AdminModule.information', 'Flush entries'))->post(['flush']) ?></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div style="text-align: center;">
|
||||
|
||||
@ -20,7 +20,7 @@ use yii\helpers\Url;
|
||||
<?= Yii::t('AdminModule.space', 'This overview contains a list of each space with actions to view, edit and delete spaces.'); ?>
|
||||
</div>
|
||||
|
||||
<br />
|
||||
<br/>
|
||||
<?php $form = ActiveForm::begin(['method' => 'get', 'action' => Url::to(['/admin/space'])]); ?>
|
||||
<div class="row">
|
||||
<div class="col-md-8">
|
||||
@ -46,13 +46,16 @@ use yii\helpers\Url;
|
||||
'columns' => [
|
||||
['class' => SpaceImageColumn::class],
|
||||
['class' => SpaceTitleColumn::class],
|
||||
'memberCount',
|
||||
[
|
||||
'attribute' => 'memberCount',
|
||||
'label' => Yii::t('SpaceModule.base', 'Members')
|
||||
],
|
||||
['class' => ImageColumn::class, 'userAttribute' => 'ownerUser'],
|
||||
[
|
||||
'attribute' => 'ownerUser.profile.lastname',
|
||||
'class' => DisplayNameColumn::class,
|
||||
'userAttribute' => 'ownerUser',
|
||||
'label' => 'Owner'
|
||||
'label' => Yii::t('SpaceModule.base', 'Owner')
|
||||
],
|
||||
['class' => SpaceActionColumn::class],
|
||||
],
|
||||
|
||||
@ -19,7 +19,7 @@ use humhub\widgets\GridView;
|
||||
'profile.firstname',
|
||||
'profile.lastname',
|
||||
[
|
||||
'header' => Yii::t('FriendshipModule.base', 'Actions'),
|
||||
'header' => Yii::t('base', 'Actions'),
|
||||
'class' => 'yii\grid\ActionColumn',
|
||||
'buttons' => [
|
||||
'update' => function () {
|
||||
|
||||
@ -18,7 +18,7 @@ use humhub\widgets\GridView;
|
||||
'profile.firstname',
|
||||
'profile.lastname',
|
||||
[
|
||||
'header' => 'Actions',
|
||||
'header' => Yii::t('base', 'Actions'),
|
||||
'class' => 'yii\grid\ActionColumn',
|
||||
'buttons' => [
|
||||
'update' => function ($url, $model) {
|
||||
|
||||
@ -19,7 +19,7 @@ use humhub\widgets\GridView;
|
||||
'profile.firstname',
|
||||
'profile.lastname',
|
||||
[
|
||||
'header' => 'Actions',
|
||||
'header' => Yii::t('base', 'Actions'),
|
||||
'class' => 'yii\grid\ActionColumn',
|
||||
'buttons' => [
|
||||
'update' => function () {
|
||||
|
||||
@ -24,27 +24,26 @@ use yii\helpers\Html;
|
||||
?>
|
||||
|
||||
|
||||
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading"><?= Yii::t('TopicModule.base', '<strong>Topic</strong> Overview'); ?></div>
|
||||
|
||||
<?php if($contentContainer instanceof Space) :?>
|
||||
<?php if ($contentContainer instanceof Space) : ?>
|
||||
<?= DefaultMenu::widget(['space' => $contentContainer]); ?>
|
||||
<?php elseif ($contentContainer instanceof User) : ?>
|
||||
<?= AccountSettingsMenu::widget()?>
|
||||
<?= AccountSettingsMenu::widget() ?>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="panel-body">
|
||||
|
||||
<?php $form = ActiveForm::begin(); ?>
|
||||
<div class="form-group">
|
||||
<div class="input-group">
|
||||
<?= Html::activeTextInput($addModel, 'name', ['style' => 'height:36px', 'class' => 'form-control', 'placeholder' => Yii::t('TopicModule.base', 'Add Topic') ]) ?>
|
||||
<span class="input-group-btn">
|
||||
<div class="form-group">
|
||||
<div class="input-group">
|
||||
<?= Html::activeTextInput($addModel, 'name', ['style' => 'height:36px', 'class' => 'form-control', 'placeholder' => Yii::t('TopicModule.base', 'Add Topic')]) ?>
|
||||
<span class="input-group-btn">
|
||||
<?= Button::defaultType()->icon('fa-plus')->loader()->submit() ?>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php ActiveForm::end(); ?>
|
||||
|
||||
<?= GridView::widget([
|
||||
@ -54,24 +53,24 @@ use yii\helpers\Html;
|
||||
'name',
|
||||
'sort_order',
|
||||
[
|
||||
'header' => 'Actions',
|
||||
'header' => Yii::t('base', 'Actions'),
|
||||
'class' => 'yii\grid\ActionColumn',
|
||||
'options' => ['width' => '80px'],
|
||||
'buttons' => [
|
||||
'update' => function($url, $model) use ($contentContainer) {
|
||||
'update' => function ($url, $model) use ($contentContainer) {
|
||||
/* @var $model \humhub\modules\topic\models\Topic */
|
||||
return ModalButton::primary()->load($contentContainer->createUrl('edit', ['id' => $model->id]))->icon('fa-pencil')->xs()->loader(false);
|
||||
},
|
||||
'view' => function($url, $model) use ($contentContainer) {
|
||||
'view' => function ($url, $model) use ($contentContainer) {
|
||||
/* @var $model \humhub\modules\topic\models\Topic */
|
||||
return Button::primary()->link($model->getUrl())->icon('fa-filter')->xs()->loader(false);
|
||||
},
|
||||
'delete' => function($url, $model) use ($contentContainer) {
|
||||
'delete' => function ($url, $model) use ($contentContainer) {
|
||||
/* @var $model \humhub\modules\topic\models\Topic */
|
||||
return Button::danger()->icon('fa-times')->action('topic.removeOverviewTopic', $contentContainer->createUrl('delete', ['id' => $model->id]))->confirm(
|
||||
Yii::t('TopicModule.base', '<strong>Confirm</strong> topic deletion'),
|
||||
Yii::t('TopicModule.base', 'Do you really want to delete this topic?'),
|
||||
Yii::t('base', 'Delete'))->xs()->loader(false);
|
||||
Yii::t('TopicModule.base', '<strong>Confirm</strong> topic deletion'),
|
||||
Yii::t('TopicModule.base', 'Do you really want to delete this topic?'),
|
||||
Yii::t('base', 'Delete'))->xs()->loader(false);
|
||||
},
|
||||
],
|
||||
],
|
||||
|
||||
@ -91,6 +91,9 @@ class Invite extends ActiveRecord
|
||||
{
|
||||
return [
|
||||
'email' => Yii::t('UserModule.invite', 'Email'),
|
||||
'created_at' => Yii::t('UserModule.base', 'Created at'),
|
||||
'source' => Yii::t('UserModule.base', 'Source'),
|
||||
'language' => Yii::t('base', 'Language'),
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@ namespace humhub\modules\user\widgets;
|
||||
use humhub\libs\Html;
|
||||
use humhub\modules\user\assets\PermissionGridModuleFilterAsset;
|
||||
use humhub\widgets\JsWidget;
|
||||
use Yii;
|
||||
|
||||
/**
|
||||
* Renders a dropdown in order to filter the permission overview by module.
|
||||
@ -33,7 +34,7 @@ class PermisionGridModuleFilter extends JsWidget
|
||||
public function run()
|
||||
{
|
||||
PermissionGridModuleFilterAsset::register($this->view);
|
||||
return Html::dropDownList('', [], ['all' => 'All'], $this->getOptions());
|
||||
return Html::dropDownList('', [], ['all' => Yii::t('base', 'All')], $this->getOptions());
|
||||
}
|
||||
|
||||
public function getData()
|
||||
@ -51,4 +52,4 @@ class PermisionGridModuleFilter extends JsWidget
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user