1 files changed, 18 insertions, 5 deletions

diff --git a/browser/base/content/sanitizeDialog.js b/browser/base/content/sanitizeDialog.js
index 09a7d927df..1d9ea978b9 100644
--- a/browser/base/content/sanitizeDialog.js
+++ b/browser/base/content/sanitizeDialog.js
@@ -218,7 +218,7 @@ var gSanitizePromptDialog = {
     acceptButton.disabled = noneChecked;
   },
 
-  selectByTimespan() {
+  async selectByTimespan() {
     // This method is the onselect handler for the duration dropdown.  As a
     // result it's called a couple of times before onload calls init().
     if (!this._inited) {
@@ -247,7 +247,7 @@ var gSanitizePromptDialog = {
       }
       // make sure the sizes are updated in the new dialog
       else {
-        this.updateDataSizesInUI();
+        await this.updateDataSizesInUI();
       }
       return;
     }
@@ -267,7 +267,7 @@ var gSanitizePromptDialog = {
 
     if (!lazy.USE_OLD_DIALOG) {
       // We only update data sizes to display on the new dialog
-      this.updateDataSizesInUI();
+      await this.updateDataSizesInUI();
     }
   },
 
@@ -399,7 +399,7 @@ var gSanitizePromptDialog = {
     this.cacheSize = lazy.DownloadUtils.convertByteUnits(cacheSize);
 
     this._dataSizesUpdated = true;
-    this.updateDataSizesInUI();
+    await this.updateDataSizesInUI();
   },
 
   /**
@@ -473,7 +473,7 @@ var gSanitizePromptDialog = {
   /**
    * Updates data sizes displayed based on new selected timespan
    */
-  updateDataSizesInUI() {
+  async updateDataSizesInUI() {
     if (!this._dataSizesUpdated) {
       return;
     }
@@ -491,6 +491,7 @@ var gSanitizePromptDialog = {
     let timeSpanSelected = TIMESPAN_SELECTION_MAP[index];
     let [amount, unit] = this.siteDataSizes[timeSpanSelected];
 
+    document.l10n.pauseObserving();
     document.l10n.setAttributes(
       this._cookiesAndSiteDataCheckbox,
       "item-cookies-site-data-with-size",
@@ -503,6 +504,18 @@ var gSanitizePromptDialog = {
       "item-cached-content-with-size",
       { amount, unit }
     );
+
+    // make sure l10n updates are completed
+    await document.l10n.translateElements([
+      this._cookiesAndSiteDataCheckbox,
+      this._cacheCheckbox,
+    ]);
+
+    document.l10n.resumeObserving();
+
+    // the data sizes may have led to wrapping, resize dialog to make sure the buttons
+    // don't move out of view
+    await window.resizeDialog();
   },
 
   /**