Bug 325762 Recurrence dialog's COUNT ignores corresponding units. patch by stephan.schaefer@sun.com, r=jminta

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") {

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>

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)" >