Jingga/oms-Exchange
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Exchange.git synced 2026-02-13 00:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

many fixes and expands and module expansions

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-04-04 17:10:52 +02:00
parent a680e4e30f
commit 562cfff657
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Controller/ApiController.php
View File

@ -22,6 +22,7 @@ use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel; use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Message\Http\HttpResponse;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\System\File\Local\Directory; use phpOMS\System\File\Local\Directory;
use phpOMS\System\MimeType; use phpOMS\System\MimeType;
@ -147,7 +148,7 @@ final class ApiController extends Controller
* Api method to export data * Api method to export data
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param HttpResponse $response Response
* @param mixed $data Generic data * @param mixed $data Generic data
* *
* @return void * @return void
@ -156,7 +157,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiExchangeExport(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiExchangeExport(RequestAbstract $request, HttpResponse $response, $data = null) : void
{ {
$export = $this->exportDataFromRequest($request); $export = $this->exportDataFromRequest($request);
foreach ($export['logs'] as $log) { foreach ($export['logs'] as $log) {

5
Interfaces/OMS/Exporter.php
View File

@ -164,6 +164,7 @@ final class Exporter extends ExporterAbstract
} }
// search for translations in tpl files which are not included in the language fieles // search for translations in tpl files which are not included in the language fieles
$tplKeys = [];
foreach ($themes as $theme) { foreach ($themes as $theme) {
if (!\is_dir($themePath . $theme) || $theme === '.' || $theme === '..') { if (!\is_dir($themePath . $theme) || $theme === '.' || $theme === '..') {
continue; continue;
@ -184,6 +185,7 @@ final class Exporter extends ExporterAbstract
\preg_match_all('/(\$this\->getHtml\(\')([a-zA-Z:]+)(\'\))/', $template, $keys, \PREG_PATTERN_ORDER); \preg_match_all('/(\$this\->getHtml\(\')([a-zA-Z:]+)(\'\))/', $template, $keys, \PREG_PATTERN_ORDER);
foreach ($keys[2] ?? [] as $key) { foreach ($keys[2] ?? [] as $key) {
$tplKeys[\trim($module, '/')][\trim($theme, '/')][''][$key]['en'] = '';
if (!isset($languageArray[''][\trim($module, '/')][\trim($theme, '/')][$key])) { if (!isset($languageArray[''][\trim($module, '/')][\trim($theme, '/')][$key])) {
$languageArray[\trim($module, '/')][\trim($theme, '/')][''][$key]['en'] = ''; $languageArray[\trim($module, '/')][\trim($theme, '/')][''][$key]['en'] = '';
} }
@ -199,7 +201,8 @@ final class Exporter extends ExporterAbstract
foreach ($themes as $theme => $files) { foreach ($themes as $theme => $files) {
foreach ($files as $file => $keys) { foreach ($files as $file => $keys) {
foreach ($keys as $key => $value) { foreach ($keys as $key => $value) {
$content .= "\n\"" . $module . '";"' . $theme . '";"' . $file . '";"' . $key . '"'; $content .= "\n\"" . $module . '";"' . $theme . '";"' . $file . '";"';
$content .= (!isset($tplKeys[$module][$theme]['']) ? '*' : '') . $key . '"';
foreach ($supportedLanguages as $language) { foreach ($supportedLanguages as $language) {
$content .= ';"' . ($value[$language] ?? '') . '"'; $content .= ';"' . ($value[$language] ?? '') . '"';

2
Interfaces/OMS/Importer.php
View File

@ -198,6 +198,8 @@ final class Importer extends ImporterAbstract
\ksort($keys); \ksort($keys);
foreach ($keys as $key => $values) { foreach ($keys as $key => $values) {
$key = \ltrim($key, '*');
\fwrite($fp, \fwrite($fp,
" '" . $key . "'" " '" . $key . "'"
. \str_repeat(' ', $keyLengths[$module][$theme][$file] - \strlen($key)) . \str_repeat(' ', $keyLengths[$module][$theme][$file] - \strlen($key))