Multilang: Translate size combo items

This commit is contained in:
2015-06-28 14:12:39 +02:00
parent f1cfa129f2
commit 108ce3ccb2
6 changed files with 25 additions and 8 deletions

View File

@@ -62,7 +62,7 @@ $formFields="";
$formFields.=RenderFieldInfo(MultiLang::GetString("Scanner"),$Scanner["ScanModel"]);
$formFields.=RenderFieldCombo(MultiLang::GetString("Resolution"),"ddlResolution",$Resolutions,$Resolution);
$formFields.=RenderFieldCombo(MultiLang::GetString("Format"),"ddlFormat",$Formats,$Format);
$formFields.=RenderFieldCombo(MultiLang::GetString("Size"),"ddlSize",$Sizes,$Size);
$formFields.=RenderFieldCombo(MultiLang::GetString("Size"),"ddlSize",MultiLang::ApplyArrayKeys($Sizes),$Size);
//$formFields.=RenderFieldCheckText("Cropping","chkCrop",$Crop,"txtCropFuzz",$CropFuzz);
$formFields.=RenderFieldButton("","btnScan",MultiLang::GetString("Scan"),"Element_SetVisibility('divLoadBack',true);");
$formFields.=RenderHidden("hidScanDevice",$Scanner["ScanDevice"]);

View File

@@ -54,5 +54,12 @@ class MultiLang {
return $lang;
}
public static function ApplyArrayKeys($array){
$arrayTranslated=array();
foreach ($array as $key => $value) {
$arrayTranslated[MultiLang::GetString($key)]=$value;
}
return $arrayTranslated;
}
}
################################

View File

@@ -65,11 +65,11 @@ function RenderCombo($id,$options,$selected){
$valueFixed=htmlentities($value,ENT_HTML5, "UTF-8");
if($value==$selected){
$render.='<option value="'.$valueFixed.
'" title="'.$valueFixed.'" selected >'.
'" title="'.$keyFixed.'" selected >'.
$keyFixed."</option>/n";
}else{
$render.='<option value="'.$valueFixed.
'" title="'.$valueFixed.'">'.
'" title="'.$keyFixed.'">'.
$keyFixed."</option>/n";
}
}