JcDenis/translater
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

define locales folder name

Browse source
This commit is contained in:
Jean-Christian Denis 2023-03-18 00:36:11 +01:00
parent 53557a94d9
commit 56862d5eb4
Signed by: JcDenis
GPG key ID: 1B5B8C5B90B6C951
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/My.php
View file

@ -21,9 +21,12 @@ use dcCore;
*/ */
class My class My
{ {
// required php version /** @var string Required php version */
public const PHP_MIN = '8.1'; public const PHP_MIN = '8.1';
/** @var string Locales folder name */
public const LOCALES_FOLDER = 'locales';
/** /**
* This module id * This module id
*/ */

12
src/TranslaterModule.php
View file

@ -69,7 +69,7 @@ class TranslaterModule
$this->version = $define->get('version'); $this->version = $define->get('version');
$this->root_writable = $define->get('root_writable'); $this->root_writable = $define->get('root_writable');
$this->root = path::real($define->get('root')); $this->root = path::real($define->get('root'));
$this->locales = $this->root . DIRECTORY_SEPARATOR . 'locales'; $this->locales = $this->root . DIRECTORY_SEPARATOR . My::LOCALES_FOLDER;
} }
/// @name backup methods /// @name backup methods
@ -120,8 +120,8 @@ class TranslaterModule
case 'translater': case 'translater':
$tmp = path::real(dcCore::app()->plugins->moduleRoot(My::id())); $tmp = path::real(dcCore::app()->plugins->moduleRoot(My::id()));
if ($tmp && is_writable($tmp)) { if ($tmp && is_writable($tmp)) {
@mkDir($tmp . '/locales'); @mkDir($tmp . DIRECTORY_SEPARATOR . My::LOCALES_FOLDER);
$dir = $tmp . '/locales'; $dir = $tmp . DIRECTORY_SEPARATOR . My::LOCALES_FOLDER;
} }
break; break;
@ -421,7 +421,7 @@ class TranslaterModule
*/ */
public function parseZipFilename(string $file = '', bool $throw = false): array public function parseZipFilename(string $file = '', bool $throw = false): array
{ {
$is_file = preg_match('/^(.*?)\/locales\/(.*?)\/(.*?)(.po|.lang.php)$/', $file, $f); $is_file = preg_match('/^(.*?)\/' . preg_quote(My::LOCALES_FOLDER) . '\/(.*?)\/(.*?)(.po|.lang.php)$/', $file, $f);
if ($is_file) { if ($is_file) {
$module = $f[1] == $this->id ? $f[1] : false; $module = $f[1] == $this->id ? $f[1] : false;
@ -462,11 +462,11 @@ class TranslaterModule
{ {
$res = []; $res = [];
$prefix = preg_match('/(locales(.*))$/', $this->locales) ? 'locales' : ''; $prefix = preg_match('/(' . preg_quote(My::LOCALES_FOLDER) . '(.*))$/', $this->locales) ? My::LOCALES_FOLDER : '';
$files = Translater::scandir($this->locales); $files = Translater::scandir($this->locales);
foreach ($files as $file) { foreach ($files as $file) {
if (!preg_match('/.*?locales\/([^\/]*?)\/([^\/]*?)(.lang.php|.po)$/', $prefix . $file, $m)) { if (!preg_match('/.*?' . preg_quote(My::LOCALES_FOLDER) . '\/([^\/]*?)\/([^\/]*?)(.lang.php|.po)$/', $prefix . $file, $m)) {
continue; continue;
} }