franzz/objects
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use mask class on every page & add paramaters to translations

Browse Source
This commit is contained in:
Franzz
2019-10-19 18:26:12 +02:00
parent 734f04dba2
commit 181baffbe3
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
inc/main.php
View File

@@ -125,7 +125,9 @@ abstract class Main extends PhpObject
$asPages = array_values($this->asMasks);
foreach($asPages as $sPage)
{
$sPageContent = $this->getPageContent($sPage);
//$sPageContent = $this->getPageContent($sPage);
$oMask = new Mask($sPage, $this->oLang);
$sPageContent = $oMask->getMask();
if($sPage!=$sMainPage) $asGlobalVars['consts']['pages'][$sPage] = $sPageContent;
}
@@ -160,7 +162,13 @@ abstract class Main extends PhpObject
public static function getJsonResult($bSuccess, $sDesc, $asVars=array())
{
header('Content-type: application/json');
return json_encode(array('result'=>$bSuccess?self::SUCCESS:self::ERROR, 'desc'=>$sDesc, 'data'=>$asVars));
$asResult = self::getResult($bSuccess, $sDesc, $asVars);
$asResult['result'] = $asResult['result']?self::SUCCESS:self::ERROR;
return json_encode($asResult);
}
public static function getResult($bSuccess, $sDesc, $asVars) {
return array('result'=>$bSuccess, 'desc'=>$sDesc, 'data'=>$asVars);
}
public static function goTo403() {

11
inc/translator.php
View File

@@ -34,8 +34,12 @@ class Translator extends PhpObject
$this->sDefaultLang = $sDefaultLang;
$this->sLang = ($sLang=='')?ToolBox::getUserLanguage($this->asLanguages, $this->sDefaultLang):$sLang;
}
public function getLanguage() {
return $this->sLang;
}
public function getTranslation($sTransKey='', $sLang='')
public function getTranslation($sTransKey='', $asParams=array(), $sLang='')
{
$oTransText = false;
@@ -55,6 +59,11 @@ class Translator extends PhpObject
}
else $this->addWarning($bAllTrans?'Missing language "'.$sLang.'"':'Missing translation in "'.$sLang.'" for the key "'.$sTransKey.'"');
if(is_string($asParams)) $asParams = array($asParams);
if($oTransText && !$bAllTrans && !empty($asParams)) {
foreach($asParams as $iIndex=>$sParam) $oTransText = str_replace('$'.$iIndex, $sParam, $oTransText);
}
return $oTransText;
}