Fix bug 463273 - Error: Failed to read 'repeatDetailsOrdinal0' from chrome://calendar/locale/calendar-event-dialog.properties. r=philipp
This commit is contained in:
Hubert Gajewski (Aviary.pl)
Родитель
a23b4a3ec8
Коммит
5c50a10060
|
|
@ -23,6 +23,7 @@
|
|||
* Stefan Sitter <ssitter@gmail.com>
|
||||
* Philipp Kewisch <mozilla@kewis.ch>
|
||||
* Martin Schroeder <mschroeder@mozilla.x-home.org>
|
||||
* Hubert Gajewski <hubert@hubertgajewski.com>, Aviary.pl
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
|
|
@ -55,7 +56,6 @@ Components.utils.import("resource://calendar/modules/calIteratorUtils.jsm");
|
|||
*/
|
||||
function recurrenceRule2String(recurrenceInfo, startDate, endDate, allDay) {
|
||||
function getRString(name, args) calGetString("calendar-event-dialog", name, args);
|
||||
function getDString(name, args) calGetString("dateFormat", name, args);
|
||||
|
||||
// Retrieve a valid recurrence rule from the currently
|
||||
// set recurrence info. Bail out if there's more
|
||||
|
|
@ -115,7 +115,7 @@ function recurrenceRule2String(recurrenceInfo, startDate, endDate, allDay) {
|
|||
let days = rule.getComponent("BYDAY", {});
|
||||
var weekdays = "";
|
||||
for (let i = 0; i < days.length; i++) {
|
||||
weekdays += getDString("day." + days[i] + ".name")
|
||||
weekdays += getRString("repeatDetailsOrdinal" + days[i])
|
||||
if (days.length > 1 && i == (days.length - 2)) {
|
||||
weekdays += ' ' + getRString("repeatDetailsAnd") + ' ';
|
||||
} else if (i < days.length - 1) {
|
||||
|
|
@ -137,14 +137,14 @@ function recurrenceRule2String(recurrenceInfo, startDate, endDate, allDay) {
|
|||
let byday = rule.getComponent("BYDAY", {});
|
||||
if (day_position(byday[0]) == 0) {
|
||||
// i.e every MONDAY of every N months
|
||||
let day = getDString("day." + day_of_week(byday[0]) + ".name");
|
||||
let day = getRString("repeatDetailsDay" + day_of_week(byday[0]));
|
||||
ruleString = getRString("monthlyEveryOfEvery", [day]);
|
||||
ruleString = PluralForm.get(rule.interval, ruleString)
|
||||
.replace("#2", rule.interval);
|
||||
} else {
|
||||
// i.e the FIRST MONDAY of every N months
|
||||
let ordinal = getRString("repeatDetailsOrdinal" + day_position(byday[0]));
|
||||
let day = getDString("day." + day_of_week(byday[0]) + ".name");
|
||||
let day = getRString("repeatDetailsDay" + day_of_week(byday[0]));
|
||||
ruleString = getRString("monthlyNthOfEvery", [ordinal, day]);
|
||||
ruleString = PluralForm.get(rule.interval, ruleString)
|
||||
.replace("#3", rule.interval);
|
||||
|
|
@ -185,7 +185,7 @@ function recurrenceRule2String(recurrenceInfo, startDate, endDate, allDay) {
|
|||
} else {
|
||||
let monthlyString = getRString("monthlyDayOfNth", [startDate.day]);
|
||||
ruleString = PluralForm.get(rule.interval, monthlyString)
|
||||
.replace("#1", rule.interval);
|
||||
.replace("#2", rule.interval);
|
||||
}
|
||||
} else if (rule.type == 'YEARLY') {
|
||||
if (checkRecurrenceRule(rule, ['BYMONTH']) &&
|
||||
|
|
@ -194,7 +194,7 @@ function recurrenceRule2String(recurrenceInfo, startDate, endDate, allDay) {
|
|||
bymonthday = rule.getComponent("BYMONTHDAY", {});
|
||||
|
||||
if (bymonth.length == 1 && bymonthday.length == 1) {
|
||||
let monthNameString = getDString("month." + bymonth[0] + ".name");
|
||||
let monthNameString = getRString("repeatDetailsMonth" + bymonth[0]);
|
||||
|
||||
let yearlyString = getRString("yearlyNthOn",
|
||||
[monthNameString, bymonthday[0]]);
|
||||
|
|
@ -207,10 +207,10 @@ function recurrenceRule2String(recurrenceInfo, startDate, endDate, allDay) {
|
|||
byday = rule.getComponent("BYDAY", {});
|
||||
|
||||
if (bymonth.length == 1 && byday.length == 1) {
|
||||
let dayString = getDString("day." + day_of_week(byday[0]) + ".name");
|
||||
let monthString = getDString("month." + bymonth[0] + ".name");
|
||||
let dayString = getRString("repeatDetailsDay" + day_of_week(byday[0]));
|
||||
let monthString = getRString("repeatDetailsMonth" + bymonth[0]);
|
||||
if (day_position(byday[0]) == 0) {
|
||||
let yearlyString = getRString("yearlyEveryNthOfNth",
|
||||
let yearlyString = getRString("yearlyOnEveryNthOfNth",
|
||||
[dayString, monthString]);
|
||||
ruleString = PluralForm.get(rule.interval, yearlyString)
|
||||
.replace("#3", rule.interval);
|
||||
|
|
@ -229,7 +229,7 @@ function recurrenceRule2String(recurrenceInfo, startDate, endDate, allDay) {
|
|||
return getRString("ruleTooComplex");
|
||||
}
|
||||
} else {
|
||||
let monthNameString = getDString("month." + (startDate.month + 1) + ".name");
|
||||
let monthNameString = getRString("repeatDetailsMonth" + (startDate.month + 1));
|
||||
|
||||
let yearlyString = getRString("yearlyNthOn",
|
||||
[monthNameString, startDate.day]);
|
||||
|
|
|
|||
|
|
@ -188,7 +188,6 @@
|
|||
<box id="monthly-period-relative-date-box"
|
||||
orient="horizontal" align="center">
|
||||
<radio id="montly-period-relative-date-radio"
|
||||
label="&event.recurrence.the.label;"
|
||||
selected="true"
|
||||
disable-on-readonly="true"
|
||||
disable-on-occurrence="true"/>
|
||||
|
|
@ -196,23 +195,26 @@
|
|||
disable-on-readonly="true"
|
||||
disable-on-occurrence="true">
|
||||
<menupopup id="montly-ordinal-menupopup">
|
||||
<menuitem id="monthly-ordinal-every-label"
|
||||
label="&event.recurrence.monthly.every.label;"
|
||||
value="0"/>
|
||||
<menuitem id="monthly-ordinal-first-label"
|
||||
label="&event.recurrence.repeat.first.label;"
|
||||
label="&event.recurrence.monthly.first.label;"
|
||||
value="1"/>
|
||||
<menuitem id="mnthly-ordinal-second-label"
|
||||
label="&event.recurrence.repeat.second.label;"
|
||||
<menuitem id="monthly-ordinal-second-label"
|
||||
label="&event.recurrence.monthly.second.label;"
|
||||
value="2"/>
|
||||
<menuitem id="monthly-ordinal-third-label"
|
||||
label="&event.recurrence.repeat.third.label;"
|
||||
label="&event.recurrence.monthly.third.label;"
|
||||
value="3"/>
|
||||
<menuitem id="monthly-ordinal-fourth-label"
|
||||
label="&event.recurrence.repeat.fourth.label;"
|
||||
label="&event.recurrence.monthly.fourth.label;"
|
||||
value="4"/>
|
||||
<menuitem id="monthly-ordinal-fifth-label"
|
||||
label="&event.recurrence.repeat.fifth.label;"
|
||||
label="&event.recurrence.monthly.fifth.label;"
|
||||
value="5"/>
|
||||
<menuitem id="monthly-ordinal-last-label"
|
||||
label="&event.recurrence.repeat.last.label;"
|
||||
label="&event.recurrence.monthly.last.label;"
|
||||
value="-1"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
|
|
@ -350,7 +352,6 @@
|
|||
</row>
|
||||
<row id="yearly-period-relative-row" align="center">
|
||||
<radio id="yearly-period-relative-radio"
|
||||
label="&event.recurrence.pattern.yearly.every.weekday.label;"
|
||||
disable-on-readonly="true"
|
||||
disable-on-occurrence="true"/>
|
||||
<box id="yearly-period-relative-controls"
|
||||
|
|
@ -360,23 +361,26 @@
|
|||
disable-on-readonly="true"
|
||||
disable-on-occurrence="true">
|
||||
<menupopup id="yearly-ordinal-menupopup">
|
||||
<menuitem id="yearly-ordinal-every"
|
||||
label="&event.recurrence.yearly.every.label;"
|
||||
value="0"/>
|
||||
<menuitem id="yearly-ordinal-first"
|
||||
label="&event.recurrence.pattern.yearly.first.label;"
|
||||
label="&event.recurrence.yearly.first.label;"
|
||||
value="1"/>
|
||||
<menuitem id="yearly-ordinal-second"
|
||||
label="&event.recurrence.pattern.yearly.second.label;"
|
||||
label="&event.recurrence.yearly.second.label;"
|
||||
value="2"/>
|
||||
<menuitem id="yearly-ordinal-third"
|
||||
label="&event.recurrence.pattern.yearly.third.label;"
|
||||
label="&event.recurrence.yearly.third.label;"
|
||||
value="3"/>
|
||||
<menuitem id="yearly-ordinal-fourth"
|
||||
label="&event.recurrence.pattern.yearly.fourth.label;"
|
||||
label="&event.recurrence.yearly.fourth.label;"
|
||||
value="4"/>
|
||||
<menuitem id="yearly-ordinal-fifth"
|
||||
label="&event.recurrence.pattern.yearly.fifth.label;"
|
||||
label="&event.recurrence.yearly.fifth.label;"
|
||||
value="5"/>
|
||||
<menuitem id="yearly-ordinal-last"
|
||||
label="&event.recurrence.pattern.yearly.last.label;"
|
||||
label="&event.recurrence.yearly.last.label;"
|
||||
value="-1"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
|
|
|
|||
|
|
@ -258,13 +258,13 @@
|
|||
|
||||
<!ENTITY event.recurrence.pattern.monthly.every.label "Every" >
|
||||
<!ENTITY repeat.units.months.both "Month(s)" >
|
||||
<!ENTITY event.recurrence.the.label "The" >
|
||||
<!ENTITY event.recurrence.repeat.first.label "First">
|
||||
<!ENTITY event.recurrence.repeat.second.label "Second">
|
||||
<!ENTITY event.recurrence.repeat.third.label "Third">
|
||||
<!ENTITY event.recurrence.repeat.fourth.label "Fourth">
|
||||
<!ENTITY event.recurrence.repeat.fifth.label "Fifth">
|
||||
<!ENTITY event.recurrence.repeat.last.label "Last">
|
||||
<!ENTITY event.recurrence.monthly.every.label "Every" >
|
||||
<!ENTITY event.recurrence.monthly.first.label "The First">
|
||||
<!ENTITY event.recurrence.monthly.second.label "The Second">
|
||||
<!ENTITY event.recurrence.monthly.third.label "The Third">
|
||||
<!ENTITY event.recurrence.monthly.fourth.label "The Fourth">
|
||||
<!ENTITY event.recurrence.monthly.fifth.label "The Fifth">
|
||||
<!ENTITY event.recurrence.monthly.last.label "The Last">
|
||||
<!ENTITY event.recurrence.pattern.monthly.week.1.label "Sunday" >
|
||||
<!ENTITY event.recurrence.pattern.monthly.week.2.label "Monday" >
|
||||
<!ENTITY event.recurrence.pattern.monthly.week.3.label "Tuesday" >
|
||||
|
|
@ -278,7 +278,6 @@
|
|||
<!ENTITY event.recurrence.every.label "Every:" >
|
||||
<!ENTITY repeat.units.years.both "Year(s)" >
|
||||
<!ENTITY event.recurrence.pattern.yearly.every.month.label "Every" >
|
||||
<!ENTITY event.recurrence.pattern.yearly.every.weekday.label "Every" >
|
||||
|
||||
<!-- LOCALIZATON NOTE
|
||||
Some languages use a preposition when describing dates:
|
||||
|
|
@ -301,12 +300,13 @@
|
|||
<!ENTITY event.recurrence.pattern.yearly.month.10.label "October" >
|
||||
<!ENTITY event.recurrence.pattern.yearly.month.11.label "November" >
|
||||
<!ENTITY event.recurrence.pattern.yearly.month.12.label "December" >
|
||||
<!ENTITY event.recurrence.pattern.yearly.first.label "First">
|
||||
<!ENTITY event.recurrence.pattern.yearly.second.label "Second">
|
||||
<!ENTITY event.recurrence.pattern.yearly.third.label "Third">
|
||||
<!ENTITY event.recurrence.pattern.yearly.fourth.label "Fourth">
|
||||
<!ENTITY event.recurrence.pattern.yearly.fifth.label "Fifth">
|
||||
<!ENTITY event.recurrence.pattern.yearly.last.label "Last">
|
||||
<!ENTITY event.recurrence.yearly.every.label "Every">
|
||||
<!ENTITY event.recurrence.yearly.first.label "The First">
|
||||
<!ENTITY event.recurrence.yearly.second.label "The Second">
|
||||
<!ENTITY event.recurrence.yearly.third.label "The Third">
|
||||
<!ENTITY event.recurrence.yearly.fourth.label "The Fourth">
|
||||
<!ENTITY event.recurrence.yearly.fifth.label "The Fifth">
|
||||
<!ENTITY event.recurrence.yearly.last.label "The Last">
|
||||
<!ENTITY event.recurrence.pattern.yearly.week.1.label "Sunday" >
|
||||
<!ENTITY event.recurrence.pattern.yearly.week.2.label "Monday" >
|
||||
<!ENTITY event.recurrence.pattern.yearly.week.3.label "Tuesday" >
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
# LOCALIZATION NOTE (repeatDetailsRuleDaily3):
|
||||
# LOCALIZATION NOTE (dailyEveryNth):
|
||||
# Edit recurrence window -> Recurrence pattern -> Daily repeat rules
|
||||
# #1 - number
|
||||
# e.g. "every 4 days"
|
||||
|
|
@ -57,10 +57,17 @@ weeklyNthOn=every %1$S;every #2 weeks on %1$S
|
|||
# e.g. "every 5 weeks"
|
||||
weeklyEveryNth=every week;every #1 weeks
|
||||
|
||||
repeatDetailsDay1=Sunday
|
||||
repeatDetailsDay2=Monday
|
||||
repeatDetailsDay3=Tuesday
|
||||
repeatDetailsDay4=Wednesday
|
||||
repeatDetailsDay5=Thursday
|
||||
repeatDetailsDay6=Friday
|
||||
repeatDetailsDay7=Saturday
|
||||
|
||||
# LOCALIZATION NOTE (repeatDetailsAnd)
|
||||
# Used to show a number of weekdays in a list
|
||||
# i.e. "Sunday, Monday, Tuesday " + and + " Wednesday"
|
||||
# XXX Please file a bug if this makes it hard to localize the list.
|
||||
repeatDetailsAnd=and
|
||||
|
||||
# LOCALIZATION NOTE (monthlyNthOfEvery):
|
||||
|
|
@ -122,10 +129,23 @@ yearlyNthOnNthOf=the %1$S %2$S of every %3$S;every #4 years on the %1$S %2$S of
|
|||
# Edit recurrence window -> Recurrence pattern -> Yearly repeat rules
|
||||
# %1$S - weekday
|
||||
# %2$S - month
|
||||
# #4 - number
|
||||
# #3 - number
|
||||
# e.g. "every Thursday of March"
|
||||
# e.g "every 3 years on every Thursday of March"
|
||||
yearlyEveryNthOfNth=every %1$S of %2$S;every 3 years on every %1$S of %2$S
|
||||
yearlyOnEveryNthOfNth=every %1$S of %2$S;every #3 years on every %1$S of %2$S
|
||||
|
||||
repeatDetailsMonth1=January
|
||||
repeatDetailsMonth2=February
|
||||
repeatDetailsMonth3=March
|
||||
repeatDetailsMonth4=April
|
||||
repeatDetailsMonth5=May
|
||||
repeatDetailsMonth6=June
|
||||
repeatDetailsMonth7=July
|
||||
repeatDetailsMonth8=August
|
||||
repeatDetailsMonth9=September
|
||||
repeatDetailsMonth10=October
|
||||
repeatDetailsMonth11=November
|
||||
repeatDetailsMonth12=December
|
||||
|
||||
# LOCALIZATION NOTE (repeatCount):
|
||||
# Edit recurrence window -> Recurrence details link on Event/Task dialog window
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче