Merge pull request #1790 from uktrade/develop

UAT/Staging release 2.8.3
uktrade · May 23, 2022 · c36d5d7 · c36d5d7
2 parents bef7040 + 4c549f7
commit c36d5d7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,19 @@
 
 ### Bugs fixed
 
-- GLS-228 - invert market guides experiment to hide stats by default
-
 ### Enhancements
 
+- GLS-231 - Specify 'exports' for highlight stats
+- GLS-238 - Clarify 'total trade' for line chart
+
+## [2.8.2](https://github.com/uktrade/great-cms/releases/tag/2.8.2)
+
+[Full Changelog](https://github.com/uktrade/great-cms/compare/2.8.1...2.8.2)
+
+### Bugs fixed
+
+- GLS-228 - invert market guides experiment to hide stats by default
+
 ## [2.8.1](https://github.com/uktrade/great-cms/releases/tag/2.8.1)
 
 [Full Changelog](https://github.com/uktrade/great-cms/compare/2.8.0...2.8.1)

diff --git a/core/templates/core/includes/data_source.html b/core/templates/core/includes/data_source.html
@@ -10,9 +10,7 @@
     <br/>Next release: {{ source.next_release }}
     {% endif %}
     {% if source.notes %}
-      {% for note in source.notes %}
-      <br/>{{ note }}
-      {% endfor %}
+    <br/>{{ source.notes|join:" " }}
     {% endif %}
   {% endspaceless %}
 </p>

diff --git a/domestic/fixtures/market_guide_stats.json b/domestic/fixtures/market_guide_stats.json
@@ -33,6 +33,7 @@
           "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ",
           "next_release": "To be announced",
           "notes": [
+            "Total trade is the sum of all exports and imports over the same time period.",
             "Data includes goods and services combined."
           ]
         }
@@ -197,6 +198,7 @@
           "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ",
           "next_release": "To be announced",
           "notes": [
+            "Total trade is the sum of all exports and imports over the same time period.",
             "Data includes goods and services combined."
           ]
         }
@@ -361,6 +363,7 @@
           "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ",
           "next_release": "To be announced",
           "notes": [
+            "Total trade is the sum of all exports and imports over the same time period.",
             "Data includes goods and services combined."
           ]
         }
@@ -525,6 +528,7 @@
           "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ",
           "next_release": "To be announced",
           "notes": [
+            "Total trade is the sum of all exports and imports over the same time period.",
             "Data includes goods and services combined."
           ]
         }
@@ -689,6 +693,7 @@
           "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ",
           "next_release": "To be announced",
           "notes": [
+            "Total trade is the sum of all exports and imports over the same time period.",
             "Data includes goods and services combined."
           ]
         }
@@ -853,6 +858,7 @@
           "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ",
           "next_release": "To be announced",
           "notes": [
+            "Total trade is the sum of all exports and imports over the same time period.",
             "Data includes goods and services combined."
           ]
         }
@@ -1017,6 +1023,7 @@
           "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ",
           "next_release": "To be announced",
           "notes": [
+            "Total trade is the sum of all exports and imports over the same time period.",
             "Data includes goods and services combined."
           ]
         }

diff --git a/domestic/templates/domestic/country_guide.html b/domestic/templates/domestic/country_guide.html
@@ -73,7 +73,7 @@ <h3 class="statistic-heading font-xsmall">The UK's</h3>
                 </span>
 
                 <span class="font-xsmall statistic-smallprint">
-                  largest trading partner
+                  largest export market
                 </span>
               </figure>
               {% endif %}
@@ -87,7 +87,7 @@ <h3 class="statistic-heading font-xsmall">Accounting for</h3>
                 </span>
 
                 <span class="font-xsmall statistic-smallprint">
-                  of total UK trade
+                  of total UK exports
                 </span>
               </figure>
               {% endif %}
@@ -192,7 +192,7 @@ <h2 class="heading-medium">Total import and export values between {{ page.headin
                       <th scope="col">Year</th>
                       <th scope="col" style="text-align: right">Imports (£{% if unit %}{{ unit }}{% endif %})</th>
                       <th scope="col" style="text-align: right">Exports (£{% if unit %}{{ unit }}{% endif %})</th>
-                      <th scope="col" style="text-align: right">Total (£{% if unit %}{{ unit }}{% endif %})</th>
+                      <th scope="col" style="text-align: right">Total trade (£{% if unit %}{{ unit }}{% endif %})</th>
                     </tr>
                   </thead>
                   <tbody>