Changed text of new study announcement from 'is beginning' to 'is about to begin'. Revved the property name in main.properties.
authorJono X <jono@mozilla.com>
Wed, 14 Jul 2010 16:02:38 -0700
changeset 461 207a24a5e96225822e8d612da4f7fce1d137c360
parent 460 f8c997dc46c62fce26f1138fec2ffda733d044ea
child 462 245746e36307cc4378bd04d879ca47e42d1c2abf
push id383
push userjdicarlo@mozilla.com
push dateWed, 14 Jul 2010 23:02:40 +0000
Changed text of new study announcement from 'is beginning' to 'is about to begin'. Revved the property name in main.properties.
extension/content/experiment-page.js
extension/locale/en-US/main.properties
extension/modules/setup.js
--- a/extension/content/experiment-page.js
+++ b/extension/content/experiment-page.js
@@ -362,16 +362,18 @@ var stringBundle;
   }
 
   function loadExperimentPage() {
     Components.utils.import("resource://testpilot/modules/setup.js");
     Components.utils.import("resource://testpilot/modules/tasks.js");
     var contentDiv = document.getElementById("experiment-specific-text");
     var dataPrivacyDiv = document.getElementById("data-privacy-text");
     // Get experimentID from the GET args of page
+    // TODO no reason actually to do parseInt here -- all it accomplishes
+    // is preventing us from using non-numeric study IDs.
     var eid = parseInt(getUrlParam("eid"));
     var experiment = TestPilotSetup.getTaskById(eid);
     if (!experiment) {
       // Possible that experiments aren't done loading yet.  Try again in
       // a few seconds.
       contentDiv.innerHTML =
         stringBundle.GetStringFromName("testpilot.statusPage.loading");
       window.setTimeout(function() { loadExperimentPage(); }, 2000);
--- a/extension/locale/en-US/main.properties
+++ b/extension/locale/en-US/main.properties
@@ -78,17 +78,17 @@ testpilot.finishedTask.allRelatedDataDel
 
 # modules/setup.js
 testpilot.notification.update = Update…
 testpilot.notification.thankYouForUploadingData = Thanks!
 testpilot.notification.thankYouForUploadingData.message = Thank you for uploading your data.
 testpilot.notification.readyToSubmit = Ready to Submit
 testpilot.notification.readyToSubmit.message = The Test Pilot "%S" study is finished gathering data and is ready to submit.
 testpilot.notification.newTestPilotStudy = New Test Pilot Study
-testpilot.notification.newTestPilotStudy.message = The Test Pilot "%S" study is now beginning.
+testpilot.notification.newTestPilotStudy.pre.message = The Test Pilot "%S" study is about to begin.
 testpilot.notification.newTestPilotSurvey = New Test Pilot Survey
 testpilot.notification.newTestPilotSurvey.message = The Test Pilot "%S" survey is available.
 testpilot.notification.newTestPilotResults = New Test Pilot Results
 testpilot.notification.newTestPilotResults.message = New results are now available for the Test Pilot "%S" study.
 testpilot.notification.autoUploadedData = Thank you!
 testpilot.notification.autoUploadedData.message = The Test Pilot "%S" study is completed and your data has been submitted!
 testpilot.notification.extensionUpdate = Extension Update
 testpilot.notification.extensionUpdate.message = One of your studies requires a newer version of Test Pilot. You can get the latest version using the Add-ons window.
--- a/extension/modules/setup.js
+++ b/extension/modules/setup.js
@@ -556,17 +556,17 @@ let TestPilotSetup = {
       for (i = 0; i < this.taskList.length; i++) {
         task = this.taskList[i];
         if (task.status == TaskConstants.STATUS_PENDING ||
             task.status == TaskConstants.STATUS_NEW) {
           if (task.taskType == TaskConstants.TYPE_EXPERIMENT) {
 	    this._showNotification(
 	      task, false,
 	      this._stringBundle.formatStringFromName(
-		"testpilot.notification.newTestPilotStudy.message",
+		"testpilot.notification.newTestPilotStudy.pre.message",
 		[task.title], 1),
 	      this._stringBundle.GetStringFromName(
 		"testpilot.notification.newTestPilotStudy"),
 	      "new-study", false, false,
 	      this._stringBundle.GetStringFromName("testpilot.moreInfo"),
 	      task.defaultUrl, false, function() {
                 /* on close callback (Bug 575767) -- when the "new study
                  * starting" popup is dismissed, then the study can start. */