From 25f62da5a5debeb593a4833eb563b4fc21792d50 Mon Sep 17 00:00:00 2001
From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 22 Jul 2005 12:49:56 +0000
Subject: [PATCH] added localized error messages for mail composer

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@895 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/UI/MailerUI/ChangeLog                         | 5 +++++
 SOGo/UI/MailerUI/English.lproj/Localizable.strings | 4 ++++
 SOGo/UI/MailerUI/Version                           | 2 +-
 SOGo/UI/Templates/ChangeLog                        | 3 +++
 SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox   | 4 ++++
 SOGo/UI/WebServerResources/ChangeLog               | 2 ++
 SOGo/UI/WebServerResources/mailer.js               | 6 +++---
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog
index 5e834faf..85e633a8 100644
--- 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 4914c04d..a2431793 100644
--- a/SOGo/UI/MailerUI/English.lproj/Localizable.strings
+++ b/SOGo/UI/MailerUI/English.lproj/Localizable.strings
@@ -89,3 +89,7 @@
 /* MailMoveToPopUp */
 
 "MoveTo"        = "Move &hellip;";
+
+"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 a5e610b3..40704a1f 100644
--- 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 44dc1926..1f28daa9 100644
--- 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 02d1f6ab..bbf58fd6 100644
--- 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 aa9a5156..3cf1ea78 100644
--- 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 f4a6693f..1aa75b1b 100644
--- 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;
-- 
2.39.5