Show notifications on startup

lib/notification.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 33 matching lines @@
 
 function localize(translations, locale)
 {
   if (locale in translations)
     return translations[locale];
 
   let languagePart = locale.substring(0, locale.indexOf("-"));
   if (languagePart && languagePart in translations)
     return translations[languagePart];
 
-  let defaultLocale = "en";

[Wladimir Palant, 2013/07/19 15:17:52]

Actually, our default locale is always en-US - and that's the only reason why we
fall back from en-GB to en-US (e.g., we don't fall back from pt-BR to pt-PT).

[Felix Dahlke, 2013/07/19 17:07:01]

Done.

+  let defaultLocale = "en-US";
   return translations[defaultLocale];
 }
 
 /**
  * The object providing actual downloading functionality.
  * @type Downloader
  */
 let downloader = null;
 
 /**
@@ skipping 90 matching lines @@
       Prefs.notificationdata.shown = [];
       saveNotificationData();
     }
 
     let {application, addonVersion} = require("info");
     let notifications = Prefs.notificationdata.data.notifications;
     let notificationToShow = null;
     for each (let notification in notifications)
     {
       if ((typeof notification.severity == "undefined" || notification.severity === "information")
-          && Prefs.notificationdata.shown.indexOf(notification.timestamp) !== -1)
+          && Prefs.notificationdata.shown.indexOf(notification.id) !== -1)
         continue;
 
       if (notification.platforms instanceof Array
           && notification.platforms.indexOf(application) === -1)
         continue;
 
       if ("minVersion" in notification
           && Services.vc.compare(addonVersion, notification.minVersion) < 0)
         continue;
 
       if ("maxVersion" in notification
           && Services.vc.compare(addonVersion, notification.maxVersion) > 0)
         continue;
 
       if (!notificationToShow
           || getNumericalSeverity(notification) > getNumericalSeverity(notificationToShow))
         notificationToShow = notification;
     }
 
-    if (notificationToShow && "timestamp" in notificationToShow)
-    {
-      Prefs.notificationdata.shown.push(notificationToShow.timestamp);
+    if (notificationToShow && "id" in notificationToShow)
+    {
+      Prefs.notificationdata.shown.push(notificationToShow.id);
       saveNotificationData();
     }
 
     return notificationToShow;
   },
 
   /**
    * Localizes the texts of the supplied notification.
    * @param {Object} notification notification to translate
    * @param {String} locale the target locale (optional, defaults to the
    *                        application locale)
    * @return {Object} the translated texts
    */
   getLocalizedTexts: function(notification, locale)
   {
     locale = locale || Utils.appLocale;
     let textKeys = ["title", "message"];
     let localizedTexts = [];
     for each (let key in textKeys)
     {
       if (key in notification)
         localizedTexts[key] = localize(notification[key], locale);
     }
     return localizedTexts;
   }
 };
 Notification.init();