Fix bug 438807 - Introduce "Meeting" category. r=philipp,p=archaeopteryx
authorPhilipp Kewisch <mozilla@kewis.ch>
Tue, 23 Sep 2008 20:38:42 +0200
changeset 403 9fdc552b6f7bab56f9f246374b64697568887ba0
parent 402 14e25711e0af4bfa7ec7652a9493d4eae413710c
child 404 580ea3dd210c42a5c90377ef669780a667cadc8a
push idunknown
push userunknown
push dateunknown
reviewersphilipp
bugs438807
Fix bug 438807 - Introduce "Meeting" category. r=philipp,p=archaeopteryx
calendar/base/content/preferences/categories.js
calendar/base/src/calUtils.js
calendar/locales/en-US/chrome/calendar/categories.properties
calendar/locales/en-US/sunbird-l10n.js
--- a/calendar/base/content/preferences/categories.js
+++ b/calendar/base/content/preferences/categories.js
@@ -65,17 +65,17 @@ var gCategoriesPane = {
         if (!parent.backupPrefList) {
             parent.backupPrefList = [];
         }
 
         var categories = document.getElementById("calendar.categories.names").value;
 
         // If no categories are configured load a default set from properties file
         if (!categories || categories == "") {
-            categories = calGetString("categories", "categories");
+            categories = calGetString("categories", "categories2");
             document.getElementById("calendar.categories.names").value = categories;
         }
 
         gCategoryList = categoriesStringToArray(categories);
         
         // When categories is empty, split returns an array containing one empty
         // string, rather than an empty array. This results in an empty listbox
         // child with no corresponding category.
--- a/calendar/base/src/calUtils.js
+++ b/calendar/base/src/calUtils.js
@@ -566,17 +566,17 @@ function getLocalizedPref(aPrefName, aDe
  * Get array of category names from preferences or locale default,
  * unescaping any commas in each category name.
  * @return array of category names
  */
 function getPrefCategoriesArray() {
     var categories = getLocalizedPref("calendar.categories.names", null);
     // If no categories are configured load a default set from properties file
     if (!categories || categories == "") {
-        categories = calGetString("categories", "categories");
+        categories = calGetString("categories", "categories2");
         setLocalizedPref("calendar.categories.names", categories);
     }
     return categoriesStringToArray(categories);
 }
 
 /**
  * Convert categories string to list of category names.
  *
--- a/calendar/locales/en-US/chrome/calendar/categories.properties
+++ b/calendar/locales/en-US/chrome/calendar/categories.properties
@@ -31,9 +31,9 @@
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 # default categories
 
-categories=Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favorites,Follow up,Gifts,Holidays,Ideas,Issues,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation
+categories2=Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favorites,Follow up,Gifts,Holidays,Ideas,Issues,Meeting,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation
--- a/calendar/locales/en-US/sunbird-l10n.js
+++ b/calendar/locales/en-US/sunbird-l10n.js
@@ -47,9 +47,9 @@ pref("calendar.week.d2tuesdaysoff", fals
 pref("calendar.week.d3wednesdaysoff", false);
 pref("calendar.week.d4thursdaysoff", false);
 pref("calendar.week.d5fridaysoff", false);
 pref("calendar.week.d6saturdaysoff", true);
 
 pref("general.useragent.locale", "@AB_CD@");
 
 # categories
-pref("calendar.categories.names", "Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favorites,Follow up,Gifts,Holidays,Ideas,Issues,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation");
+pref("calendar.categories.names", "Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favorites,Follow up,Gifts,Holidays,Ideas,Issues,Meeting,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation");