first wave of i18n fixes

This commit is contained in:
Colin Kuskie 2006-01-15 00:58:33 +00:00
parent b22cc241c0
commit 16b0edfb6b
4 changed files with 14 additions and 9 deletions

View file

@ -93,15 +93,16 @@ Renders a select list form control.
sub toHtml { sub toHtml {
my $self = shift; my $self = shift;
my %types; my %types;
my $i18n = WebGUI::International->new($self->session);
foreach my $type (@{$self->get("types}")) { foreach my $type (@{$self->get("types}")) {
if ($type eq "text") { if ($type eq "text") {
$types{text} = WebGUI::International::get(1010); $types{text} = $i18n->get(1010);
} elsif ($type eq "mixed") { } elsif ($type eq "mixed") {
$types{mixed} = WebGUI::International::get(1008); $types{mixed} = $i18n->get(1008);
} elsif ($type eq "code") { } elsif ($type eq "code") {
$types{code} = WebGUI::International::get(1011); $types{code} = $i18n->get(1011);
} elsif ($type eq "html") { } elsif ($type eq "html") {
$types{html} = WebGUI::International::get(1009); $types{html} = $i18n->get(1009);
} }
} }
$self->get("options") = \%types, $self->get("options") = \%types,

View file

@ -100,10 +100,11 @@ sub displayForm {
my $location = WebGUI::Storage->get($self->session,$self->get("value")); my $location = WebGUI::Storage->get($self->session,$self->get("value"));
my $id = $location->getId; my $id = $location->getId;
my $fileForm = ''; my $fileForm = '';
my $i18n = WebGUI::International->new($self->session);
foreach my $file ( @{ $location->getFiles } ) { foreach my $file ( @{ $location->getFiles } ) {
$fileForm .= sprintf qq!<img src="%s" /><br />!, $location->getUrl($file); $fileForm .= sprintf qq!<img src="%s" /><br />!, $location->getUrl($file);
my $action = join '_', '_', $self->get("name"), 'delete'; my $action = join '_', '_', $self->get("name"), 'delete';
$fileForm .= WebGUI::International::get(392) $fileForm .= $i18n->get(392)
. "&nbsp"x4 . "&nbsp"x4
. WebGUI::Form::YesNo->new({-name=>$action, -value=>0})->toHtml; . WebGUI::Form::YesNo->new({-name=>$action, -value=>0})->toHtml;
} }
@ -193,7 +194,8 @@ sub toHtml {
$uploadControl .= 'fileIcons["'.$ext.'"] = "'.$self->session->config->get("extrasURL").'/fileIcons/'.$file.'";'."\n"; $uploadControl .= 'fileIcons["'.$ext.'"] = "'.$self->session->config->get("extrasURL").'/fileIcons/'.$file.'";'."\n";
} }
} }
$uploadControl .= 'var uploader = new FileUploadControl("'.$self->get("name").'", fileIcons, "'.WebGUI::International::get('removeLabel','WebGUI').'","'.$self->get("maxAttachments").'"); my $i18n = WebGUI::International->new($self->session);
$uploadControl .= 'var uploader = new FileUploadControl("'.$self->get("name").'", fileIcons, "'.$i18n->get('removeLabel','WebGUI').'","'.$self->get("maxAttachments").'");
uploader.addRow(); uploader.addRow();
</script>'; </script>';
return $uploadControl; return $uploadControl;

View file

@ -68,7 +68,8 @@ Renders a button.
sub toHtml { sub toHtml {
my $self = shift; my $self = shift;
my $value = $self->fixQuotes($self->get("value")); my $value = $self->fixQuotes($self->get("value"));
$self->get("extras") ||= 'onclick="this.value=\''.WebGUI::International::get(452).'\'"'; my $i18n = WebGUI::International->new($self->session);
$self->get("extras") ||= 'onclick="this.value=\''.$i18n->get(452).'\'"';
my $html = '<input type="submit" '; my $html = '<input type="submit" ';
$html .= 'name="'.$self->get("name").'" ' if ($self->get("name")); $html .= 'name="'.$self->get("name").'" ' if ($self->get("name"));
$html .= 'id="'.$self->{id}.'" ' unless ($self->{id} eq "_formId"); $html .= 'id="'.$self->{id}.'" ' unless ($self->{id} eq "_formId");

View file

@ -102,6 +102,7 @@ Renders a yes/no question field.
sub toHtml { sub toHtml {
my $self = shift; my $self = shift;
my $i18n = WebGUI::International->new($self->session);
my ($checkYes, $checkNo); my ($checkYes, $checkNo);
if ($self->get("value")) { if ($self->get("value")) {
$checkYes = 1; $checkYes = 1;
@ -114,7 +115,7 @@ sub toHtml {
value=>1, value=>1,
extras=>$self->get("extras") extras=>$self->get("extras")
)->toHtml; )->toHtml;
$output .= WebGUI::International::get(138); $output .= $i18n->get(138);
$output .= '&nbsp;&nbsp;&nbsp;'; $output .= '&nbsp;&nbsp;&nbsp;';
$output .= WebGUI::Form::Radio->new( $output .= WebGUI::Form::Radio->new(
checked=>$checkNo, checked=>$checkNo,
@ -122,7 +123,7 @@ sub toHtml {
value=>0, value=>0,
extras=>$self->get("extras") extras=>$self->get("extras")
)->toHtml; )->toHtml;
$output .= WebGUI::International::get(139); $output .= $i18n->get(139);
return $output; return $output;
} }