From aa7bceaa0ad550e370de7aaf262ebbb57306f6bd Mon Sep 17 00:00:00 2001 From: "jminta%gmail.com" Date: Thu, 19 Jan 2006 23:02:57 +0000 Subject: [PATCH] Bug 321381 Non-localized strings in the new-views r=mostafah --- .../content/calendar-decorated-day-view.xml | 10 +++++--- .../content/calendar-decorated-month-view.xml | 13 +++++----- .../calendar-decorated-multiweek-view.xml | 7 ++++-- .../content/calendar-decorated-week-view.xml | 7 ++++-- calendar/base/content/calendar-month-view.xml | 25 ++++++++----------- .../base/content/calendar-multiday-view.xml | 8 +++--- 6 files changed, 37 insertions(+), 33 deletions(-) diff --git a/calendar/base/content/calendar-decorated-day-view.xml b/calendar/base/content/calendar-decorated-day-view.xml index 61dee57d586..91e137be57f 100644 --- a/calendar/base/content/calendar-decorated-day-view.xml +++ b/calendar/base/content/calendar-decorated-day-view.xml @@ -84,12 +84,14 @@ diff --git a/calendar/base/content/calendar-decorated-month-view.xml b/calendar/base/content/calendar-decorated-month-view.xml index 89ca4f32b23..8da21799117 100644 --- a/calendar/base/content/calendar-decorated-month-view.xml +++ b/calendar/base/content/calendar-decorated-month-view.xml @@ -115,13 +115,14 @@ diff --git a/calendar/base/content/calendar-decorated-multiweek-view.xml b/calendar/base/content/calendar-decorated-multiweek-view.xml index d8aefe7f378..08b1ea0db82 100644 --- a/calendar/base/content/calendar-decorated-multiweek-view.xml +++ b/calendar/base/content/calendar-decorated-multiweek-view.xml @@ -139,6 +139,10 @@ diff --git a/calendar/base/content/calendar-decorated-week-view.xml b/calendar/base/content/calendar-decorated-week-view.xml index 83e83cc493b..090be5bb3cb 100644 --- a/calendar/base/content/calendar-decorated-week-view.xml +++ b/calendar/base/content/calendar-decorated-week-view.xml @@ -112,6 +112,10 @@ diff --git a/calendar/base/content/calendar-month-view.xml b/calendar/base/content/calendar-month-view.xml index ad377423306..d73627a70a4 100644 --- a/calendar/base/content/calendar-month-view.xml +++ b/calendar/base/content/calendar-month-view.xml @@ -198,8 +198,11 @@ if (aDate.compare(aDate.startOfMonth) == 0 || aDate.compare(aDate.endOfMonth) == 0) { - var monthNames = [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ]; - daylabel.setAttribute("value", aDate.day + " " + monthNames[aDate.month]); + var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"] + .getService(Components.interfaces.nsIStringBundleService); + var props = sbs.createBundle("chrome://calendar/locale/dateFormat.properties"); + var monthName = props.GetStringFromName("month." + (aDate.month+1) + ".Mmm"); + daylabel.setAttribute("value", aDate.day + " " + monthName); } else { daylabel.setAttribute("value", aDate.day); } @@ -407,21 +410,13 @@ return this.mIndex; diff --git a/calendar/base/content/calendar-multiday-view.xml b/calendar/base/content/calendar-multiday-view.xml index 0955cfa2a3c..cbf26d190aa 100644 --- a/calendar/base/content/calendar-multiday-view.xml +++ b/calendar/base/content/calendar-multiday-view.xml @@ -2248,13 +2248,13 @@ label.setAttribute("class", "calendar-day-label-date"); labelbox.appendChild(label); - // XXX Localize me, get me out of here - var dayNames = [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ]; - var dayNamesShort = [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ]; + var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"] + .getService(Components.interfaces.nsIStringBundleService); + var props = sbs.createBundle("chrome://calendar/locale/dateFormat.properties"); label = createXULElement("label"); //label.setAttribute("flex", "1"); - label.setAttribute("value", dayNamesShort[d.weekday]); + label.setAttribute("value", props.GetStringFromName("day."+ (d.weekday+1)+ ".Mmm")); label.setAttribute("class", "calendar-day-label-name"); labelbox.appendChild(label);