diff --git a/code/main.php b/code/main.php index fd14ecb..251af36 100644 --- a/code/main.php +++ b/code/main.php @@ -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"]); diff --git a/code/multilang.php b/code/multilang.php index c1a7fc9..ba1a714 100644 --- a/code/multilang.php +++ b/code/multilang.php @@ -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; + } } ################################ diff --git a/code/ui.php b/code/ui.php index b84226e..6b13676 100644 --- a/code/ui.php +++ b/code/ui.php @@ -65,11 +65,11 @@ function RenderCombo($id,$options,$selected){ $valueFixed=htmlentities($value,ENT_HTML5, "UTF-8"); if($value==$selected){ $render.='/n"; }else{ $render.='/n"; } } diff --git a/config.php b/config.php index 2133630..26f4adc 100644 --- a/config.php +++ b/config.php @@ -18,11 +18,11 @@ $FinalDestDir = "/store/Escaneos/"; // Resolution $Resolutions=array( - "100"=>100, - "150"=>150, - "200"=>200, - "300"=>300, - "600"=>600 + "100 DPI"=>100, + "150 DPI"=>150, + "200 DPI"=>200, + "300 DPI"=>300, + "600 DPI"=>600 ); $Resolution=200; diff --git a/literals/ui.en.json b/literals/ui.en.json index 4b964e2..da7c3c4 100644 --- a/literals/ui.en.json +++ b/literals/ui.en.json @@ -6,5 +6,10 @@ "Size": "Size", "Scan": "Scan", "Loading": "Loading", + "Full": "Full", + "A4": "A4", + "A5 Portrait": "A5 Portrait", + "A5 Landscape": "A5 Landscape", + "Letter": "US Letter", "": "" } diff --git a/literals/ui.es.json b/literals/ui.es.json index 36421ef..7552fcc 100644 --- a/literals/ui.es.json +++ b/literals/ui.es.json @@ -6,5 +6,10 @@ "Size": "TamaƱo", "Scan": "Escanear", "Loading": "Cargando", + "Full": "Completo", + "A4": "A4", + "A5 Portrait": "A5 Vertical", + "A5 Landscape": "A5 Horizontal", + "Letter": "US Letter", "": "" }