added localized error messages for mail composer

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@895 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog
index 5e834faf3361476bb630ca458bd96055dd0d909f..85e633a8fc5366a732119a9b5bb7e3b35a5223ab 100644 (file)
--- a/SOGo/UI/MailerUI/ChangeLog
+++ b/SOGo/UI/MailerUI/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-22  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * English.lproj/Localizable.strings: added error labels for JavaScript
+         (v0.9.169)
+
 2005-07-22  Helge Hess  <helge.hess@opengroupware.org>
 
        * UIxMailEditor.m: implemented identity based Sent folders (tied to

diff --git a/SOGo/UI/MailerUI/English.lproj/Localizable.strings b/SOGo/UI/MailerUI/English.lproj/Localizable.strings
index 4914c04d43a4367cc9af5b3e58817b36b60ca528..a24317930b0c324b46723d534edf43fef6bb310c 100644 (file)
--- a/SOGo/UI/MailerUI/English.lproj/Localizable.strings
+++ b/SOGo/UI/MailerUI/English.lproj/Localizable.strings
@@ -89,3 +89,7 @@
 /* MailMoveToPopUp */
 
 "MoveTo"        = "Move …";
+
+"error_missingsubject"      = "Missing Subject";
+"error_missingrecipients"   = "Missing Recipients";
+"error_validationfailed"    = "Validation failed";

diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version
index a5e610b378082d01b5019178cf4e96a6a4d50327..40704a1fe459e7e0fdc87945b07ab3949ea71b5f 100644 (file)
--- a/SOGo/UI/MailerUI/Version
+++ b/SOGo/UI/MailerUI/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=168
+SUBMINOR_VERSION:=169
 
 # v0.9.140 requires SoObjects/Mailer v0.9.100
 # v0.9.134 requires libSOGo          v0.9.41

diff --git a/SOGo/UI/Templates/ChangeLog b/SOGo/UI/Templates/ChangeLog
index 44dc192657d757b84165c916257b3add3a9752f8..1f28daa9ff16274d6e98537be0faffe93441cd21 100644 (file)
--- a/SOGo/UI/Templates/ChangeLog
+++ b/SOGo/UI/Templates/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-22  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * UIxMailPanelFrame.wox: added MailerUI.SOGo strings table for error
+         messages
+
        * UIxMailEditor.wox: added inclusion of layout2or3_xlib.js and added
          a new id to compose_table
 

diff --git a/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox b/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox
index 02d1f6ab52fa6dc5ac1eac79f8a6b98b729216ae..bbf58fd6af0af07b37f2e8e1537f9c8d872f3009 100644 (file)
--- a/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox
+++ b/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox
@@ -21,6 +21,10 @@
     <meta name="author" content="SKYRIX Software AG"/>
     <meta name="robots" content="stop"/>
     
+    <var:js-stringtable const:framework="MailerUI.SOGo"
+                        const:identifier="labels"
+                        const:inplace="NO"
+    />
     <script rsrc:src="generic.js"> <!-- space required --></script>
     <script rsrc:src="mailer.js" > <!-- space required --></script>
     

diff --git a/SOGo/UI/WebServerResources/ChangeLog b/SOGo/UI/WebServerResources/ChangeLog
index aa9a5156990cb10fa04c051e1880cb7203bebd92..3cf1ea782c510e007bea729782129d184f21ad03 100644 (file)
--- a/SOGo/UI/WebServerResources/ChangeLog
+++ b/SOGo/UI/WebServerResources/ChangeLog
@@ -1,5 +1,7 @@
 2005-07-22  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * mailer.js: added labels for error messages
+
        * mailer.js: added validation of recipients
 
        * layout2or3_xlib.js: added (currently used by UIxMailToEditor for

diff --git a/SOGo/UI/WebServerResources/mailer.js b/SOGo/UI/WebServerResources/mailer.js
index f4a6693ffe62b517064420bf231f59f9288489d3..1aa75b1b2aabc45a3a23413443fbd8362b62643d 100644 (file)
--- a/SOGo/UI/WebServerResources/mailer.js
+++ b/SOGo/UI/WebServerResources/mailer.js
@@ -99,13 +99,13 @@ function validateEditorInput(sender) {
   
   field = document.pageform.subject;
   if (field.value == "")
-    errortext = errortext + "Missing Subject\n";
+    errortext = errortext + labels.error_missingsubject + "\n";
 
   if (!UIxRecipientSelectorHasRecipients())
-    errortext = errortext + "Missing Recipients\n";
+    errortext = errortext + labels.error_missingrecipients + "\n";
   
   if (errortext.length > 0) {
-    alert("validation failed:\n" + errortext);
+    alert(labels.error_validationfailed + ":\n" + errortext);
     return false;
   }
   return true;