improve localization output

This commit is contained in:
Dennis Eichhorn 2020-06-10 22:29:28 +02:00
parent cc94670c6f
commit bef2e01386
3 changed files with 21 additions and 16 deletions

View File

@ -28,7 +28,7 @@ return ['Tasks' => [
'Due/Priority' => 'Fällig/Priorität', 'Due/Priority' => 'Fällig/Priorität',
'Forward' => 'Weiterleiten', 'Forward' => 'Weiterleiten',
'Forwarded' => 'Weitergeleitet', 'Forwarded' => 'Weitergeleitet',
'ForwardedTo' => 'Weiterleiten an', 'forwarded_to' => 'hat weitergeleitet an',
'From' => 'Von', 'From' => 'Von',
'Group' => 'Gruppe', 'Group' => 'Gruppe',
'History' => 'Übersicht', 'History' => 'Übersicht',
@ -62,6 +62,7 @@ return ['Tasks' => [
'Size' => 'Größe', 'Size' => 'Größe',
'Statistics' => 'Statistiken', 'Statistics' => 'Statistiken',
'Status' => 'Status', 'Status' => 'Status',
'status_change' => '%s hat den Status am %s geändert zu',
'Task' => 'Task', 'Task' => 'Task',
'Tasks' => 'Tasks', 'Tasks' => 'Tasks',
'Template' => 'Template', 'Template' => 'Template',

View File

@ -28,7 +28,7 @@ return ['Tasks' => [
'Due/Priority' => 'Due/Priority', 'Due/Priority' => 'Due/Priority',
'Forward' => 'Forward', 'Forward' => 'Forward',
'Forwarded' => 'Forwarded', 'Forwarded' => 'Forwarded',
'ForwardedTo' => 'Forwarded to', 'forwarded_to' => 'forwarded to',
'From' => 'From', 'From' => 'From',
'Group' => 'Group', 'Group' => 'Group',
'History' => 'History', 'History' => 'History',
@ -62,6 +62,7 @@ return ['Tasks' => [
'Size' => 'Size', 'Size' => 'Size',
'Statistics' => 'Statistics', 'Statistics' => 'Statistics',
'Status' => 'Status', 'Status' => 'Status',
'status_change' => '%s changed the status on %s to',
'Task' => 'Task', 'Task' => 'Task',
'Tasks' => 'Tasks', 'Tasks' => 'Tasks',
'Template' => 'Template', 'Template' => 'Template',

View File

@ -12,13 +12,14 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use \Modules\Tasks\Models\AccountRelation; use Modules\Tasks\Models\AccountRelation;
use \Modules\Tasks\Models\GroupRelation; use Modules\Tasks\Models\GroupRelation;
use \Modules\Tasks\Models\TaskPriority; use Modules\Tasks\Models\TaskPriority;
use \Modules\Tasks\Models\TaskStatus; use Modules\Tasks\Models\TaskStatus;
use phpOMS\Uri\UriFactory;
/** @var \Modules\Tasks\Views\TaskView $this */ /** @var Modules\Tasks\Views\TaskView $this */
/** @var \Modules\Tasks\Models\Task $task */ /** @var Modules\Tasks\Models\Task $task */
$task = $this->getData('task'); $task = $this->getData('task');
$taskMedia = $task->getMedia(); $taskMedia = $task->getMedia();
$elements = $task->getTaskElements(); $elements = $task->getTaskElements();
@ -35,7 +36,7 @@ echo $this->getData('nav')->render(); ?>
data-update-tpl="#headTpl, #contentTpl" data-update-tpl="#headTpl, #contentTpl"
data-tag="form" data-tag="form"
data-method="POST" data-method="POST"
data-uri="<?= \phpOMS\Uri\UriFactory::build('{/api}task?id={?id}&csrf={$CSRF}'); ?>"> data-uri="<?= UriFactory::build('{/api}task?id={?id}&csrf={$CSRF}'); ?>">
<?php if ($task->isEditable()) : ?> <?php if ($task->isEditable()) : ?>
<template id="headTpl"> <template id="headTpl">
<h1 class="task-title"><input type="text" data-tpl-text="/title" data-tpl-value="/title" data-value="" name="title" autocomplete="off"></h1> <h1 class="task-title"><input type="text" data-tpl-text="/title" data-tpl-value="/title" data-value="" name="title" autocomplete="off"></h1>
@ -120,7 +121,7 @@ echo $this->getData('nav')->render(); ?>
data-update-element=".taskElement .taskElement-content" data-update-element=".taskElement .taskElement-content"
data-tag="form" data-tag="form"
data-method="POST" data-method="POST"
data-uri="<?= \phpOMS\Uri\UriFactory::build('{/api}task/element?{?}&csrf={$CSRF}'); ?>"> data-uri="<?= UriFactory::build('{/api}task/element?{?}&csrf={$CSRF}'); ?>">
<div class="inner pAlignTable"> <div class="inner pAlignTable">
<div class="vC wf-100"> <div class="vC wf-100">
<span data-tpl-text="{/base}/api/task/element?id={$id}" data-tpl-text-path="/0/response/createdBy/name/0"></span> <span data-tpl-text="{/base}/api/task/element?id={$id}" data-tpl-text-path="/0/response/createdBy/name/0"></span>
@ -175,9 +176,11 @@ echo $this->getData('nav')->render(); ?>
) : ?> ) : ?>
<section class="box wf-100"> <section class="box wf-100">
<div class="inner"> <div class="inner">
Status change by <?= $this->printHtml($element->getCreatedBy()->getName1()); ?> <?= $this->printHtml(\sprintf($this->getHtml('status_change'),
on <?= $this->printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?> $element->getCreatedBy()->getName1(),
to <span class="tag task-status-<?= $this->printHtml($element->getStatus()); ?>"> $element->getCreatedAt()->format('Y-m-d H:i')
)); ?>
<span class="tag task-status-<?= $this->printHtml($element->getStatus()); ?>">
<?= $this->getHtml('S' . $element->getStatus()) ?> <?= $this->getHtml('S' . $element->getStatus()) ?>
</span> </span>
</div> </div>
@ -190,7 +193,7 @@ echo $this->getData('nav')->render(); ?>
data-update-element=".taskElement .taskElement-content" data-update-element=".taskElement .taskElement-content"
data-tag="form" data-tag="form"
data-method="POST" data-method="POST"
data-uri="<?= \phpOMS\Uri\UriFactory::build('{/api}task/element?{?}&csrf={$CSRF}'); ?>"> data-uri="<?= UriFactory::build('{/api}task/element?{?}&csrf={$CSRF}'); ?>">
<div class="portlet-head"> <div class="portlet-head">
<div class="row middle-xs"> <div class="row middle-xs">
<span class="col-xs-0"> <span class="col-xs-0">
@ -267,7 +270,7 @@ echo $this->getData('nav')->render(); ?>
) : ?> ) : ?>
<section class="box wf-100"> <section class="box wf-100">
<div class="inner"> <div class="inner">
<?= $this->getHtml('ForwardedTo') ?> <?= $this->printHtml($element->getCreatedBy()->getName1()); ?> <?= $this->getHtml('forwarded_to') ?>
<?php foreach ($tos as $to) : ?> <?php foreach ($tos as $to) : ?>
<?php if ($to instanceof AccountRelation) : ?> <?php if ($to instanceof AccountRelation) : ?>
<a href="<?= phpOMS\Uri\UriFactory::build('{/prefix}profile/single?{?}&for=' . $to->getRelation()->getId()) ?>"><?= $this->printHtml($to->getRelation()->getName1()); ?></a> <a href="<?= phpOMS\Uri\UriFactory::build('{/prefix}profile/single?{?}&for=' . $to->getRelation()->getId()) ?>"><?= $this->printHtml($to->getRelation()->getName1()); ?></a>
@ -286,7 +289,7 @@ echo $this->getData('nav')->render(); ?>
<div class="portlet"> <div class="portlet">
<form <form
id="taskElementCreate" method="PUT" id="taskElementCreate" method="PUT"
action="<?= \phpOMS\Uri\UriFactory::build('{/api}task/element?{?}&csrf={$CSRF}'); ?>" action="<?= UriFactory::build('{/api}task/element?{?}&csrf={$CSRF}'); ?>"
data-add-content="#elements" data-add-content="#elements"
data-add-element=".taskElement-content" data-add-element=".taskElement-content"
data-add-tpl="#elementTpl" data-add-tpl="#elementTpl"