Fix i18n messages for the 'latest' dropdown. Bug: T151439

MusikAnimal · Nov 25, 2016 · 7c58007 · 7c58007
1 parent e654f4d
commit 7c58007
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 29 deletions.
diff --git a/javascripts/shared/chart_helpers.js b/javascripts/shared/chart_helpers.js
@@ -580,13 +580,15 @@ const ChartHelpers = superclass => class extends superclass {
     $('.date-latest a').on('click', e => {
       const value = $(e.target).data('value');
       this.setSpecialRange(`latest-${value}`);
-      $('.latest-num').text(value);
+      $('.latest-text').text(
+        $.i18n('latest-days', value)
+      );
     });
 
     dateRangeSelector.on('change', e => {
       this.setChartPointDetectionRadius(); // FIXME: is this needed?
       this.processInput();
-      $('.latest-num').text('');
+      $('.latest-text').text($.i18n('latest'));
 
       /** clear out specialRange if it doesn't match our input */
       if (this.specialRange && this.specialRange.value !== e.target.value) {

diff --git a/javascripts/shared/pv.js b/javascripts/shared/pv.js
@@ -1224,7 +1224,9 @@ class Pv extends PvConfig {
     this.daterangepicker.startDate = startDate;
     this.daterangepicker.setEndDate(endDate);
 
-    $('.latest-num').text(offset);
+    $('.latest-text').text(
+      $.i18n('latest-days', offset)
+    );
 
     return this.specialRange;
   }

diff --git a/messages/en.json b/messages/en.json
@@ -7,7 +7,7 @@
 	},
 	"title": "Pageviews Analysis",
 	"dates": "Dates",
-	"latest-days": "Latest $1 days",
+	"latest-days": "Latest $1",
 	"last-week": "Last week",
 	"this-month": "This month",
 	"last-month": "Last month",

diff --git a/messages/qqq.json b/messages/qqq.json
@@ -16,7 +16,7 @@
 	},
 	"title": "The title of the tool. This is shown as a header at the top of the page.",
 	"dates": "Header for the part of the interface that lets the user select a range of dates\n{{Identical|Date}}",
-	"latest-days": "These are the 'latest days' links preceeding the date selector. $1 are the individual links. They are not numerical, so <nowiki>{{PLURAL}}</nowiki> cannot not be used on them.",
+	"latest-days": "Label for the 'latest' dropdown next to the date selector, when a number of days has been specified. $1 is the number of days. The word 'days' should not be included, in order to keep the wording brief.",
 	"last-week": "Link to set the date range to the last week\n{{Identical|Last week}}",
 	"this-month": "Link to set the date range to the current month\n{{Identical|This month}}",
 	"last-month": "Link to set the date range to the last month\n{{Identical|Last month}}",
@@ -304,7 +304,7 @@
 	"num-projects-info": "Text indicating the number of projects the user is allowed to enter in the Siteviews application. $1 is the number. Similar to the 'num-pages-info' message.",
 	"options": "Label for the area of the page to set options for the query.\n{{Identical|Options}}",
 	"links": "Label for the column that has links to other applications for the page.\n{{Identical|Link}}",
-	"latest": "Label for the 'latest days' dropdown next to the date selector. This may be followed by a number. The word 'days' should not be included.\n{{Identical|Latest}}",
+	"latest": "Label for the 'latest' dropdown next to the date selector.\n{{Identical|Latest}}",
 	"clear": "Label for the link to clear all pages from the page selector.\n{{Identical|Clear}}",
 	"revisions": "Heading for the list of data about revisions of a page.\n{{Identical|Revision}}",
 	"basic-information": "Heading for the list of data showing basic information about a page or site.\n{{Identical|Basic information}}",

diff --git a/public_html/application.js b/public_html/application.js
diff --git a/public_html/index.php b/public_html/index.php
@@ -27,8 +27,9 @@
           </label>
           <span class="btn-group dropdown latest-group">
             <button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              <?php echo $I18N->msg( 'latest' ); ?>
-              <span class="latest-num">30</span>
+              <span class="latest-text">
+                <?php echo $I18N->msg( 'latest' ); ?>
+              </span>
               <span class="caret"></span>
             </button>
             <ul class="dropdown-menu dropdown-menu-right date-latest">

diff --git a/public_html/langviews/application.js b/public_html/langviews/application.js
diff --git a/public_html/massviews/application.js b/public_html/massviews/application.js
diff --git a/public_html/meta/application.js b/public_html/meta/application.js
diff --git a/public_html/redirectviews/application.js b/public_html/redirectviews/application.js
diff --git a/public_html/siteviews/application.js b/public_html/siteviews/application.js
diff --git a/public_html/topviews/application.js b/public_html/topviews/application.js
diff --git a/views/index.haml b/views/index.haml
@@ -23,8 +23,8 @@
             = $I18N->msg( 'dates' )
           %span.btn-group.dropdown.latest-group
             %button.btn.btn-default.btn-xs.dropdown-toggle(type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false")
-              = $I18N->msg( 'latest' )
-              %span.latest-num 30
+              %span.latest-text
+                = $I18N->msg( 'latest' )
               %span.caret
             %ul.dropdown-menu.dropdown-menu-right.date-latest
               - foreach ([10, 20, 30, 60, 90] as $offset)