Changeset 4268 for branches/2.2.0.1

Timestamp:

05/06/11 18:02:05 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1726 - Traduz frases do envio de email em txt puro. r4233

Location:

branches/2.2.0.1/expressoMail1_2

Files:

• js/rich_text_editor.js (modified) (2 diffs)
• setup/phpgw_en.lang (modified) (1 diff)

branches/2.2.0.1/expressoMail1_2/js/rich_text_editor.js

@@ -171 +171 @@
                         html = html.nodeValue.replace( /<br\s*\/?>/mg, "\n" ).replace( /(<([^>]+)>)/ig, '' ).replace( /^[\n ]+|[\n ]+$/g, '' );
 
-                        if ( ! mobile_device && html != '' && ! ( mail_as_plain.checked = confirm( 'The text format will be lost.' ) ) )
+                        if ( ! mobile_device && html != '' && ! ( mail_as_plain.checked = confirm( get_lang( 'The text format will be lost' ) + '.' ) ) )
                                 return false;
 
@@ -207 +207 @@
 
                         this.loadEditor( this.id );
+
+                        setTimeout( function( ) { editor.contentWindow.focus( ); }, 100 );
                 }
         }

branches/2.2.0.1/expressoMail1_2/setup/phpgw_en.lang

@@ -447 +447 @@
 Valid Until     expressoMail1_2 en      Valid Until
 Serial Number   expressoMail1_2 en      Serial Number
+Send this mail as text plain    expressoMail1_2 en      Send this mail as text plain
+The text format will be lost    expressoMail1_2 en      The text format will be lost