diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-11-17 17:00:06 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-11-17 17:00:06 -0800 |
| commit | f32ac83068c6211f829f1688a1a9cdec71bc6ec7 (patch) | |
| tree | a6b6866f50a90fc7716861b4884ec4ffeb5ce535 /rt/share | |
| parent | 2c112f32561f23f9c538ace00db46659ce16da32 (diff) | |
| parent | c0886229d19cfa798580fbeb342826fd11ceeeb0 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'rt/share')
| -rw-r--r-- | rt/share/html/Elements/CryptStatus | 10 | ||||
| -rw-r--r-- | rt/share/static/js/util.js | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/rt/share/html/Elements/CryptStatus b/rt/share/html/Elements/CryptStatus index b022b1029..f2411a5e8 100644 --- a/rt/share/html/Elements/CryptStatus +++ b/rt/share/html/Elements/CryptStatus @@ -147,7 +147,7 @@ foreach my $run ( @runs ) { push @messages, { Tag => $protocol, Classes => [qw/keycheck bad/], - Value => loc( "Public key '0x[_1]' is required to verify signature", $line->{'Key'} ), + Value => $m->interp->apply_escapes( loc( "Public key '0x[_1]' is required to verify signature", $line->{'Key'} ), 'h'), }; } } @@ -156,21 +156,21 @@ foreach my $run ( @runs ) { push @messages, { Tag => $protocol, Classes => ['passphrasecheck', lc $line->{Status}], - Value => loc( $line->{'Message'} ), + Value => $m->interp->apply_escapes( loc( $line->{'Message'} ), 'h'), }; } elsif ( $line->{'Operation'} eq 'Decrypt' ) { push @messages, { Tag => $protocol, Classes => ['decrypt', lc $line->{Status}], - Value => loc( $line->{'Message'} ), + Value => $m->interp->apply_escapes( loc( $line->{'Message'} ), 'h'), }; } elsif ( $line->{'Operation'} eq 'Verify' ) { push @messages, { Tag => $protocol, Classes => ['verify', lc $line->{Status}, 'trust-'.($line->{Trust} || 'UNKNOWN')], - Value => loc( $line->{'Message'} ), + Value => $m->interp->apply_escapes( loc( $line->{'Message'} ), 'h'), }; } else { @@ -178,7 +178,7 @@ foreach my $run ( @runs ) { push @messages, { Tag => $protocol, Classes => [lc $line->{Operation}, lc $line->{Status}], - Value => loc( $line->{'Message'} ), + Value => $m->interp->apply_escapes( loc( $line->{'Message'} ), 'h'), } } } diff --git a/rt/share/static/js/util.js b/rt/share/static/js/util.js index b665c0e2a..f6f5c3b3a 100644 --- a/rt/share/static/js/util.js +++ b/rt/share/static/js/util.js @@ -277,7 +277,7 @@ function toggle_addprincipal_validity(input, good, title) { function update_addprincipal_title(title) { var h3 = jQuery("#acl-AddPrincipal h3"); - h3.html( h3.text().replace(/: .*$/,'') + ": " + title ); + h3.text( h3.text().replace(/: .*$/,'') + ": " + title ); } // when a value is selected from the autocompleter |