зеркало из https://github.com/mozilla/pjs.git
Bug 321381 Non-localized strings in the new-views r=mostafah
This commit is contained in:
Родитель
4f56aac4f7
Коммит
aa7bceaa0a
|
@ -84,12 +84,14 @@
|
|||
<method name="setNavLabels">
|
||||
<parameter name="aDate"/>
|
||||
<body><![CDATA[
|
||||
//XXX l10n love needed
|
||||
var dayNames = ["Sunday","Monday","Tuesday","Wednesday","Thursday",
|
||||
"Friday","Saturday","Sunday"];
|
||||
var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
var props = sbs.createBundle("chrome://calendar/locale/dateFormat.properties");
|
||||
|
||||
var nameArray = new Array();
|
||||
for (var i = -2; i < 3; i++) {
|
||||
nameArray.push(dayNames[(aDate.weekday+i+7)%7]);
|
||||
var index = ((aDate.weekday + i + 7) % 7) + 1;
|
||||
nameArray.push(props.GetStringFromName("day."+index+".name"));
|
||||
}
|
||||
document.getAnonymousElementByAttribute(this, "anonid", "nav-control").setNames(nameArray);
|
||||
]]></body>
|
||||
|
|
|
@ -115,13 +115,14 @@
|
|||
<method name="setNavLabels">
|
||||
<parameter name="aDate"/>
|
||||
<body><![CDATA[
|
||||
//XXX l10n Get me out of here
|
||||
var monthNames = ["January","February","March","April","May",
|
||||
"June","July","August","September","October",
|
||||
"November","December"];
|
||||
var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
var props = sbs.createBundle("chrome://calendar/locale/dateFormat.properties");
|
||||
var nameArray = new Array();
|
||||
for (var i = -2; i < 3; i++)
|
||||
nameArray.push(monthNames[(aDate.month+i+12)%12]);
|
||||
for (var i = -2; i < 3; i++) {
|
||||
var index = ((aDate.month + i + 12) % 12) + 1;
|
||||
nameArray.push(props.GetStringFromName("month."+index+".name"));
|
||||
}
|
||||
document.getAnonymousElementByAttribute(this, "anonid", "nav-control").setNames(nameArray);
|
||||
]]></body>
|
||||
</method>
|
||||
|
|
|
@ -139,6 +139,10 @@
|
|||
<parameter name="aDate"/>
|
||||
<body><![CDATA[
|
||||
var nameArray = new Array();
|
||||
var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
var props = sbs.createBundle("chrome://calendar/locale/calendar.properties");
|
||||
var weekString = props.GetStringFromName("Week");
|
||||
for (var i = -2; i < 3; i++) {
|
||||
var date = aDate.clone();
|
||||
// Add/subtract I number of weeks
|
||||
|
@ -155,8 +159,7 @@
|
|||
date.normalize();
|
||||
var weekno2 = Math.floor ((date.yearday - date.weekday) / 7);
|
||||
|
||||
//XXX l10n love needed
|
||||
nameArray.push("Week " + weekno1 + '-' + weekno2);
|
||||
nameArray.push(weekString + weekno1 + '-' + weekno2);
|
||||
}
|
||||
document.getAnonymousElementByAttribute(this, "anonid", "nav-control").setNames(nameArray);
|
||||
]]></body>
|
||||
|
|
|
@ -112,6 +112,10 @@
|
|||
<parameter name="aDate"/>
|
||||
<body><![CDATA[
|
||||
var nameArray = new Array();
|
||||
var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
var props = sbs.createBundle("chrome://calendar/locale/calendar.properties");
|
||||
var weekString = props.GetStringFromName("Week");
|
||||
for (var i = -2; i < 3; i++) {
|
||||
var date = aDate.clone();
|
||||
// Add/subtract i number of weeks
|
||||
|
@ -122,8 +126,7 @@
|
|||
// to get some better dateUtils into calDateTime
|
||||
var weekno = Math.floor ((date.yearday - date.weekday) / 7);
|
||||
|
||||
//XXX l10n love needed
|
||||
nameArray.push("Week " + weekno);
|
||||
nameArray.push(weekString + weekno);
|
||||
}
|
||||
document.getAnonymousElementByAttribute(this, "anonid", "nav-control").setNames(nameArray);
|
||||
]]></body>
|
||||
|
|
|
@ -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 @@
|
|||
<getter>return this.mIndex;</getter>
|
||||
<setter><![CDATA[
|
||||
this.mIndex = val % 7;
|
||||
|
||||
// XXX aaaaaaaa
|
||||
var weekdayNames = [
|
||||
"Sunday",
|
||||
"Monday",
|
||||
"Tuesday",
|
||||
"Wednesday",
|
||||
"Thursday",
|
||||
"Friday",
|
||||
"Saturday",
|
||||
"Sunday"
|
||||
];
|
||||
var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
var props = sbs.createBundle("chrome://calendar/locale/dateFormat.properties");
|
||||
|
||||
var label = document.getAnonymousElementByAttribute(this, "anonid", "label");
|
||||
label.setAttribute("value", weekdayNames[this.mIndex]);
|
||||
var dayName = props.GetStringFromName("day." + (this.mIndex+1) + ".name");
|
||||
label.setAttribute("value", dayName);
|
||||
|
||||
return this.mIndex;
|
||||
]]></setter>
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче