JcDenis/translater
1
0
Fork 0
Code Issues 3 Pull Requests Releases 3 Activity

use Date helper

Browse Source
This commit is contained in:
Jean-Christian Paul Denis 2023-04-23 23:58:51 +02:00
parent 4cfd2a398e
commit caa46c59a2
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Manage.php
View File

@ -31,9 +31,9 @@ use Dotclear\Helper\Html\Form\{
Submit, Submit,
Text Text
}; };
use Dotclear\Helper\Date;
use Dotclear\Helper\Html\Html; use Dotclear\Helper\Html\Html;
use Exception; use Exception;
use dt;
class Manage extends dcNsProcess class Manage extends dcNsProcess
{ {
@ -204,7 +204,7 @@ class Manage extends dcNsProcess
$res = ''; $res = '';
$modules = $current->translater->getModules($current->type); $modules = $current->translater->getModules($current->type);
ksort($modules); uasort($modules, fn ($a, $b) => strtolower($a->name) <=> strtolower($b->name));
foreach ($modules as $module) { foreach ($modules as $module) {
if ($current->translater->hide_default && in_array($module->id, My::defaultDistribModules($current->type))) { if ($current->translater->hide_default && in_array($module->id, My::defaultDistribModules($current->type))) {
continue; continue;
@ -310,7 +310,7 @@ class Manage extends dcNsProcess
echo echo
'<td class="nowrap">' . count($backups[$code_id]) . '</td>' . '<td class="nowrap">' . count($backups[$code_id]) . '</td>' .
'<td class="nowrap"> ' . '<td class="nowrap"> ' .
dt::str('%Y-%m-%d %H:%M', (int) $time[$code_id], (string) dcCore::app()->blog?->settings->get('system')->get('blog_timezone')) . Date::str('%Y-%m-%d %H:%M', (int) $time[$code_id], (string) dcCore::app()->blog?->settings->get('system')->get('blog_timezone')) .
'</td>'; '</td>';
} else { } else {
echo '<td class="nowrap">' . __('no backups') . '</td><td class="maximal nowrap">-</td>'; echo '<td class="nowrap">' . __('no backups') . '</td><td class="maximal nowrap">-</td>';
@ -332,7 +332,7 @@ class Manage extends dcNsProcess
(new Submit('do-action'))->value(__('ok')), (new Submit('do-action'))->value(__('ok')),
dcCore::app()->formNonce(false), dcCore::app()->formNonce(false),
], ],
dcCore::app()->adminurl?->hiddenFormFields( is_null(dcCore::app()->adminurl) ? [] : dcCore::app()->adminurl->hiddenFormFields(
My::id(), My::id(),
['type' => $current->module->type, 'module' => $current->module->id] ['type' => $current->module->type, 'module' => $current->module->id]
) )
@ -376,7 +376,7 @@ class Manage extends dcNsProcess
$form_id, $form_id,
$backup_code['name'], $backup_code['name'],
$backup_code['code'], $backup_code['code'],
dt::str( Date::str(
dcCore::app()->blog?->settings->get('system')->get('date_format') . ' ' . dcCore::app()->blog?->settings->get('system')->get('time_format'), dcCore::app()->blog?->settings->get('system')->get('date_format') . ' ' . dcCore::app()->blog?->settings->get('system')->get('time_format'),
(int) $backup_code['time'], (int) $backup_code['time'],
dcCore::app()->blog?->settings->get('system')->get('blog_timezone') dcCore::app()->blog?->settings->get('system')->get('blog_timezone')
@ -401,7 +401,7 @@ class Manage extends dcNsProcess
(new Submit('do-action'))->value(__('ok')), (new Submit('do-action'))->value(__('ok')),
dcCore::app()->formNonce(false), dcCore::app()->formNonce(false),
], ],
dcCore::app()->adminurl?->hiddenFormFields( is_null(dcCore::app()->adminurl) ? [] : dcCore::app()->adminurl->hiddenFormFields(
My::id(), My::id(),
['type' => $current->module->type, 'module' => $current->module->id] ['type' => $current->module->type, 'module' => $current->module->id]
) )
@ -437,7 +437,7 @@ class Manage extends dcNsProcess
(new Submit(['save']))->value(__('Create')), (new Submit(['save']))->value(__('Create')),
dcCore::app()->formNonce(false), dcCore::app()->formNonce(false),
], ],
dcCore::app()->adminurl?->hiddenFormFields( is_null(dcCore::app()->adminurl) ? [] : dcCore::app()->adminurl->hiddenFormFields(
My::id(), My::id(),
['type' => $current->module->type, 'module' => $current->module->id, 'action' => 'module_add_code'] ['type' => $current->module->type, 'module' => $current->module->id, 'action' => 'module_add_code']
) )
@ -458,7 +458,7 @@ class Manage extends dcNsProcess
(new Submit(['save']))->value(__('Import')), (new Submit(['save']))->value(__('Import')),
dcCore::app()->formNonce(false), dcCore::app()->formNonce(false),
], ],
dcCore::app()->adminurl?->hiddenFormFields( is_null(dcCore::app()->adminurl) ? [] : dcCore::app()->adminurl->hiddenFormFields(
My::id(), My::id(),
['type' => $current->module->type, 'module' => $current->module->id, 'action' => 'module_import_pack'] ['type' => $current->module->type, 'module' => $current->module->id, 'action' => 'module_import_pack']
) )
@ -604,7 +604,7 @@ class Manage extends dcNsProcess
dcCore::app()->formNonce(false), dcCore::app()->formNonce(false),
(new Hidden(['code'], $current->lang->code)), (new Hidden(['code'], $current->lang->code)),
], ],
dcCore::app()->adminurl?->hiddenFormFields( is_null(dcCore::app()->adminurl) ? [] : dcCore::app()->adminurl->hiddenFormFields(
My::id(), My::id(),
['type' => $current->module?->type, 'module' => $current->module?->id, 'lang' => $current->lang->code, 'action' => 'module_update_code'] ['type' => $current->module?->type, 'module' => $current->module?->id, 'lang' => $current->lang->code, 'action' => 'module_update_code']
) )

8
src/TranslaterModule.php
View File

@ -16,6 +16,7 @@ namespace Dotclear\Plugin\translater;
use dcCore; use dcCore;
use dcModuleDefine; use dcModuleDefine;
use Dotclear\Helper\Date;
use Dotclear\Helper\File\Files; use Dotclear\Helper\File\Files;
use Dotclear\Helper\File\Path; use Dotclear\Helper\File\Path;
use Dotclear\Helper\File\Zip\Unzip; use Dotclear\Helper\File\Zip\Unzip;
@ -23,7 +24,6 @@ use Dotclear\Helper\File\Zip\Zip;
use Dotclear\Helper\Html\Html; use Dotclear\Helper\Html\Html;
use Dotclear\Helper\L10n; use Dotclear\Helper\L10n;
use Exception; use Exception;
use dt;
/** /**
* Translater tools. * Translater tools.
@ -400,7 +400,7 @@ class TranslaterModule
$zip->addFile($from, $to); $zip->addFile($from, $to);
} }
$filename = Files::tidyFileName(dt::str(str_replace( $filename = Files::tidyFileName(Date::str(str_replace(
['timestamp', 'module', 'type', 'version'], ['timestamp', 'module', 'type', 'version'],
[time(), $this->id, $this->type, $this->version], [time(), $this->id, $this->type, $this->version],
$this->translater->export_filename $this->translater->export_filename
@ -683,7 +683,7 @@ class TranslaterModule
if ($this->translater->parse_comment) { if ($this->translater->parse_comment) {
$content .= '# Language: ' . $lang->name . "\n" . $content .= '# Language: ' . $lang->name . "\n" .
'# Module: ' . $this->id . ' - ' . $this->version . "\n" . '# Module: ' . $this->id . ' - ' . $this->version . "\n" .
'# Date: ' . dt::str('%Y-%m-%d %H:%M:%S') . "\n"; '# Date: ' . Date::str('%Y-%m-%d %H:%M:%S') . "\n";
if ($this->translater->parse_user && $this->translater->parse_userinfo != '') { if ($this->translater->parse_user && $this->translater->parse_userinfo != '') {
$search = My::defaultUserInformations(); $search = My::defaultUserInformations();
@ -775,7 +775,7 @@ class TranslaterModule
if ($this->translater->parse_comment) { if ($this->translater->parse_comment) {
$content .= '// Language: ' . $lang->name . "\n" . $content .= '// Language: ' . $lang->name . "\n" .
'// Module: ' . $this->id . ' - ' . $this->version . "\n" . '// Module: ' . $this->id . ' - ' . $this->version . "\n" .
'// Date: ' . dt::str('%Y-%m-%d %H:%M:%S') . "\n"; '// Date: ' . Date::str('%Y-%m-%d %H:%M:%S') . "\n";
if ($this->translater->parse_user && !empty($this->translater->parse_userinfo)) { if ($this->translater->parse_user && !empty($this->translater->parse_userinfo)) {
$search = My::defaultUserInformations(); $search = My::defaultUserInformations();