Bug 575080: l10n review of test pilot/feedback. r=pike

This commit is contained in:
Jono S Xia 2010-07-13 10:00:10 -07:00
parent 555b6bb197
commit fd40f90d4a
5 changed files with 39 additions and 36 deletions

View File

@ -71,6 +71,9 @@ var stringBundle;
}
}
// Study web content must provide an element with id 'upload-status'.
// Fill it first with a message about data being uploaded; if there's
// an error, replace it with the error message.
let uploadStatus = document.getElementById("upload-status");
uploadStatus.innerHTML =
stringBundle.GetStringFromName("testpilot.statusPage.uploadingData");
@ -79,10 +82,14 @@ var stringBundle;
window.location =
"chrome://testpilot/content/status.html?eid=" + eid;
} else {
uploadStatus.innerHTML =
"<p>" +
stringBundle.GetStringFromName("testpilot.statusPage.uploadError") +
"</p>";
// Replace 'now uploading' message
let errorParagraph = document.createElement("p");
errorParagraph.innerHTML = stringBundle.GetStringFromName("testpilot.statusPage.uploadErrorMsg");
let willRetryParagraph = document.createElement("p");
willRetryParagraph.innerHTML = stringBundle.GetStringFromName("testpilot.statusPage.willRetry");
uploadStatus.innerHTML = "";
uploadStatus.appendChild(errorParagraph);
uploadStatus.appendChild(willRetryParagraph);
}
});
}
@ -236,6 +243,7 @@ var stringBundle;
function showMetaData() {
Components.utils.import("resource://testpilot/modules/metadata.js");
Components.utils.import("resource://gre/modules/PluralForm.jsm");
MetadataCollector.getMetadata(function(md) {
var mdLocale = document.getElementById("md-locale");
if (mdLocale)
@ -248,15 +256,11 @@ var stringBundle;
mdOs.innerHTML = md.operatingSystem;
var mdNumExt = document.getElementById("md-num-ext");
if (mdNumExt) {
// This computes the correctly localized singular or plural string
// of the number of extensions, e.g. "1 extension", "2 extensions", etc.
let str = stringBundle.GetStringFromName("testpilot.statusPage.numExtensions");
var numExt = md.extensions.length;
if (numExt == 1) {
mdNumExt.innerHTML =
stringBundle.GetStringFromName("testpilot.statusPage.extension");
} else {
mdNumExt.innerHTML =
stringBundle.formatStringFromName(
"testpilot.statusPage.extensions", [numExt], 1);
}
mdNumExt.innerHTML = PluralForm.get(numExt, str).replace("#1", numExt);
}
});
}
@ -443,7 +447,7 @@ var stringBundle;
{ id: "recur-options",
stringKey: "testpilot.quitPage.recurringStudy" },
{ id: "quit-forever-text",
stringKey: "testpilot.quitPage.quitFoever" },
stringKey: "testpilot.quitPage.quitForever" },
{ id: "quit-study-link",
stringKey: "testpilot.quitPage.quitStudy" }
];

View File

@ -87,8 +87,6 @@ var TestPilotWelcomePage = {
stringKey: "testpilot.welcomePage.moreIconExplanation" },
{ id: "notification-info-text",
stringKey: "testpilot.welcomePage.notificationInfo" },
{ id: "copyright-text",
stringKey: "testpilot.welcomePage.copyright" },
{ id: "privacy-policy-link",
stringKey: "testpilot.welcomePage.privacyPolicy" },
{ id: "legal-notices-link",

View File

@ -45,7 +45,6 @@
</div>
<div id="footer">
<img class="mozLogo" src="chrome://testpilot/skin/mozilla-logo.png">
<span id="copyright-text"></span>&nbsp; &nbsp;
<a href="http://www.mozilla.com/en-US/privacy-policy.html"
id="privacy-policy-link"></a> &nbsp; &nbsp;
<a href="http://www.mozilla.com/en-US/about/legal.html"

View File

@ -15,7 +15,7 @@
<!ENTITY testpilot.studiesWindow.finishedStudies.label "Finished Studies">
<!ENTITY testpilot.studiesWindow.studyFindings.label "Study Findings">
<!ENTITY testpilot.studiesWindow.settings.label "Settings">
<!ENTITY testpilot.studiesWindow.stillLoadingMessage "Loading, please wait...">
<!ENTITY testpilot.studiesWindow.stillLoadingMessage "Loading, please wait">
<!-- raw data dialog -->
<!ENTITY testpilot.rawDataWindow.title "Test Pilot: Raw Data">
@ -26,5 +26,5 @@
<!-- Firefox 4 beta version UI -->
<!ENTITY testpilot.enable.label "Turn On User Studies">
<!ENTITY testpilot.feedbackbutton.label "Feedback">
<!ENTITY testpilot.happy.label "Firefox Made Me Happy Because...">
<!ENTITY testpilot.sad.label "Firefox Made Me Sad Because...">
<!ENTITY testpilot.happy.label "Firefox Made Me Happy Because">
<!ENTITY testpilot.sad.label "Firefox Made Me Sad Because">

View File

@ -10,7 +10,7 @@ testpilot.turnOff = Turn Off User Studies
# studies window
testpilot.studiesWindow.noStudies = We are working on a new study now; it will knock on your door soon! Stay Tuned!
testpilot.studiesWindow.uploading = Uploading...
testpilot.studiesWindow.uploading = Uploading
testpilot.studiesWindow.unableToReachServer = Unable to reach Mozilla; please try again later.
testpilot.studiesWindow.thanksForContributing = Thanks for contributing!
testpilot.studiesWindow.finishedOn = Finished on %S
@ -21,32 +21,35 @@ testpilot.studiesWindow.willFinish = Will finish on %S
testpilot.studiesWindow.proposeStudy = Propose your own study
# for pages
testpilot.page.commentsAndDiscussions = Comments & Discussions &raquo;
testpilot.page.proposeATest = Propose a Test &raquo;
testpilot.page.testpilotOnTwitter = @MozTestPilot on Twitter &raquo;
testpilot.page.commentsAndDiscussions = Comments & Discussions »
testpilot.page.proposeATest = Propose a Test »
testpilot.page.testpilotOnTwitter = @MozTestPilot on Twitter »
# status page
testpilot.statusPage.uploadingData = Now uploading data...
testpilot.statusPage.uploadError =
Oops! There was an error connecting to the Mozilla servers. Maybe your network connection is down?</p><p>Test Pilot will retry automatically, so it's OK to close this page now.
testpilot.statusPage.uploadingData = Now uploading data
testpilot.statusPage.uploadErrorMsg = Oops! There was an error connecting to the Mozilla servers. Maybe your network connection is down?
testpilot.statusPage.willRetry = Test Pilot will retry automatically, so it's OK to close this page now.
testpilot.statusPage.endedAlready = (It has already ended and you should not be seeing this page)
testpilot.statusPage.todayAt = today, at %S
testpilot.statusPage.endOn = on %S
testpilot.statusPage.extension = 1 extension
testpilot.statusPage.extensions = %S extension
# LOCALIZATION NOTE (numExtensions): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
# #1 = number of extensions
# example: "2 extensions"
testpilot.statusPage.numExtensions = #1 extension;#1 extensions
testpilot.statusPage.recursEveryNumberOfDays = This test recurs every %S days. Each time it completes:
testpilot.statusPage.askMeBeforeSubmitData = Ask me whether I want to submit my data.
testpilot.statusPage.alwaysSubmitData = Always submit my data, and don't ask me about it.
testpilot.statusPage.neverSubmitData = Never submit my data, and don't ask me about it.
testpilot.statusPage.loading = Loading, please wait a moment...
testpilot.statusPage.loading = Loading, please wait a moment
# quit page
testpilot.quitPage.aboutToQuit = You are about to quit the "%S" study.
testpilot.quitPage.optionalMessage = (Optional) If you have a minute, please let us know why you have chosen to quit the study.
testpilot.quitPage.reason = Reason:
testpilot.quitPage.recurringStudy = This is a recurring study. Normally we will let you know the next time we run the study. If you never want to hear about this study again, check the box below:
testpilot.quitPage.quitFoever = Quit this recurring study.
testpilot.quitPage.quitStudy = Quit the Study &raquo;
testpilot.quitPage.quitForever = Quit this recurring study.
testpilot.quitPage.quitStudy = Quit the Study »
# welcome page
testpilot.welcomePage.thankYou = Thank You for Joining the Test Pilot Team!
@ -55,10 +58,9 @@ testpilot.welcomePage.pleaseTake = Please take the
testpilot.welcomePage.backgroundSurvey = Pilot Background Survey
testpilot.welcomePage.clickToOpenStudiesWindow = Click here to see the studies that are currently running.
testpilot.welcomePage.testpilotAddon = Test Pilot Add-on
testpilot.welcomePage.iconExplanation = &laquo; look for this icon in the bottom right of the browser window.
testpilot.welcomePage.iconExplanation = « look for this icon in the bottom right of the browser window.
testpilot.welcomePage.moreIconExplanation = You can click on it to get the main Test Pilot menu.
testpilot.welcomePage.notificationInfo = The icon will pop up a notification when a study needs your attention.
testpilot.welcomePage.copyright = Copyright &copy; 2005-2009 Mozilla. All rights reserved.
testpilot.welcomePage.privacyPolicy = Privacy Policy
testpilot.welcomePage.legalNotices = Legal Notices
@ -66,16 +68,16 @@ testpilot.welcomePage.legalNotices = Legal Notices
testpilot.surveyPage.saveAnswers = Save Answers
testpilot.surveyPage.submitAnswers = Submit Answers
testpilot.surveyPage.changeAnswers = Change Answers
testpilot.surveyPage.loading = Loading, please wait a moment...
testpilot.surveyPage.loading = Loading, please wait a moment
testpilot.surveyPage.thankYouForFinishingSurvey = Thank you for finishing this survey. Your answers will be uploaded along with the next set of experimental data.
testpilot.surveyPage.reviewOrChangeYourAnswers = If you would like to review or change your answers, you can do so at any time using the button below.
# modules/task.js
testpilot.finishedTask.finishedStudy = Excellent! You finished the %S Study!
testpilot.finishedTask.finishedStudy = Excellent! You finished the "%S" Study!
testpilot.finishedTask.allRelatedDataDeleted = All data related to this study has been removed from your computer.
# modules/setup.js
testpilot.notification.update = Update...
testpilot.notification.update = Update
testpilot.notification.thankYouForUploadingData = Thanks!
testpilot.notification.thankYouForUploadingData.message = Thank you for uploading your data.
testpilot.notification.readyToSubmit = Ready to Submit