oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more i18n fixes

Browse source
This commit is contained in:
Colin Kuskie 2006-01-15 01:04:35 +00:00
parent 16b0edfb6b
commit f78591d8a7
8 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/WebGUI/Form/Combo.pm
View file

@ -96,8 +96,9 @@ Renders a combo box form control.
sub toHtml { sub toHtml {
my $self = shift; my $self = shift;
$self->get("options")->{''} = '['.WebGUI::International::get(582).']'; my $i18n = WebGUI::International->new($self->session);
$self->get("options")->{_new_} = WebGUI::International::get(581).'->'; $self->get("options")->{''} = '['.$i18n->get(582).']';
$self->get("options")->{_new_} = $i18n->get(581).'->';
return $self->SUPER::toHtml return $self->SUPER::toHtml
.WebGUI::Form::Text->new( .WebGUI::Form::Text->new(
size=>$self->session->setting->get("textBoxSize")-5, size=>$self->session->setting->get("textBoxSize")-5,

2
lib/WebGUI/Form/DatabaseLink.pm
View file

@ -91,7 +91,7 @@ sub definition {
defaultValue=>undef defaultValue=>undef
}, },
hoverHelp=>{ hoverHelp=>{
defaultValue=>WebGUI::International::get('1075 description') defaultValue=>$i18n->get('1075 description')
}, },
}); });
return $class->SUPER::definition($definition); return $class->SUPER::definition($definition);

5
lib/WebGUI/Form/FieldType.pm
View file

@ -61,12 +61,13 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
sub definition { sub definition {
my $class = shift; my $class = shift;
my $definition = shift || []; my $definition = shift || [];
my $i18n = WebGUI::International->new($self->session);
push(@{$definition}, { push(@{$definition}, {
formName=>{ formName=>{
defaultValue=>WebGUI::International::get("fieldtype","WebGUI") defaultValue=>$i18n->get("fieldtype","WebGUI")
}, },
label=>{ label=>{
defaultValue=>WebGUI::International::get("fieldtype","WebGUI") defaultValue=>$i18n->get("fieldtype","WebGUI")
}, },
types=>{ types=>{
defaultValue=>$class->getTypes defaultValue=>$class->getTypes

11
lib/WebGUI/Form/FilterContent.pm
View file

@ -106,14 +106,15 @@ Returns a select list containing the content filter options. This is for use wit
sub toHtml { sub toHtml {
my $self = shift; my $self = shift;
my $i18n = WebGUI::International->new($self->session);
my %filter; my %filter;
tie %filter, 'Tie::IxHash'; tie %filter, 'Tie::IxHash';
%filter = ( %filter = (
'none'=>WebGUI::International::get(420), 'none'=>$i18n->get(420),
'macros'=>WebGUI::International::get(891), 'macros'=>$i18n->get(891),
'javascript'=>WebGUI::International::get(526), 'javascript'=>$i18n->get(526),
'most'=>WebGUI::International::get(421), 'most'=>$i18n->get(421),
'all'=>WebGUI::International::get(419) 'all'=>$i18n->get(419)
); );
$self->get("options") = \%filter; $self->get("options") = \%filter;
return $self->SUPER::toHtml(); return $self->SUPER::toHtml();

3
lib/WebGUI/Form/HTMLArea.pm
View file

@ -119,11 +119,12 @@ sub toHtml {
$self->session->style->setScript($self->session->config->get("extrasURL").'/textFix.js',{ type=>'text/javascript' }); $self->session->style->setScript($self->session->config->get("extrasURL").'/textFix.js',{ type=>'text/javascript' });
$self->get("extras") .= ' onblur="fixChars(this.form.'.$self->get("name").')" mce_editable="true" '; $self->get("extras") .= ' onblur="fixChars(this.form.'.$self->get("name").')" mce_editable="true" ';
return $self->SUPER::toHtml.WebGUI::Asset::RichEdit->new($self->get("richEditId"))->getRichEditor($self->{id}); return $self->SUPER::toHtml.WebGUI::Asset::RichEdit->new($self->get("richEditId"))->getRichEditor($self->{id});
my $i18n = WebGUI::International->new($self->session);
my $richEdit = WebGUI::Asset::RichEdit->new($self->get("richEditId")); my $richEdit = WebGUI::Asset::RichEdit->new($self->get("richEditId"));
if (defined $richEdit) { if (defined $richEdit) {
return $self->SUPER::toHtml.$richEdit->getRichEditor($self->{id}); return $self->SUPER::toHtml.$richEdit->getRichEditor($self->{id});
} else { } else {
return WebGUI::International::get('rich editor load error','Form_HTMLArea'); return $i18n->get('rich editor load error','Form_HTMLArea');
} }
} }

15
lib/WebGUI/Form/Interval.pm
View file

@ -105,13 +105,14 @@ sub toHtml {
my $self = shift; my $self = shift;
my %units; my %units;
tie %units, 'Tie::IxHash'; tie %units, 'Tie::IxHash';
%units = ('seconds'=>WebGUI::International::get(704), my $i18n = WebGUI::International->new($self->session);
'minutes'=>WebGUI::International::get(705), %units = ('seconds'=>$i18n->get(704),
'hours'=>WebGUI::International::get(706), 'minutes'=>$i18n->get(705),
'days'=>WebGUI::International::get(700), 'hours'=>$i18n->get(706),
'weeks'=>WebGUI::International::get(701), 'days'=>$i18n->get(700),
'months'=>WebGUI::International::get(702), 'weeks'=>$i18n->get(701),
'years'=>WebGUI::International::get(703)); 'months'=>$i18n->get(702),
'years'=>$i18n->get(703));
my ($interval, $units) = $self->session->datetime->secondsToInterval($self->get("value")); my ($interval, $units) = $self->session->datetime->secondsToInterval($self->get("value"));
# not sure why, but these things need to be defined like this or # not sure why, but these things need to be defined like this or
# they fail under some circumstnaces # they fail under some circumstnaces

3
lib/WebGUI/Form/TimeField.pm
View file

@ -108,13 +108,14 @@ Renders a time field.
sub toHtml { sub toHtml {
my $self = shift; my $self = shift;
my $value = $self->session->datetime->secondsToTime($self->get("value")); my $value = $self->session->datetime->secondsToTime($self->get("value"));
my $i18n = WebGUI::International->new($self->session);
$self->session->style->setScript($self->session->config->get("extrasURL").'/inputCheck.js',{ type=>'text/javascript' }); $self->session->style->setScript($self->session->config->get("extrasURL").'/inputCheck.js',{ type=>'text/javascript' });
$self->get("extras") .= ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789:\')"'; $self->get("extras") .= ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789:\')"';
return $self->SUPER::toHtml return $self->SUPER::toHtml
.WebGUI::Form::Button->new( .WebGUI::Form::Button->new(
id=>$self->{id}, id=>$self->{id},
extras=>'style="font-size: 8pt;" onclick="window.timeField = this.form.'.$self->get("name").';clockSet = window.open(\''.$self->session->config->get("extrasURL"). '/timeChooser.html\',\'timeChooser\',\'WIDTH=230,HEIGHT=100\');return false"', extras=>'style="font-size: 8pt;" onclick="window.timeField = this.form.'.$self->get("name").';clockSet = window.open(\''.$self->session->config->get("extrasURL"). '/timeChooser.html\',\'timeChooser\',\'WIDTH=230,HEIGHT=100\');return false"',
value=>WebGUI::International::get(970) value=>$i18n->get(970)
)->toHtml; )->toHtml;
} }

3
lib/WebGUI/Operation/Auth.pm
View file

@ -65,7 +65,8 @@ sub www_auth {
my $methodCall = shift || $session->form->process("method") || "init"; my $methodCall = shift || $session->form->process("method") || "init";
if(!$authMethod->isCallable($methodCall)){ if(!$authMethod->isCallable($methodCall)){
$session->errorHandler->security("access uncallable auth method on page '".$session->asset->getTitle."' [".$session->asset->pageId."]."); $session->errorHandler->security("access uncallable auth method on page '".$session->asset->getTitle."' [".$session->asset->pageId."].");
return WebGUI::International::get(1077); my $i18n = WebGUI::International->new($self->session);
return $i18n->get(1077);
} }
return $session->style->userStyle($authMethod->$methodCall); return $session->style->userStyle($authMethod->$methodCall);
} }