--- strings.txt 2005-03-18 07:58:00.000000000 -0800 +++ server/strings.txt 2005-03-22 15:37:25.671875000 -0800 @@ -2494,6 +2494,12 @@ SETUP_BAD_DIRECTORY PT A Pasta "%s" não é válida. Tente de novo. SE "%s" verkar inte vara en godkänd mapp. Försök igen. +SETUP_USE_MIN + EN using minimum limit. + +SETUP_USE_MAX + EN using maximum limit. + SETUP_OK_USING DE Der Server verwendet den folgenden Pfad für ihre Musikdateien: DK OK, anvender: --- Slim/Web/Setup.pm 2005-03-22 02:58:00.000000000 -0800 +++ server/Slim/Web/Setup.pm 2005-03-22 15:33:56.468750000 -0800 @@ -540,12 +540,12 @@ sub initSetupConfig { }, 'scrollPixels' => { 'validate' => \&validateInt - ,'validateArgs' => [1,20,1,20] + ,'validateArgs' => [1,20,1,1] ,'PrefChoose' => string('SINGLE-LINE').' '.string('SETUP_SCROLLPIXELS').string('COLON') }, 'scrollPixelsDouble' => { 'validate' => \&validateInt - ,'validateArgs' => [1,20,1,20] + ,'validateArgs' => [1,20,1,1] ,'changeIntro' => string('DOUBLE-LINE').' '.string('SETUP_SCROLLPIXELS').string('COLON') ,'PrefChoose' => string('DOUBLE-LINE').' '.string('SETUP_SCROLLPIXELS').string('COLON') }, @@ -2734,6 +2734,7 @@ sub setup_evaluation { } } $changes{$key2}{'new'} = $pvalue; + $changes{$key2}{'msg'} = $errmsg; $currVal = $pvalue; } } else { @@ -2796,6 +2797,9 @@ sub setup_changes_HTTP { if (exists $settingsref->{$keyA}{'changeAddlText'}) { $changemsg .= $settingsref->{$keyA}{'changeAddlText'}; } + if (exists $changeref->{$keyA}{'msg'}) { + $changemsg .= string($changeref->{$keyA}{'msg'}); + } #force eval on the filltemplate call if (defined($changedval) && $changemsg) { $paramref->{'warning'} .= sprintf(${Slim::Web::HTTP::filltemplate($changemsg,undef,1)},$changedval); @@ -3157,13 +3161,13 @@ sub validateInt { return undef; } elsif (defined($low) && $val < $low) { # too low, equal to $low is acceptable if ($setLow) { - return $low; + return ($low,"SETUP_USE_MIN"); } else { return undef; } } elsif (defined($high) && $val > $high) { # too high, equal to $high is acceptable if ($setHigh) { - return $high; + return ($high,"SETUP_USE_MAX"); } else { return undef; } @@ -3244,13 +3248,13 @@ sub validateNumber { return undef; } elsif (defined($low) && $val < $low) { # too low, equal to $low is acceptable if ($setLow) { - return $low; + return ($low,"SETUP_USE_MIN"); } else { return undef; } } elsif (defined($high) && $val > $high) { # too high, equal to $high is acceptable if ($setHigh) { - return $high; + return ($high,"SETUP_USE_MAX"); } else { return undef; }