mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-23 06:44:38 +02:00
Code Issues Releases Wiki Activity

Fix issue where wrong directory separator slash could end up in language translation files

Browse Source
This commit is contained in:
Ryan Cramer
2019-12-27 15:57:12 -05:00
parent 7d4ef4b786
commit e7c9a1b79f
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wire/modules/LanguageSupport/LanguageTranslator.php
View File

@@ -138,11 +138,15 @@ class LanguageTranslator extends Wire {
foreach($translations as $hash => $translation) { foreach($translations as $hash => $translation) {
if(!strlen($translation['text'])) unset($translations[$hash]); if(!strlen($translation['text'])) unset($translations[$hash]);
} }
if(strpos($file, "\\") !== false && strpos($file, "\\" . basename($file))) {
// file has MS-DOS style slashes and they are not escapes, convert to unix
$file = str_replace("\\", '/', $file);
}
return array( return array(
'file' => $file, 'file' => $file,
'textdomain' => $textdomain, 'textdomain' => $textdomain,
'translations' => $translations 'translations' => $translations
); );
} }
/** /**
@@ -257,9 +261,13 @@ class LanguageTranslator extends Wire {
*/ */
protected function textdomainString($textdomain) { protected function textdomainString($textdomain) {
if(is_string($textdomain) && (strpos($textdomain, DIRECTORY_SEPARATOR) !== false || strpos($textdomain, '/') !== false)) $textdomain = $this->filenameToTextdomain($textdomain); // @werker #424 if(is_string($textdomain) && (strpos($textdomain, DIRECTORY_SEPARATOR) !== false || strpos($textdomain, '/') !== false)) {
else if(is_object($textdomain)) $textdomain = $this->objectToTextdomain($textdomain); $textdomain = $this->filenameToTextdomain($textdomain); // @werker #424
else $textdomain = strtolower($textdomain); } else if(is_object($textdomain)) {
$textdomain = $this->objectToTextdomain($textdomain);
} else {
$textdomain = strtolower($textdomain);
}
// just in case there is an extension on it, remove it // just in case there is an extension on it, remove it
if(strpos($textdomain, '.')) $textdomain = basename($textdomain, '.json'); if(strpos($textdomain, '.')) $textdomain = basename($textdomain, '.json');