@@ -2599,7 +2599,7 @@ function rcube_webmail() {
25992599 }
26002600
26012601 if ( this . is_multifolder_listing ( ) ) {
2602- domrow . title = rcmail . get_label ( 'infolder' ) . replace ( '$folder' , message . folder ) ;
2602+ domrow . title = rcmail . get_label ( 'infolder' , null , { folder : message . folder } ) ;
26032603 }
26042604
26052605 $ . each ( this . env . widescreen_list_template , function ( ) {
@@ -4237,7 +4237,7 @@ function rcube_webmail() {
42374237 if ( ! isvalid && missing_keys . length ) {
42384238 // display dialog with missing keys
42394239 ref . simple_dialog (
4240- ref . get_label ( 'nopubkeyfor' ) . replace ( '$email' , missing_keys . join ( ', ' ) )
4240+ ref . get_label ( 'nopubkeyfor' , null , { email : missing_keys . join ( ', ' ) } )
42414241 + '<p>' + ref . get_label ( 'searchpubkeyservers' ) + '</p>' ,
42424242 'encryptedsendialog' ,
42434243 function ( ) {
@@ -4392,7 +4392,7 @@ function rcube_webmail() {
43924392 }
43934393 // some keys could not be found
43944394 if ( missing_keys . length ) {
4395- ref . display_message ( ref . get_label ( 'nopubkeyfor' ) . replace ( '$email' , missing_keys . join ( ', ' ) ) , 'warning' ) ;
4395+ ref . display_message ( ref . get_label ( 'nopubkeyfor' , null , { email : missing_keys . join ( ', ' ) } ) , 'warning' ) ;
43964396 }
43974397 } ) . fail ( function ( ) {
43984398 console . error ( 'Pubkey lookup failed with' , arguments ) ;
@@ -4490,7 +4490,7 @@ function rcube_webmail() {
44904490 } else {
44914491 var $key = keyid . substr ( - 8 ) . toUpperCase ( ) ;
44924492 btn . closest ( '.key' ) . fadeOut ( ) ;
4493- ref . display_message ( ref . get_label ( 'keyimportsuccess' ) . replace ( '$key' , $key ) , 'confirmation' ) ;
4493+ ref . display_message ( ref . get_label ( 'keyimportsuccess' , null , { key : $key } ) , 'confirmation' ) ;
44944494 }
44954495 } , function ( err ) {
44964496 console . log ( err ) ;
@@ -4537,7 +4537,7 @@ function rcube_webmail() {
45374537 var content = container . find ( '.identity-encryption-block' ) . empty ( ) ;
45384538 if ( private_keys && private_keys . length ) {
45394539 // show private key information
4540- $ ( '<p>' ) . text ( ref . get_label ( 'encryptionprivkeysinmailvelope' ) . replace ( '$nr' , private_keys . length ) ) . appendTo ( content ) ;
4540+ $ ( '<p>' ) . text ( ref . get_label ( 'encryptionprivkeysinmailvelope' , null , { nr : private_keys . length } ) ) . appendTo ( content ) ;
45414541 var ul = $ ( '<ul>' ) . addClass ( 'keylist' ) . appendTo ( content ) ;
45424542 $ . each ( private_keys , function ( i , key ) {
45434543 $ ( '<li>' ) . appendTo ( ul )
@@ -4602,7 +4602,7 @@ function rcube_webmail() {
46024602 generator . generate ( )
46034603 . then ( function ( result ) {
46044604 if ( typeof result === 'string' && result . indexOf ( 'BEGIN PGP' ) > 0 ) {
4605- ref . display_message ( ref . get_label ( 'keypaircreatesuccess' ) . replace ( '$identity' , identity_email ) , 'confirmation' ) ;
4605+ ref . display_message ( ref . get_label ( 'keypaircreatesuccess' , null , { identity : identity_email } ) , 'confirmation' ) ;
46064606 // reset keygen view
46074607 ref . mailvelope_identity_keygen ( ) ;
46084608 }
@@ -4664,7 +4664,7 @@ function rcube_webmail() {
46644664
46654665 if ( this . env . mdn_request_save ) {
46664666 buttons . unshift ( {
4667- text : this . get_label ( 'sendalwaysto' ) . replace ( '$email' , this . env . mdn_request_sender . mailto ) ,
4667+ text : this . get_label ( 'sendalwaysto' , null , { email : this . env . mdn_request_sender . mailto } ) ,
46684668 class : 'mainaction send' ,
46694669 click : function ( e , ui , dialog ) {
46704670 props . data . _save = ref . env . mdn_request_save ;
@@ -6223,7 +6223,7 @@ function rcube_webmail() {
62236223
62246224 if ( q . length && q . length < min ) {
62256225 if ( ! this . ksearch_info ) {
6226- this . ksearch_info = this . display_message ( this . get_label ( 'autocompletechars' ) . replace ( '$min' , min ) ) ;
6226+ this . ksearch_info = this . display_message ( this . get_label ( 'autocompletechars' , null , { min : min } ) ) ;
62276227 }
62286228 return ;
62296229 }
0 commit comments