From 3c6a090b150a4f5cdcca754bbc234836c58c6097 Mon Sep 17 00:00:00 2001
From: "jminta%gmail.com"
 <jminta%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 3 Feb 2006 19:48:09 +0000
Subject: [PATCH] Bug 325762 Recurrence dialog's COUNT ignores corresponding
 units. patch by stephan.schaefer@sun.com, r=jminta

git-svn-id: svn://10.0.0.236/trunk@188874 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../base/content/calendar-recurrence-dialog.js        |  2 --
 .../base/content/calendar-recurrence-dialog.xul       | 11 ++---------
 mozilla/calendar/resources/locale/en-US/calendar.dtd  |  2 ++
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/mozilla/calendar/base/content/calendar-recurrence-dialog.js b/mozilla/calendar/base/content/calendar-recurrence-dialog.js
index 0ab6844a4bf..0f5dbe29ae1 100644
--- a/mozilla/calendar/base/content/calendar-recurrence-dialog.js
+++ b/mozilla/calendar/base/content/calendar-recurrence-dialog.js
@@ -240,10 +240,8 @@ function updateDuration()
 
     if (durationSelection == "ntimes") {
         setElementValue("repeat-ntimes-count", false, "disabled");
-        setElementValue("repeat-ntimes-units", false, "disabled");
     } else {
         setElementValue("repeat-ntimes-count", "true", "disabled");
-        setElementValue("repeat-ntimes-units", "true", "disabled");
     }
 
     if (durationSelection == "until") {
diff --git a/mozilla/calendar/base/content/calendar-recurrence-dialog.xul b/mozilla/calendar/base/content/calendar-recurrence-dialog.xul
index 3a81ad5a072..c032c6916e2 100644
--- a/mozilla/calendar/base/content/calendar-recurrence-dialog.xul
+++ b/mozilla/calendar/base/content/calendar-recurrence-dialog.xul
@@ -168,17 +168,10 @@
           </row>
           <row>
             <radio label="&newevent.repeat.for.label;" value="ntimes"/>
-            <hbox>
+            <hbox align="center">
               <textbox id="repeat-ntimes-count" size="3" value="5" oninput="validateIntegers(event); updateAccept();"/>
               <spacer flex="0.5"/>
-              <menulist id="repeat-ntimes-units">
-                <menupopup>
-                  <menuitem label="&repeat.units.days.both;"/>
-                  <menuitem label="&repeat.units.weeks.both;"/>
-                  <menuitem label="&repeat.units.months.both;"/>
-                  <menuitem label="&repeat.units.years.both;"/>
-                </menupopup>
-              </menulist>
+              <label value="&repeat.units.occurence.both;"/>
               <spacer flex="1"/>
             </hbox>
           </row>
diff --git a/mozilla/calendar/resources/locale/en-US/calendar.dtd b/mozilla/calendar/resources/locale/en-US/calendar.dtd
index 9e6bb8d6adf..2f7e0734b1f 100644
--- a/mozilla/calendar/resources/locale/en-US/calendar.dtd
+++ b/mozilla/calendar/resources/locale/en-US/calendar.dtd
@@ -55,6 +55,8 @@
 <!ENTITY alarm.start.warning     "This alarm requires a starting date" >
 <!ENTITY alarm.due.warning     "This alarm requires a due date" >
 
+<!ENTITY repeat.units.occurence.both         "occurence(s)" >
+
 <!ENTITY repeat.units.days.both         "Day(s)" >
 <!ENTITY repeat.units.weeks.both        "Week(s)" >
 <!ENTITY repeat.units.months.both       "Month(s)" >