--- test/html-webhacc/cc.cgi 2008/07/21 09:40:59 1.58 +++ test/html-webhacc/cc.cgi 2008/07/21 12:56:33 1.59 @@ -20,9 +20,14 @@ $out->http_error (404); exit; } - - load_text_catalog ('en'); ## TODO: conneg + ## TODO: We need real conneg support... + my $primary_language = 'en'; + if ($ENV{HTTP_ACCEPT_LANGUAGE} =~ /ja/) { + $primary_language = 'ja'; + } + $out->load_text_catalog ($primary_language); + $out->set_flush; $out->http_header; $out->html_header; @@ -118,65 +123,6 @@ $out->input ($original_input); } # check_and_print - -{ - my $Msg = {}; - -sub load_text_catalog ($) { -# my $self = shift; - my $lang = shift; # MUST be a canonical lang name - open my $file, '<:utf8', "cc-msg.$lang.txt" - or die "$0: cc-msg.$lang.txt: $!"; - while (<$file>) { - if (s/^([^;]+);([^;]*);//) { - my ($type, $cls, $msg) = ($1, $2, $_); - $msg =~ tr/\x0D\x0A//d; - $Msg->{$type} = [$cls, $msg]; - } - } -} # load_text_catalog - -sub get_text ($;$$) { -# my $self = shift; - my ($type, $level, $node) = @_; - $type = $level . ':' . $type if defined $level; - $level = 'm' unless defined $level; - my @arg; - { - if (defined $Msg->{$type}) { - my $msg = $Msg->{$type}->[1]; - $msg =~ s{\$([0-9]+)}{ - defined $arg[$1] ? ($arg[$1]) : '(undef)'; - }ge; ##BUG: ^ must be escaped - $msg =~ s{{\@([A-Za-z0-9:_.-]+)}}{ - UNIVERSAL::can ($node, 'get_attribute_ns') - ? ($node->get_attribute_ns (undef, $1)) : '' - }ge; ## BUG: ^ must be escaped - $msg =~ s{{\@}}{ ## BUG: v must be escaped - UNIVERSAL::can ($node, 'value') ? ($node->value) : '' - }ge; - $msg =~ s{{local-name}}{ - UNIVERSAL::can ($node, 'manakai_local_name') - ? ($node->manakai_local_name) : '' - }ge; ## BUG: ^ must be escaped - $msg =~ s{{element-local-name}}{ - (UNIVERSAL::can ($node, 'owner_element') and - $node->owner_element) - ? ($node->owner_element->manakai_local_name) - : '' ## BUG: ^ must be escaped - }ge; - return ($type, 'level-' . $level . ' ' . $Msg->{$type}->[0], $msg); - } elsif ($type =~ s/:([^:]*)$//) { - unshift @arg, $1; - redo; - } - } - return ($type, 'level-'.$level, ($_[0])); - ## BUG: ^ must be escaped -} # get_text - -} - sub get_input_document ($) { my $http = shift; @@ -375,4 +321,4 @@ =cut -## $Date: 2008/07/21 09:40:59 $ +## $Date: 2008/07/21 12:56:33 $