mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
bug 343173 - Use stringbundle helpers for import-export. Patch by Stefan Sitter <ssitter@googlemail.com>, r=mvl
This commit is contained in:
parent
81189d3797
commit
89dd51a153
@ -24,6 +24,7 @@
|
||||
* Eric Belhaire <belhaire@ief.u-psud.fr>
|
||||
* Jussi Kukkonen <jussi.kukkonen@welho.com>
|
||||
* Michiel van Leeuwen <mvl@exedo.nl>
|
||||
* Stefan Sitter <ssitter@googlemail.com>
|
||||
*
|
||||
* 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
|
||||
@ -62,8 +63,7 @@ function loadEventsFromFile(aCalendar)
|
||||
|
||||
var fp = Components.classes["@mozilla.org/filepicker;1"]
|
||||
.createInstance(nsIFilePicker);
|
||||
fp.init(window, getCalStringBundle().GetStringFromName("Open"),
|
||||
nsIFilePicker.modeOpen);
|
||||
fp.init(window, calGetString("calendar", "Open"), nsIFilePicker.modeOpen);
|
||||
fp.defaultExtension = "ics";
|
||||
|
||||
// Get a list of exporters
|
||||
@ -107,7 +107,7 @@ function loadEventsFromFile(aCalendar)
|
||||
}
|
||||
catch(ex)
|
||||
{
|
||||
showError(getCalStringBundle().GetStringFromName("unableToRead") + filePath + "\n"+ex );
|
||||
showError(calGetString("calendar", "unableToRead") + filePath + "\n" + ex);
|
||||
}
|
||||
|
||||
if (aCalendar) {
|
||||
@ -126,7 +126,7 @@ function loadEventsFromFile(aCalendar)
|
||||
// Ask what calendar to import into
|
||||
var args = new Object();
|
||||
args.onOk = function putItems(aCal) { putItemsIntoCal(aCal, items); };
|
||||
args.promptText = getCalStringBundle().GetStringFromName("importPrompt");
|
||||
args.promptText = calGetString("calendar", "importPrompt");
|
||||
openDialog("chrome://calendar/content/chooseCalendarDialog.xul",
|
||||
"_blank", "chrome,titlebar,modal,resizable", args);
|
||||
}
|
||||
@ -207,7 +207,7 @@ function saveEventsToFile(calendarEventArray, aDefaultFileName)
|
||||
|
||||
if (!calendarEventArray.length)
|
||||
{
|
||||
alert(getCalStringBundle().GetStringFromName("noEventsToSave"));
|
||||
alert(calGetString("calendar", "noEventsToSave"));
|
||||
return;
|
||||
}
|
||||
|
||||
@ -217,15 +217,14 @@ function saveEventsToFile(calendarEventArray, aDefaultFileName)
|
||||
var fp = Components.classes["@mozilla.org/filepicker;1"]
|
||||
.createInstance(nsIFilePicker);
|
||||
|
||||
fp.init(window, getCalStringBundle().GetStringFromName("SaveAs"),
|
||||
nsIFilePicker.modeSave);
|
||||
fp.init(window, calGetString("calendar", "SaveAs"), nsIFilePicker.modeSave);
|
||||
|
||||
if (aDefaultFileName && aDefaultFileName.length && aDefaultFileName.length > 0) {
|
||||
fp.defaultString = aDefaultFileName;
|
||||
} else if (calendarEventArray.length == 1 && calendarEventArray[0].title) {
|
||||
fp.defaultString = calendarEventArray[0].title;
|
||||
} else {
|
||||
fp.defaultString = getCalStringBundle().GetStringFromName("defaultFileName");
|
||||
fp.defaultString = calGetString("calendar", "defaultFileName");
|
||||
}
|
||||
|
||||
fp.defaultExtension = "ics";
|
||||
@ -290,7 +289,7 @@ function saveEventsToFile(calendarEventArray, aDefaultFileName)
|
||||
}
|
||||
catch(ex)
|
||||
{
|
||||
showError(getCalStringBundle().GetStringFromName("unableToWrite") + filePath );
|
||||
showError(calGetString("calendar", "unableToWrite") + filePath);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -330,7 +329,7 @@ function exportEntireCalendar(aCalendar) {
|
||||
// Ask what calendar to import into
|
||||
var args = new Object();
|
||||
args.onOk = getItemsFromCal;
|
||||
args.promptText = getCalStringBundle().GetStringFromName("exportPrompt");
|
||||
args.promptText = calGetString("calendar", "exportPrompt");
|
||||
openDialog("chrome://calendar/content/chooseCalendarDialog.xul",
|
||||
"_blank", "chrome,titlebar,modal,resizable", args);
|
||||
}
|
||||
@ -339,19 +338,11 @@ function exportEntireCalendar(aCalendar) {
|
||||
}
|
||||
}
|
||||
|
||||
function getCalStringBundle()
|
||||
{
|
||||
var strBundleService =
|
||||
Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
return strBundleService.createBundle("chrome://calendar/locale/calendar.properties");
|
||||
}
|
||||
|
||||
function showError(aMsg)
|
||||
{
|
||||
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
|
||||
.getService(Components.interfaces.nsIPromptService);
|
||||
promptService.alert(null,
|
||||
getCalStringBundle().GetStringFromName('errorTitle'),
|
||||
calGetString("calendar", "errorTitle"),
|
||||
aMsg);
|
||||
}
|
||||
|
@ -56,11 +56,8 @@ function QueryInterface(aIID) {
|
||||
calHtmlExporter.prototype.getFileTypes =
|
||||
function getFileTypes(aCount) {
|
||||
aCount.value = 1;
|
||||
var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
var props = sbs.createBundle("chrome://calendar/locale/calendar.properties");
|
||||
var wildmat = '*.html; *.htm';
|
||||
var label = props.formatStringFromName('filterHtml', [wildmat], 1);
|
||||
var label = calGetString("calendar", 'filterHtml', [wildmat]);
|
||||
return([{defaultExtension:'html',
|
||||
extensionFilter: wildmat,
|
||||
description: label}]);
|
||||
|
@ -53,11 +53,8 @@ function QueryInterface(aIID) {
|
||||
|
||||
function getIcsFileTypes(aCount) {
|
||||
aCount.value = 1;
|
||||
var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
var props = sbs.createBundle("chrome://calendar/locale/calendar.properties");
|
||||
var wildmat = '*.ics';
|
||||
var label = props.formatStringFromName('filterIcs', [wildmat], 1);
|
||||
var label = calGetString("calendar", 'filterIcs', [wildmat]);
|
||||
return([{defaultExtension:'ics',
|
||||
extensionFilter: wildmat,
|
||||
description: label}]);
|
||||
|
@ -56,10 +56,7 @@ function QueryInterface(aIID) {
|
||||
|
||||
calListFormatter.prototype.getName =
|
||||
function list_getName() {
|
||||
var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
var props = sbs.createBundle("chrome://calendar/locale/calendar.properties");
|
||||
return props.GetStringFromName("formatListName");
|
||||
return calGetString("calendar", "formatListName");
|
||||
};
|
||||
calListFormatter.prototype.__defineGetter__("name", calListFormatter.prototype.getName);
|
||||
|
||||
|
@ -54,11 +54,8 @@ function QueryInterface(aIID) {
|
||||
|
||||
function getOutlookCsvFileTypes(aCount) {
|
||||
aCount.value = 1;
|
||||
var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
var props = sbs.createBundle("chrome://calendar/locale/calendar.properties");
|
||||
var wildmat = '*.csv';
|
||||
var label = props.formatStringFromName('filterOutlookCsv', [wildmat], 1);
|
||||
var label = calGetString("calendar", 'filterOutlookCsv', [wildmat]);
|
||||
return([{defaultExtension:'csv',
|
||||
extensionFilter: wildmat,
|
||||
description: label}]);
|
||||
|
@ -109,10 +109,6 @@ function weekPrint_format(aStream, aStart, aEnd, aCount, aItems, aTitle) {
|
||||
}
|
||||
var sortedList = filteredItems.sort(compareItems);
|
||||
|
||||
var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
var props = sbs.createBundle("chrome://calendar/locale/calendar.properties");
|
||||
|
||||
var weekFormatter = Components.classes["@mozilla.org/calendar/weektitle-service;1"]
|
||||
.getService(Components.interfaces.calIWeekTitleService);
|
||||
|
||||
@ -143,7 +139,7 @@ function weekPrint_format(aStream, aStart, aEnd, aCount, aItems, aTitle) {
|
||||
|
||||
while(date.compare(end) == -1) {
|
||||
var weekno = weekFormatter.getWeekTitle(date);
|
||||
var weekTitle = props.formatStringFromName('WeekTitle', [weekno], 1);
|
||||
var weekTitle = calGetString("calendar", 'WeekTitle', [weekno]);
|
||||
body.appendChild(
|
||||
<table border='0' width='100%' class='main-table'>
|
||||
<tr>
|
||||
@ -254,10 +250,7 @@ function weekPrint_getDayTable(aDate, aItems) {
|
||||
|
||||
// We cache the string for "All Day" 'cause we're good like that.
|
||||
if (this.mAllDayString == null) {
|
||||
var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
var props = sbs.createBundle("chrome://calendar/locale/dateFormat.properties");
|
||||
this.mAllDayString = props.GetStringFromName("AllDay");
|
||||
this.mAllDayString = calGetString("dateFormat", "AllDay");
|
||||
}
|
||||
return this.mAllDayString;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user