Bug 1412066 - Fix for count of requests in Network pane being undefined for the 3rd plural form in Czech; r=Pike draft
authorabhinav <abhinav.koppula@gmail.com>
Fri, 26 Jan 2018 01:51:01 +0530
changeset 747291 305acd27ae248d47efc61815c902c863c8448b81
parent 724404 32b850fa28ae1c29039cb7ddcdfd71b324762c05
push id96860
push userbmo:abhinav.koppula@gmail.com
push dateThu, 25 Jan 2018 20:21:29 +0000
reviewersPike
bugs1412066
milestone60.0a1
Bug 1412066 - Fix for count of requests in Network pane being undefined for the 3rd plural form in Czech; r=Pike MozReview-Commit-ID: L1GuupfPLzq
devtools/client/locales/en-US/netmonitor.properties
devtools/client/netmonitor/src/components/StatusBar.js
devtools/client/netmonitor/test/browser_net_footer-summary.js
--- a/devtools/client/locales/en-US/netmonitor.properties
+++ b/devtools/client/locales/en-US/netmonitor.properties
@@ -154,20 +154,20 @@ networkMenu.summary.tooltip.perf=Start p
 # LOCALIZATION NOTE (networkMenu.summary.tooltip.domContentLoaded): A tooltip explaining
 # what the DOMContentLoaded label displays
 networkMenu.summary.tooltip.domContentLoaded=Time when “DOMContentLoad” event occurred
 
 # LOCALIZATION NOTE (networkMenu.summary.tooltip.load): A tooltip explaining
 # what the load label displays
 networkMenu.summary.tooltip.load=Time when “load” event occurred
 
-# LOCALIZATION NOTE (networkMenu.summary.requestsCount): This label is displayed
+# LOCALIZATION NOTE (networkMenu.summary.requestsCount2): This label is displayed
 # in the network table footer providing the number of requests
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-networkMenu.summary.requestsCount=One request;%S requests
+networkMenu.summary.requestsCount2=One request;#1 requests
 
 # LOCALIZATION NOTE (networkMenu.summary.requestsCountEmpty): This label is displayed
 # in the network table footer when there are no requests
 networkMenu.summary.requestsCountEmpty=No requests
 
 # LOCALIZATION NOTE (networkMenu.summary.tooltip.requestsCount): A tooltip explaining
 # what the requestsCount label displays
 networkMenu.summary.tooltip.requestsCount=Number of requests
--- a/devtools/client/netmonitor/src/components/StatusBar.js
+++ b/devtools/client/netmonitor/src/components/StatusBar.js
@@ -33,19 +33,18 @@ const TOOLTIP_LOAD = L10N.getStr("networ
 function StatusBar({ summary, openStatistics, timingMarkers }) {
   let { count, contentSize, transferredSize, millis } = summary;
   let {
     DOMContentLoaded,
     load,
   } = timingMarkers;
 
   let countText = count === 0 ? REQUESTS_COUNT_EMPTY :
-    PluralForm.get(
-      count, L10N.getFormatStrWithNumbers("networkMenu.summary.requestsCount", count)
-  );
+    PluralForm.get(count,
+      L10N.getStr("networkMenu.summary.requestsCount2")).replace("#1", count);
   let transferText = L10N.getFormatStrWithNumbers("networkMenu.summary.transferred",
     getFormattedSize(contentSize), getFormattedSize(transferredSize));
   let finishText = L10N.getFormatStrWithNumbers("networkMenu.summary.finish",
     getFormattedTime(millis));
 
   return (
     div({ className: "devtools-toolbar devtools-toolbar-bottom" },
       button({
--- a/devtools/client/netmonitor/test/browser_net_footer-summary.js
+++ b/devtools/client/netmonitor/test/browser_net_footer-summary.js
@@ -53,18 +53,18 @@ add_task(function* () {
     let totalRequestsCount = state.requests.requests.size;
     let requestsSummary = getDisplayedRequestsSummary(state);
     info(`Current requests: ${requestsSummary.count} of ${totalRequestsCount}.`);
 
     let valueCount = document.querySelector(".requests-list-network-summary-count")
                         .textContent;
     info("Current summary count: " + valueCount);
     let expectedCount = PluralForm.get(requestsSummary.count,
-      L10N.getFormatStrWithNumbers("networkMenu.summary.requestsCount",
-        requestsSummary.count));
+      L10N.getStr("networkMenu.summary.requestsCount2"))
+        .replace("#1", requestsSummary.count);
 
     if (!totalRequestsCount || !requestsSummary.count) {
       is(valueCount, L10N.getStr("networkMenu.summary.requestsCountEmpty"),
         "The current summary text is incorrect, expected an 'empty' label.");
       return;
     }
 
     let valueTransfer = document.querySelector(".requests-list-network-summary-transfer")