gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new/enh/bug_5917' into kcmaster

This commit is contained in:
Chris Cormack 2011-04-14 13:36:57 +12:00
parent 9bb2554e39 1c5005beb2
commit d4f2bde054
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
View File

@ -318,12 +318,12 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
<label for="scan-index">Indexed in:</label>
<select name="idx" id="scan-index">
<option value="">Any Word</option>
<option <!-- TMPL_IF NAME="ms_any,phr" --> selected="selected" [% END %] value="any,phr">Any Phrase</option>
<option [% IF (ms_anycommaphr) %] selected="selected" [% END %] value="any,phr">Any Phrase</option>
<option [% IF ( ms_ti ) %] selected="selected" [% END %] value="ti">Title</option>
<option <!-- TMPL_IF NAME="ms_ti,phr" --> selected="selected" [% END %] value="ti,phr">Title Phrase</option>
<option <!-- TMPL_IF NAME="ms_au,phr" --> selected="selected" [% END %] value="au,phr">Author</option>
<option [% IF (ms_ticommaphr) %] selected="selected" [% END %] value="ti,phr">Title Phrase</option>
<option [% IF (ms_aucommaphr) %] selected="selected" [% END %] value="au,phr">Author</option>
<option [% IF ( ms_su ) %] selected="selected" [% END %] value="su">Subject</option>
<option <!-- TMPL_IF NAME="ms_su,phr" --> selected="selected" [% END %] value="su,phr">Subject Phrase</option>
<option [% IF (ms_sucommaphr) %] selected="selected" [% END %] value="su,phr">Subject Phrase</option>
<option [% IF ( ms_se ) %] selected="selected" [% END %] value="se">Series</option>
<option [% IF ( ms_pb ) %] selected="selected" [% END %] value="pb">Publisher</option>
<option [% IF ( ms_nt ) %] selected="selected" [% END %] value="nt">Notes</option>

23
misc/translator/TmplTokenizer.pm
View File

@ -198,6 +198,7 @@ sub _identify_js_translatables (@) {
# We mark a JavaScript translatable string as in C, i.e., _("literal")
# For simplicity, we ONLY look for "_" "(" StringLiteral ")"
for (my $i = 0, my $state = 0, my($j, $q, $s); $i <= $#input; $i += 1) {
# warn $input[$i];
my $reset_state_p = 0;
push @output, [0, $input[$i]];
if ($input[$i] !~ /\S/s) {
@ -221,6 +222,8 @@ sub _identify_js_translatables (@) {
die "identify_js_translatables internal error: Unknown state $state"
}
}
# use Data::Dumper;
# warn Dumper \@output;
return \@output;
}
@ -302,10 +305,10 @@ sub _parametrize_internal{
sub next_token {
my $self = shift;
my $next;
# warn "in next_token";
# parts that make up a text_parametrized (future children of the token)
my @parts = ();
while(1){
# warn Dumper @parts;
$next = $self->{_parser}->next_token;
if (! $next){
if (@parts){
@ -321,8 +324,24 @@ sub next_token {
push @parts, $next;
}
elsif( $next->type == TmplTokenType::DIRECTIVE && $next->string =~ m/\[%\s*\w+\s*%\]/ ){
push @parts, $next;
return $next;
}
elsif ( $next->type == TmplTokenType::CDATA){
$self->_set_js_mode(1);
my $s0 = $next->string;
my @head = ();
my @tail = ();
if ($s0 =~ /^(\s*\[%\s*)(.*)(\s%=]\s*)$/s) {
push @head, $1;
push @tail, $3;
$s0 = $2;
}
push @head, _split_js $s0;
$next->set_js_data(_identify_js_translatables(@head, @tail) );
return $next;
}
else {
# if there is nothing in parts, return this token